Mercurial > pidgin.yaz
comparison libpurple/protocols/qq/Makefile.mingw @ 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 | fecedf6d9ee1 |
comparison
equal
deleted
inserted
replaced
24308:0bf04bded747 | 24309:260c6f4e6563 |
---|---|
4 # Description: Makefile for win32 (mingw) version of the QQ prpl | 4 # Description: Makefile for win32 (mingw) version of the QQ prpl |
5 # | 5 # |
6 | 6 |
7 PIDGIN_TREE_TOP := ../../.. | 7 PIDGIN_TREE_TOP := ../../.. |
8 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak | 8 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak |
9 CURRENT_REVISION=$(shell \ | |
10 awk 'BEGIN {"grep node .hg_archival.txt" | getline rev; \ | |
11 rev=substr(rev,7,6); \ | |
12 print rev}') | |
13 TARGET = libqq | 9 TARGET = libqq |
14 TYPE = PLUGIN | 10 TYPE = PLUGIN |
15 | 11 |
16 # Static or Plugin... | 12 # Static or Plugin... |
17 ifeq ($(TYPE),STATIC) | 13 ifeq ($(TYPE),STATIC) |
18 DEFINES += -DSTATIC | 14 DEFINES += -DSTATIC |
19 DLL_INSTALL_DIR = $(PURPLE_INSTALL_DIR) | 15 DLL_INSTALL_DIR = $(PURPLE_INSTALL_DIR) |
20 else | 16 else |
21 ifeq ($(TYPE),PLUGIN) | 17 ifeq ($(TYPE),PLUGIN) |
22 DEFINES += -DOPENQ_VERSION=\"$(CURRENT_REVISION)\" | |
23 DLL_INSTALL_DIR = $(PURPLE_INSTALL_PLUGINS_DIR) | 18 DLL_INSTALL_DIR = $(PURPLE_INSTALL_PLUGINS_DIR) |
24 endif | 19 endif |
25 endif | 20 endif |
26 | 21 |
27 ## | 22 ## |