Mercurial > pidgin.yaz

changeset 16314:1843c0180fbe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow include and lib paths to be overridden from local.ent
author Daniel Atallah <daniel.atallah@gmail.com>
date Mon, 23 Apr 2007 01:30:49 +0000
parents e06b387d79bd
children ee4ce3c4186f
files libpurple/Makefile.mingw libpurple/plugins/Makefile.mingw libpurple/plugins/perl/Makefile.mingw libpurple/plugins/perl/common/Makefile.mingw libpurple/plugins/ssl/Makefile.mingw libpurple/protocols/bonjour/Makefile.mingw libpurple/protocols/gg/Makefile.mingw libpurple/protocols/irc/Makefile.mingw libpurple/protocols/jabber/Makefile.mingw libpurple/protocols/msn/Makefile.mingw libpurple/protocols/novell/Makefile.mingw libpurple/protocols/oscar/Makefile.mingw libpurple/protocols/qq/Makefile.mingw libpurple/protocols/sametime/Makefile.mingw libpurple/protocols/silc/Makefile.mingw libpurple/protocols/simple/Makefile.mingw libpurple/protocols/toc/Makefile.mingw libpurple/protocols/yahoo/Makefile.mingw libpurple/protocols/zephyr/Makefile.mingw pidgin/Makefile.mingw pidgin/plugins/Makefile.mingw pidgin/plugins/perl/common/Makefile.mingw pidgin/plugins/ticker/Makefile.mingw pidgin/plugins/win32/transparency/Makefile.mingw pidgin/plugins/win32/winprefs/Makefile.mingw
diffstat 25 files changed, 28 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/libpurple/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -13,7 +13,7 @@
 ##
 ## INCLUDE PATHS
 ##
-INCLUDE_PATHS =	\
+INCLUDE_PATHS +=	\
 			-I$(PURPLE_TOP) \
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP) \
@@ -22,7 +22,7 @@
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(LIBXML2_TOP)/include
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(LIBXML2_TOP)/lib
 
 ##
--- a/libpurple/plugins/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/libpurple/plugins/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -25,7 +25,7 @@
 			-I$(PURPLE_TOP) \
 			-I$(PURPLE_TOP)/win32
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP)
 
 ##
--- a/libpurple/plugins/perl/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/libpurple/plugins/perl/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -24,7 +24,7 @@
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(PERL_LIB_TOP)/CORE
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
 			-L$(PERL_LIB_TOP)
 
--- a/libpurple/plugins/perl/common/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/libpurple/plugins/perl/common/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -17,7 +17,7 @@
 ##
 ## INCLUDE PATHS
 ##
-INCLUDE_PATHS =		-I. \
+INCLUDE_PATHS +=		-I. \
 			-I$(PIDGIN_TREE_TOP) \
 			-I$(PURPLE_TOP) \
 			-I$(GTK_TOP)/include \
@@ -25,7 +25,7 @@
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(PERL_LIB_TOP)/CORE
 
-LIB_PATHS = 		-L$(PERL_LIB_TOP) \
+LIB_PATHS += 		-L$(PERL_LIB_TOP) \
 			-L$(PERL_PLUGIN_TOP) \
 			-L$(PURPLE_TOP) \
 			-L$(GTK_TOP)/lib
--- a/libpurple/plugins/ssl/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/libpurple/plugins/ssl/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -36,7 +36,7 @@
 			-I$(NSS_TOP)/include \
 			-I$(NSPR_TOP)/include
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
 			-L$(NSS_TOP)/lib \
 			-L$(NSPR_TOP)/lib
--- a/libpurple/protocols/bonjour/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/libpurple/protocols/bonjour/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -33,7 +33,7 @@
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(HOWL_TOP)/lib \
 			-L$(PURPLE_TOP)
 
--- a/libpurple/protocols/gg/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/libpurple/protocols/gg/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -33,7 +33,7 @@
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
 
 ##
--- a/libpurple/protocols/irc/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/libpurple/protocols/irc/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -31,7 +31,7 @@
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP)
 
 ##
--- a/libpurple/protocols/jabber/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/libpurple/protocols/jabber/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -34,7 +34,7 @@
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(LIBXML2_TOP)/lib \
 			-L$(PURPLE_TOP) \
 			-L.
