Mercurial > pidgin

changeset 14373:a4542693481d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 17079] Remove the gtkgaim headers from the include path. committer: Tailor Script <tailor@pidgin.im>
author Daniel Atallah <daniel.atallah@gmail.com>
date Tue, 29 Aug 2006 04:33:53 +0000
parents d5c22258df09
children d38b0839e765
files libgaim/plugins/perl/Makefile.mingw libgaim/plugins/perl/common/Makefile.mingw
diffstat 2 files changed, 3 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/libgaim/plugins/perl/Makefile.mingw	Tue Aug 29 04:15:29 2006 +0000
+++ b/libgaim/plugins/perl/Makefile.mingw	Tue Aug 29 04:33:53 2006 +0000
@@ -19,20 +19,13 @@
 			-I$(GAIM_TOP) \
 			-I$(GAIM_LIB_TOP) \
 			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_GTK_TOP) \
-			-I$(GAIM_GTK_TOP)/win32 \
 			-I$(GTK_TOP)/include \
-			-I$(GTK_TOP)/include/gtk-2.0 \
 			-I$(GTK_TOP)/include/glib-2.0 \
-			-I$(GTK_TOP)/include/pango-1.0 \
-			-I$(GTK_TOP)/include/atk-1.0 \
-			-I$(GTK_TOP)/lib/gtk-2.0/include \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(PERL_LIB_TOP)/CORE
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
 			-L$(GAIM_LIB_TOP) \
-			-L$(GAIM_GTK_TOP) \
 			-L$(PERL_LIB_TOP)
 
 ##
@@ -54,7 +47,6 @@
 			-lws2_32 \
 			-lintl \
 			-lgaim \
-			-lgtkgaim \
 			-lperl58
 
 include $(GAIM_COMMON_RULES)
@@ -76,7 +68,7 @@
 ##
 ## BUILD DLL
 ##
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(GAIM_GTKGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS)  -Wl,--export-all-symbols -o $(TARGET).dll
 
 ##
@@ -84,7 +76,7 @@
 ##
 clean:
 	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll $(TARGET).lib
+	rm -rf $(TARGET).dll
 	$(MAKE) -C ./common -f $(GAIM_WIN32_MAKEFILE) clean
 
 include $(GAIM_COMMON_TARGETS)
--- a/libgaim/plugins/perl/common/Makefile.mingw	Tue Aug 29 04:15:29 2006 +0000
+++ b/libgaim/plugins/perl/common/Makefile.mingw	Tue Aug 29 04:33:53 2006 +0000
@@ -20,20 +20,14 @@
 INCLUDE_PATHS =		-I. \
 			-I$(GAIM_TOP) \
 			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_GTK_TOP) \
 			-I$(GTK_TOP)/include \
-			-I$(GTK_TOP)/include/gtk-2.0 \
 			-I$(GTK_TOP)/include/glib-2.0 \
-			-I$(GTK_TOP)/include/pango-1.0 \
-			-I$(GTK_TOP)/include/atk-1.0 \
-			-I$(GTK_TOP)/lib/gtk-2.0/include \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(PERL_LIB_TOP)/CORE
 
 LIB_PATHS = 		-L$(PERL_LIB_TOP) \
 			-L$(PERL_PLUGIN_TOP) \
 			-L$(GAIM_LIB_TOP) \
-			-L$(GAIM_GTK_TOP) \
 			-L$(GTK_TOP)/lib
 
 ##
@@ -83,7 +77,6 @@
 LIBS =			-lperl58 \
 			-lperl \
 			-lgaim \
-			-lgtkgaim \
 			-lglib-2.0
 
 include $(GAIM_COMMON_RULES)
@@ -110,7 +103,7 @@
 	cp Gaim.pm ./lib
 	$(PERL) -MAutoSplit -e 'autosplit("lib/Gaim.pm")'
 
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(GAIM_GTKGAIM_DLL).a $(FALLBACKS) $(OBJECTS)
+$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(FALLBACKS) $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) -o $(TARGET).dll
 
 ##