Mercurial > pidgin.yaz

changeset 14293:82373bb6a47a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 16983] Restructure updates for some makefiles that are not used by default and may not fully work. Remove gtk import stuff from oscar Makefile.mingw committer: Tailor Script <tailor@pidgin.im>
author Daniel Atallah <daniel.atallah@gmail.com>
date Tue, 22 Aug 2006 18:10:43 +0000
parents c111a7e718d0
children 8a6154a52b84
files libgaim/protocols/bonjour/Makefile.mingw libgaim/protocols/oscar/Makefile.mingw libgaim/protocols/qq/Makefile.mingw libgaim/protocols/toc/Makefile.mingw libgaim/protocols/zephyr/Makefile.mingw
diffstat 5 files changed, 46 insertions(+), 81 deletions(-) [+]
line wrap: on
line diff
--- a/libgaim/protocols/bonjour/Makefile.mingw	Tue Aug 22 17:02:20 2006 +0000
+++ b/libgaim/protocols/bonjour/Makefile.mingw	Tue Aug 22 18:10:43 2006 +0000
@@ -8,9 +8,9 @@
 # PATHS
 #
 
-INCLUDE_DIR :=		.
 GTK_TOP :=		../../../../win32-dev/gtk_2_0
 GAIM_TOP :=		../../..
+LIBGAIM_TOP :=		../..
 BONJOUR_ROOT :=		.
 GAIM_INSTALL_DIR :=	$(GAIM_TOP)/win32-install-dir
 HOWL_DIR := $(GAIM_TOP)/../win32-dev/howl-1.0.0
@@ -29,7 +29,7 @@
 
 DEFINES =
 
-# Static or Plugin... 
+# Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
   DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
@@ -44,7 +44,7 @@
 ## INCLUDE  MAKEFILES
 ##
 
-include $(GAIM_TOP)/src/win32/global.mak
+include $(LIBGAIM_TOP)/win32/global.mak
 
 ##
 ## INCLUDE PATHS
@@ -52,21 +52,17 @@
 
 INCLUDE_PATHS +=	-I$(BONJOUR_ROOT) \
 			-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/glib-2.0/include \
-			-I$(GTK_TOP)/lib/gtk-2.0/include \
-			-I$(HOWL_DIR)/include/howl \
-			-I$(GAIM_TOP)/src \
-			-I$(GAIM_TOP)/src/win32 \
+			-I$(HOWL_DIR)/include \
+			-I$(LIBGAIM_TOP) \
+			-I$(LIBGAIM_TOP)/win32 \
 			-I$(GAIM_TOP)
 
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
 			-L$(HOWL_DIR)/lib \
-			-L$(GAIM_TOP)/src
+			-L$(LIBGAIM_TOP)
 
 
 ##
@@ -86,11 +82,8 @@
 ## LIBRARIES
 ##
 
-LIBS =			-lgtk-win32-2.0 \
+LIBS =	\
 			-lglib-2.0 \
-			-lgdk-win32-2.0 \
-			-lgmodule-2.0 \
-			-lgobject-2.0 \
 			-lws2_32 \
 			-lintl \
 			-lhowl \
@@ -123,15 +116,15 @@
 ## BUILD Dependencies
 ##
 
-$(GAIM_TOP)/src/gaim.lib:
-	$(MAKE) -C $(GAIM_TOP)/src -f Makefile.mingw gaim.lib
+$(LIBGAIM_TOP)/libgaim.dll.a:
+	$(MAKE) -C $(LIBGAIM_TOP) -f Makefile.mingw libgaim.dll.a
 
 ##
 ## BUILD DLL
 ##
 
-$(TARGET).dll: $(OBJECTS) $(GAIM_TOP)/src/gaim.lib
-	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).lib -o $(TARGET).dll
+$(TARGET).dll: $(OBJECTS) $(LIBGAIM_TOP)/libgaim.dll.a
+	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
 
 ##
 ## CLEAN RULES
@@ -140,4 +133,3 @@
 clean:
 	rm -rf *.o
 	rm -rf $(TARGET).dll
-	rm -rf $(TARGET).lib
--- a/libgaim/protocols/oscar/Makefile.mingw	Tue Aug 22 17:02:20 2006 +0000
+++ b/libgaim/protocols/oscar/Makefile.mingw	Tue Aug 22 18:10:43 2006 +0000
@@ -49,12 +49,8 @@
 
 INCLUDE_PATHS +=	-I$(OSCAR_ROOT) \
 			-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/glib-2.0/include \
-			-I$(GTK_TOP)/lib/gtk-2.0/include \
 			-I$(LIBGAIM_TOP) \
 			-I$(LIBGAIM_TOP)/win32 \
 			-I$(GAIM_TOP)
