Mercurial > pidgin.yaz
comparison libpurple/protocols/qq/Makefile.am @ 24309:260c6f4e6563
Remove the QQ CURRENT_REVISION stuff in the Makefile. This, even with their
suggested fix, is broken:
1. It probably breaks builds with a separate build directory.
2. qq.c has code to set OPENQ_VERSION to DISPLAY_VERSION (from us)
if OPENQ_VERSION is not defined. However, the Makefile always
defines it. Right now, it defines it with no value if you're not
using Mercurial, so the #ifndef won't work.
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sun, 02 Nov 2008 22:56:42 +0000 |
| parents | 1ee91ff0d5fe |
| children | 2b62300d2c19 bcad7dc4b453 |
comparison
equal
deleted
inserted
replaced
| 24308:0bf04bded747 | 24309:260c6f4e6563 |
|---|---|
| 51 | 51 |
| 52 AM_CFLAGS = $(st) | 52 AM_CFLAGS = $(st) |
| 53 | 53 |
| 54 libqq_la_LDFLAGS = -module -avoid-version | 54 libqq_la_LDFLAGS = -module -avoid-version |
| 55 | 55 |
| 56 CURRENT_REVISION=$(shell \ | |
| 57 awk 'BEGIN {"grep node .hg_archival.txt" | getline rev; \ | |
| 58 rev=substr(rev,7,6); \ | |
| 59 print rev}') | |
| 60 | |
| 61 if STATIC_QQ | 56 if STATIC_QQ |
| 62 | 57 |
| 63 st = -DPURPLE_STATIC_PRPL | 58 st = -DPURPLE_STATIC_PRPL |
| 64 noinst_LIBRARIES = libqq.a | 59 noinst_LIBRARIES = libqq.a |
| 65 libqq_a_SOURCES = $(QQSOURCES) | 60 libqq_a_SOURCES = $(QQSOURCES) |
| 77 AM_CPPFLAGS = \ | 72 AM_CPPFLAGS = \ |
| 78 -I$(top_srcdir)/libpurple \ | 73 -I$(top_srcdir)/libpurple \ |
| 79 -I$(top_builddir)/libpurple \ | 74 -I$(top_builddir)/libpurple \ |
| 80 -DQQ_BUDDY_ICON_DIR=\"$(datadir)/pixmaps/purple/buddy_icons/qq\" \ | 75 -DQQ_BUDDY_ICON_DIR=\"$(datadir)/pixmaps/purple/buddy_icons/qq\" \ |
| 81 $(DEBUG_CFLAGS) \ | 76 $(DEBUG_CFLAGS) \ |
| 82 $(GLIB_CFLAGS) \ | 77 $(GLIB_CFLAGS) |
| 83 -DOPENQ_VERSION=\"$(CURRENT_REVISION)\" |