Mercurial > pidgin
changeset 24366: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 | 0bf04bded747 |
| children | 4acda11bf672 4210d8eb1708 |
| files | libpurple/protocols/qq/Makefile.am libpurple/protocols/qq/Makefile.mingw |
| diffstat | 2 files changed, 1 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/qq/Makefile.am Sun Nov 02 22:17:59 2008 +0000 +++ b/libpurple/protocols/qq/Makefile.am Sun Nov 02 22:56:42 2008 +0000 @@ -53,11 +53,6 @@ libqq_la_LDFLAGS = -module -avoid-version -CURRENT_REVISION=$(shell \ - awk 'BEGIN {"grep node .hg_archival.txt" | getline rev; \ - rev=substr(rev,7,6); \ - print rev}') - if STATIC_QQ st = -DPURPLE_STATIC_PRPL @@ -79,5 +74,4 @@ -I$(top_builddir)/libpurple \ -DQQ_BUDDY_ICON_DIR=\"$(datadir)/pixmaps/purple/buddy_icons/qq\" \ $(DEBUG_CFLAGS) \ - $(GLIB_CFLAGS) \ - -DOPENQ_VERSION=\"$(CURRENT_REVISION)\" + $(GLIB_CFLAGS)
--- a/libpurple/protocols/qq/Makefile.mingw Sun Nov 02 22:17:59 2008 +0000 +++ b/libpurple/protocols/qq/Makefile.mingw Sun Nov 02 22:56:42 2008 +0000 @@ -6,10 +6,6 @@ PIDGIN_TREE_TOP := ../../.. include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak -CURRENT_REVISION=$(shell \ - awk 'BEGIN {"grep node .hg_archival.txt" | getline rev; \ - rev=substr(rev,7,6); \ - print rev}') TARGET = libqq TYPE = PLUGIN @@ -19,7 +15,6 @@ DLL_INSTALL_DIR = $(PURPLE_INSTALL_DIR) else ifeq ($(TYPE),PLUGIN) - DEFINES += -DOPENQ_VERSION=\"$(CURRENT_REVISION)\" DLL_INSTALL_DIR = $(PURPLE_INSTALL_PLUGINS_DIR) endif endif