--- a/libgaim/protocols/qq/Makefile.mingw	Tue Aug 22 17:02:20 2006 +0000
+++ b/libgaim/protocols/qq/Makefile.mingw	Tue Aug 22 18:10:43 2006 +0000
@@ -12,6 +12,7 @@
 OPENQ_TOP :=		../
 GTK_TOP :=		../../../../win32-dev/gtk_2_0
 GAIM_TOP :=		../../..
+LIBGAIM_TOP :=		../..
 OPENQ_ROOT :=		.
 GAIM_INSTALL_DIR :=	$(GAIM_TOP)/win32-install-dir
 
@@ -31,7 +32,7 @@
 
 DEFINES = -DOPENQ_VERSION=\"$(OPENQ_VERSION)\"
 
-# Static or Plugin... 
+# Static or Plugin...
 ifeq ($(TYPE),STATIC)
 	DEFINES += -DSTATIC
 	DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
@@ -46,7 +47,7 @@
 ## INCLUDE  MAKEFILES
 ##
 
-include $(GAIM_TOP)/src/win32/global.mak
+include $(LIBGAIM_TOP)/win32/global.mak
 
 ##
 ## INCLUDE PATHS
@@ -55,19 +56,15 @@
 INCLUDE_PATHS += \
 	-I$(OPENQ_ROOT) \
 	-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/glib-2.0/include \
-	-I$(GTK_TOP)/lib/gtk-2.0/include \
-	-I$(GAIM_TOP)/src \
-	-I$(GAIM_TOP)/src/win32 \
+	-I$(LIBGAIM_TOP) \
+	-I$(LIBGAIM_TOP)/win32 \
 	-I$(GAIM_TOP)
 
 LIB_PATHS = \
 	-L$(GTK_TOP)/lib \
-	-L$(GAIM_TOP)/src
+	-L$(LIBGAIM_TOP)
 
 ##
 ##  SOURCES, OBJECTS
@@ -116,12 +113,7 @@
 ##
 
 LIBS = \
-	-lgtk-win32-2.0 \
 	-lglib-2.0 \
-	-lgdk-win32-2.0 \
-	-lgdk_pixbuf-2.0 \
-	-lgmodule-2.0 \
-	-lgobject-2.0 \
 	-lws2_32 \
 	-lintl \
 	-lgaim
@@ -152,14 +144,14 @@
 ## BUILD Dependencies
 ##
 
-$(GAIM_TOP)/src/gaim.lib:
-	$(MAKE) -C $(GAIM_TOP)/src -f Makefile.mingw gaim.lib
+$(LIBGAIM_TOP)/libgaim.dll.a:
+	$(MAKE) -C $(LIBGAIM_TOP) -f Makefile.mingw libgaim.dll.a
 
 ##
 ## BUILD DLL
 ##
 
-$(TARGET).dll: $(OBJECTS) $(GAIM_TOP)/src/gaim.lib
+$(TARGET).dll: $(OBJECTS) $(LIBGAIM_TOP)/libgaim.dll.a
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
 
 ##
@@ -169,5 +161,4 @@
 clean:
 	rm -rf *.o
 	rm -rf $(TARGET).dll
-	rm -rf $(TARGET).lib
 
--- a/libgaim/protocols/toc/Makefile.mingw	Tue Aug 22 17:02:20 2006 +0000
+++ b/libgaim/protocols/toc/Makefile.mingw	Tue Aug 22 18:10:43 2006 +0000
@@ -11,6 +11,7 @@
 INCLUDE_DIR :=		.
 GTK_TOP :=		../../../../win32-dev/gtk_2_0
 GAIM_TOP :=		../../..
+LIBGAIM_TOP :=		../..
 TOC_ROOT :=		.
 GAIM_INSTALL_DIR :=	$(GAIM_TOP)/win32-install-dir
 
@@ -26,7 +27,7 @@
 
 DEFINES =
 
-# Static or Plugin... 
+# Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
   DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
@@ -41,7 +42,7 @@
 ## INCLUDE  MAKEFILES
 ##
 
-include $(GAIM_TOP)/src/win32/global.mak
+include $(LIBGAIM_TOP)/win32/global.mak
 
 ##
 ## INCLUDE PATHS
@@ -49,19 +50,15 @@
 
 INCLUDE_PATHS +=	-I$(TOC_ROOT) \
 			-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/glib-2.0/include \
-			-I$(GTK_TOP)/lib/gtk-2.0/include \
-			-I$(GAIM_TOP)/src \
-			-I$(GAIM_TOP)/src/win32 \
+			-I$(LIBGAIM_TOP) \
+			-I$(LIBGAIM_TOP)/win32 \
 			-I$(GAIM_TOP)
 
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_TOP)/src
+			-L$(LIBGAIM_TOP)
 
 
 ##
@@ -78,11 +75,8 @@
 ## LIBRARIES
 ##
 
-LIBS = 			-lgtk-win32-2.0 \
+LIBS =	\
 			-lglib-2.0 \
-			-lgdk-win32-2.0 \
-			-lgmodule-2.0 \
-			-lgobject-2.0 \
 			-lws2_32 \
 			-lintl \
 			-lgaim