--- a/libpurple/protocols/msn/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/libpurple/protocols/msn/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -31,7 +31,7 @@
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP)
 
 ##
--- a/libpurple/protocols/novell/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/libpurple/protocols/novell/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -31,7 +31,7 @@
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP)
 
 ##
--- a/libpurple/protocols/oscar/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/libpurple/protocols/oscar/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -33,7 +33,7 @@
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
 			-L.
 
--- a/libpurple/protocols/qq/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/libpurple/protocols/qq/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -31,7 +31,7 @@
 	-I$(PURPLE_TOP)/win32 \
 	-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS = \
+LIB_PATHS += \
 	-L$(GTK_TOP)/lib \
 	-L$(PURPLE_TOP)
 
--- a/libpurple/protocols/sametime/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/libpurple/protocols/sametime/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -33,7 +33,7 @@
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(MEANWHILE_TOP)/lib \
 			-L$(PURPLE_TOP)
 
--- a/libpurple/protocols/silc/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/libpurple/protocols/silc/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -34,7 +34,7 @@
 			-I$(PIDGIN_TREE_TOP) \
 			-I$(SILC_TOOLKIT)/include
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
 			-L$(SILC_TOOLKIT)/lib
 
--- a/libpurple/protocols/simple/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/libpurple/protocols/simple/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -31,7 +31,7 @@
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP)
 
 ##
--- a/libpurple/protocols/toc/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/libpurple/protocols/toc/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -31,7 +31,7 @@
 			-I$(LIBPIDGIN_TREE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(LIBPIDGIN_TREE_TOP)
 
 ##
--- a/libpurple/protocols/yahoo/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/libpurple/protocols/yahoo/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -31,7 +31,7 @@
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP)
 
 ##
--- a/libpurple/protocols/zephyr/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/libpurple/protocols/zephyr/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -42,7 +42,7 @@
    INCLUDE_PATHS += -I$(KRB4_TOP)/inc/krb4
 endif
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP)
 
 ifeq ($(USE_KRB4), true)
--- a/pidgin/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/pidgin/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -31,7 +31,7 @@
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include
 
-INCLUDE_PATHS =	\
+INCLUDE_PATHS +=	\
 			$(PURPLE_INCLUDE_PATHS) \
 			-I$(PIDGIN_IDLETRACK_TOP) \
 			-I$(PIDGIN_TOP) \
@@ -44,7 +44,7 @@
 			-I$(GTKSPELL_TOP) \
 			-I$(ASPELL_TOP)/include
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
 			-L$(PIDGIN_TOP) \
 			-L$(PIDGIN_IDLETRACK_TOP) \
--- a/pidgin/plugins/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/pidgin/plugins/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -33,7 +33,7 @@
 			-I$(PIDGIN_TOP) \
 			-I$(PIDGIN_TOP)/win32
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
 			-L$(PIDGIN_TOP)
 
--- a/pidgin/plugins/perl/common/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/pidgin/plugins/perl/common/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -29,7 +29,7 @@
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
 			-I$(PERL_LIB_TOP)/CORE
 
-LIB_PATHS = 		-L$(PERL_LIB_TOP) \
+LIB_PATHS += 		-L$(PERL_LIB_TOP) \
 			-L$(PURPLE_TOP) \
 			-L$(PIDGIN_TOP) \
 			-L$(PURPLE_PERL_TOP) \
--- a/pidgin/plugins/ticker/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/pidgin/plugins/ticker/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -27,7 +27,7 @@
 			-I$(PIDGIN_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
 			-L$(PIDGIN_TOP)
 
--- a/pidgin/plugins/win32/transparency/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/pidgin/plugins/win32/transparency/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -28,7 +28,7 @@
 			-I$(PIDGIN_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
 			-L$(PIDGIN_TOP)
 
--- a/pidgin/plugins/win32/winprefs/Makefile.mingw	Mon Apr 23 01:29:29 2007 +0000
+++ b/pidgin/plugins/win32/winprefs/Makefile.mingw	Mon Apr 23 01:30:49 2007 +0000
@@ -28,7 +28,7 @@
 			-I$(PIDGIN_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
+LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
 			-L$(PIDGIN_TOP)