@@ -112,15 +106,15 @@
 ## BUILD Dependencies
 ##
 
-$(GAIM_TOP)/src/gaim.lib:
-	$(MAKE) -C $(GAIM_TOP)/src -f Makefile.mingw gaim.lib
+$(LIBGAIM_TOP)/libgaim.dll.a:
+	$(MAKE) -C $(LIBGAIM_TOP) -f Makefile.mingw libgaim.dll.a
 
 ##
 ## BUILD DLL
 ##
 
-$(TARGET).dll: $(OBJECTS) $(GAIM_TOP)/src/gaim.lib
-	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).lib -o $(TARGET).dll
+$(TARGET).dll: $(OBJECTS) $(LIBGAIM_TOP)/libgaim.dll.a
+	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
 
 
 ##
@@ -130,4 +124,3 @@
 clean:
 	rm -rf *.o
 	rm -rf $(TARGET).dll
-	rm -rf $(TARGET).lib
--- a/libgaim/protocols/zephyr/Makefile.mingw	Tue Aug 22 17:02:20 2006 +0000
+++ b/libgaim/protocols/zephyr/Makefile.mingw	Tue Aug 22 18:10:43 2006 +0000
@@ -11,6 +11,7 @@
 INCLUDE_DIR :=		.
 GTK_TOP :=		../../../../win32-dev/gtk_2_0
 GAIM_TOP :=		../../..
+LIBGAIM_TOP :=		../..
 ZEPHYR_ROOT :=		.
 KRB4_TOP :=             ../../../../win32-dev/kfw-2.6.3-final.fixed
 GAIM_INSTALL_DIR :=	$(GAIM_TOP)/win32-install-dir
@@ -29,7 +30,7 @@
 
 DEFINES =
 
-# Static or Plugin... 
+# Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
   DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
@@ -39,7 +40,7 @@
 endif
 endif
 
-DEFINES += -DWIN32 -DKRB5_SYSTYPES__ 
+DEFINES += -DWIN32 -DKRB5_SYSTYPES__
 
 ifeq ($(USE_KRB4),true)
   DEFINES += -DZEPHYR_USES_KERBEROS
@@ -49,7 +50,7 @@
 ## INCLUDE  MAKEFILES
 ##
 
-include $(GAIM_TOP)/src/win32/global.mak
+include $(LIBGAIM_TOP)/win32/global.mak
 
 ##
 ## INCLUDE PATHS
@@ -57,14 +58,10 @@
 
 INCLUDE_PATHS +=	-I$(ZEPHYR_ROOT) \
 			-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/glib-2.0/include \
-			-I$(GTK_TOP)/lib/gtk-2.0/include \
-			-I$(GAIM_TOP)/src \
-			-I$(GAIM_TOP)/src/win32 \
+			-I$(LIBGAIM_TOP) \
+			-I$(LIBGAIM_TOP)/win32 \
 			-I$(GAIM_TOP)
 
 ifeq ($(USE_KRB4), true)
@@ -72,7 +69,7 @@
 endif
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_TOP)/src
+			-L$(LIBGAIM_TOP)
 
 ifeq ($(USE_KRB4), true)
   LIB_PATHS+=-L$(KRB4_TOP)/lib/i386
@@ -145,17 +142,14 @@
 ## LIBRARIES
 ##
 
-LIBS =			-lgtk-win32-2.0 \
+LIBS =	\
 			-lglib-2.0 \
-			-lgdk-win32-2.0 \
-			-lgmodule-2.0 \
-			-lgobject-2.0 \
 			-lws2_32 \
 			-lintl \
 			-lgaim
 
-ifeq ($(USE_KRB4),true) 
-  LIBS+= -lkrbv4w32 
+ifeq ($(USE_KRB4),true)
+  LIBS+= -lkrbv4w32
 endif
 
 ##
@@ -183,15 +177,15 @@
 ## BUILD Dependencies
 ##
 
-$(GAIM_TOP)/src/gaim.lib:
-	$(MAKE) -C $(GAIM_TOP)/src -f Makefile.mingw gaim.lib
+$(LIBGAIM_TOP)/libgaim.dll.a:
+	$(MAKE) -C $(LIBGAIM_TOP) -f Makefile.mingw libgaim.dll.a
 
 ##
 ## BUILD DLL
 ##
 
-$(TARGET).dll: $(OBJECTS) $(GAIM_TOP)/src/gaim.lib
-	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--enable-stdcall-fixup -Wl,--out-implib,$(TARGET).lib -o $(TARGET).dll
+$(TARGET).dll: $(OBJECTS) $(LIBGAIM_TOP)/libgaim.dll.a
+	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--enable-stdcall-fixup -o $(TARGET).dll
 
 
 ##
@@ -201,4 +195,3 @@
 clean:
 	rm -rf *.o
 	rm -rf $(TARGET).dll
-	rm -rf $(TARGET).lib