Mercurial > pidgin.yaz

changeset 14241:c54ea2572de9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 16923] Now featuring a working wingaim! committer: Tailor Script <tailor@pidgin.im>
author Daniel Atallah <daniel.atallah@gmail.com>
date Sun, 20 Aug 2006 23:08:42 +0000
parents efc3836b7e8b
children 85f3808ca472
files Makefile.mingw gaim-installer.nsi gtk/Makefile.mingw gtk/pixmaps/Makefile.mingw gtk/pixmaps/smileys/Makefile.mingw gtk/pixmaps/smileys/default/Makefile.mingw gtk/pixmaps/smileys/none/Makefile.mingw gtk/pixmaps/status/Makefile.mingw gtk/pixmaps/status/default/Makefile.mingw libgaim/Makefile.mingw
diffstat 10 files changed, 66 insertions(+), 108 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.mingw	Sun Aug 20 22:47:25 2006 +0000
+++ b/Makefile.mingw	Sun Aug 20 23:08:42 2006 +0000
@@ -5,96 +5,28 @@
 # Description: Top Makefile for win32 (mingw) port of Gaim
 #
 
-GAIM_SRC = ./src
-GAIM_PROTOS = $(GAIM_SRC)/protocols
-GAIM_PLUGINS = ./plugins
-GAIM_PIXMAPS = ./pixmaps
+LIBGAIM_TOP = ./libgaim
+GTKGAIM_TOP = ./gtk
 GAIM_SOUNDS = ./sounds
 GAIM_INSTALL_DIR = ./win32-install-dir
-GTKSPELL_TOP = ../win32-dev/gtkspell-2.0.6/gtkspell
-LIBXML2_DIR = ../win32-dev/libxml2
-IDLETRACK_TOP = $(GAIM_SRC)/win32/IdleTracker
-GTKRC_TOP = ../win32-dev/gtkrc
-OSCAR = $(GAIM_PROTOS)/oscar
-YAHOO = $(GAIM_PROTOS)/yahoo
-MSN = $(GAIM_PROTOS)/msn
-TOC = $(GAIM_PROTOS)/toc
-IRC = $(GAIM_PROTOS)/irc
-JABBER = $(GAIM_PROTOS)/jabber
-GG = $(GAIM_PROTOS)/gg
-NOVELL = $(GAIM_PROTOS)/novell
-SILC = $(GAIM_PROTOS)/silc
-SIMPLE = $(GAIM_PROTOS)/simple
-SAMETIME = $(GAIM_PROTOS)/sametime
 PO = ./po
 
 MAKENSIS := makensis.exe
 
 VERSION := $(shell cat ./VERSION)
 
-NEEDED_DLLS =		$(GTKSPELL_TOP)/libgtkspell.dll \
-			$(IDLETRACK_TOP)/idletrack.dll \
-			$(LIBXML2_DIR)/bin/libxml2.dll
-
-SOUNDS =		$(GAIM_SOUNDS)/alert.wav \
-			$(GAIM_SOUNDS)/login.wav \
-			$(GAIM_SOUNDS)/logout.wav \
-			$(GAIM_SOUNDS)/receive.wav \
-			$(GAIM_SOUNDS)/send.wav
-
-
-##
-## Don't forget to change STATIC_PROTO_INIT, in config.h.mingw if you
-## change the status of a protocol (static/plugin)
-##
-
-OSCAR_TYPE = PLUGIN
-YAHOO_TYPE = PLUGIN
-MSN_TYPE = PLUGIN
-TOC_TYPE = PLUGIN
-IRC_TYPE = PLUGIN
-JABBER_TYPE = PLUGIN
-GG_TYPE = PLUGIN
-NOVELL_TYPE = PLUGIN
-SILC_TYPE = PLUGIN
-SIMPLE_TYPE = PLUGIN
-SAMETIME_TYPE = PLUGIN
 
 all:
 	cp config.h.mingw config.h
-	$(MAKE) TYPE='$(OSCAR_TYPE)' -C $(OSCAR) -f Makefile.mingw
-	$(MAKE) TYPE='$(YAHOO_TYPE)' -C $(YAHOO) -f Makefile.mingw
-	$(MAKE) TYPE='$(MSN_TYPE)' -C $(MSN) -f Makefile.mingw
-	$(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f Makefile.mingw
-	$(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f Makefile.mingw
-	$(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f Makefile.mingw
-	$(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw
-	$(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f Makefile.mingw
-	$(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f Makefile.mingw
-	$(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f Makefile.mingw
-	$(MAKE) -C $(GAIM_SRC) -f Makefile.mingw
-	$(MAKE) -C $(GAIM_PLUGINS) -f Makefile.mingw
-
+	$(MAKE) -C $(LIBGAIM_TOP) -f Makefile.mingw
+	$(MAKE) -C $(GTKGAIM_TOP) -f Makefile.mingw
 
 install: all
 	mkdir -p $(GAIM_INSTALL_DIR)/plugins
 	mkdir -p $(GAIM_INSTALL_DIR)/sounds/gaim
-	$(MAKE) -C $(GAIM_PIXMAPS) -f Makefile.mingw install
 	$(MAKE) -C $(PO) -f Makefile.mingw install
-	$(MAKE) -C $(GAIM_SRC) -f Makefile.mingw install
-	$(MAKE) -C $(GAIM_PLUGINS) -f Makefile.mingw install
-	$(MAKE) TYPE='$(OSCAR_TYPE)' -C $(OSCAR) -f Makefile.mingw install
-	$(MAKE) TYPE='$(YAHOO_TYPE)' -C $(YAHOO) -f Makefile.mingw install
-	$(MAKE) TYPE='$(MSN_TYPE)' -C $(MSN) -f Makefile.mingw install
-	$(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f Makefile.mingw install
-	$(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f Makefile.mingw install
-	$(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f Makefile.mingw install
-	$(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw install
-	$(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f Makefile.mingw install
-	$(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f Makefile.mingw install
-	$(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f Makefile.mingw install
-	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
-	cp $(SOUNDS) $(GAIM_INSTALL_DIR)/sounds/gaim
+	$(MAKE) -C $(LIBGAIM_TOP) -f Makefile.mingw install
+	$(MAKE) -C $(GTKGAIM_TOP) -f Makefile.mingw install
 
 installer:
 	$(MAKENSIS) /DGAIM_VERSION="$(VERSION)" /DWITH_GTK gaim-installer.nsi
@@ -110,17 +42,7 @@
 
 clean:
 	$(MAKE) -C $(PO) -f Makefile.mingw clean
-	$(MAKE) -C $(OSCAR) -f Makefile.mingw clean
-	$(MAKE) -C $(YAHOO) -f Makefile.mingw clean
-	$(MAKE) -C $(MSN) -f Makefile.mingw clean
-	$(MAKE) -C $(IRC) -f Makefile.mingw clean
-	$(MAKE) -C $(JABBER) -f Makefile.mingw clean
-	$(MAKE) -C $(GG) -f Makefile.mingw clean
-	$(MAKE) -C $(NOVELL) -f Makefile.mingw clean
-	$(MAKE) -C $(SILC) -f Makefile.mingw clean
-	$(MAKE) -C $(SIMPLE) -f Makefile.mingw clean
-	$(MAKE) -C $(SAMETIME) -f Makefile.mingw clean
-	$(MAKE) -C $(GAIM_SRC) -f Makefile.mingw clean
-	$(MAKE) -C $(GAIM_PLUGINS) -f Makefile.mingw clean
+	$(MAKE) -C $(LIBGAIM_TOP) -f Makefile.mingw clean
+	$(MAKE) -C $(GTKGAIM_TOP) -f Makefile.mingw clean
 	rm -rf config.h $(GAIM_INSTALL_DIR)
 	rm -rf gaim*.exe
--- a/gaim-installer.nsi	Sun Aug 20 22:47:25 2006 +0000
+++ b/gaim-installer.nsi	Sun Aug 20 23:08:42 2006 +0000
@@ -740,9 +740,10 @@
     Delete "$INSTDIR\sounds\gaim\send.wav"
     RMDir "$INSTDIR\sounds\gaim"
     RMDir "$INSTDIR\sounds"
-    Delete "$INSTDIR\gaim.dll"
     Delete "$INSTDIR\gaim.exe"
+    Delete "$INSTDIR\gtkgaim.dll"
     Delete "$INSTDIR\idletrack.dll"
+    Delete "$INSTDIR\libgaim.dll"
     Delete "$INSTDIR\libgtkspell.dll"
     Delete "$INSTDIR\libmeanwhile-1.dll"
     Delete "$INSTDIR\libxml2.dll"
--- a/gtk/Makefile.mingw	Sun Aug 20 22:47:25 2006 +0000
+++ b/gtk/Makefile.mingw	Sun Aug 20 23:08:42 2006 +0000
@@ -11,13 +11,25 @@
 GTK_TOP :=		../../win32-dev/gtk_2_0
 GAIM_TOP :=		..
 GTKGAIM_TOP :=		.
-LIBGAIM_TOP :=		../libgaim
+LIBGAIM_TOP :=		$(GAIM_TOP)/libgaim
+PLUGINS_TOP :=		$(GTKGAIM_TOP)/plugins
+PIXMAPS_TOP :=		$(GTKGAIM_TOP)/pixmaps
+SOUNDS_TOP :=		$(GTKGAIM_TOP)/sounds
 ASPELL_TOP :=		../../win32-dev/aspell-dev-0-50-3-3
 GTKSPELL_TOP :=		../../win32-dev/gtkspell-2.0.6
 IDLETRACK_TOP :=	$(GTKGAIM_TOP)/win32/IdleTracker
 GAIM_INSTALL_DIR :=	$(GAIM_TOP)/win32-install-dir
 #LIBXML2_DIR :=		../../win32-dev/libxml2
 
+NEEDED_DLLS =		$(GTKSPELL_TOP)/gtkspell/libgtkspell.dll \
+			$(IDLETRACK_TOP)/idletrack.dll
+
+SOUNDS =		$(SOUNDS_TOP)/alert.wav \
+			$(SOUNDS_TOP)/login.wav \
+			$(SOUNDS_TOP)/logout.wav \
+			$(SOUNDS_TOP)/receive.wav \
+			$(SOUNDS_TOP)/send.wav
+
 ##
 ## VARIABLE DEFINITIONS
 ##
@@ -181,12 +193,17 @@
 ## TARGET DEFINITIONS
 ##
 
-.PHONY: all clean libgaim_include_path gtkgaim_include_path
+.PHONY: all clean
 
 all: $(EXE_TARGET).exe $(GTKGAIM_TARGET).dll
+	$(MAKE) -C $(PLUGINS_TOP) -f Makefile.mingw
 
 install: all
+	$(MAKE) -C $(PLUGINS_TOP) -f Makefile.mingw install
+	$(MAKE) -C $(PIXMAPS_TOP) -f Makefile.mingw install
 	cp $(GTKGAIM_TOP)/$(EXE_TARGET).exe $(GTKGAIM_TOP)/$(GTKGAIM_TARGET).dll $(GAIM_INSTALL_DIR)
+	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
+	cp $(SOUNDS) $(GAIM_INSTALL_DIR)/sounds/gaim
 
 $(LIBGAIM_TOP)/libgaim.dll.a:
 	S(MAKE) -C $(LIBGAIM_TOP) -f Makefile.mingw libgaim.dll.a
@@ -197,9 +214,6 @@
 #
 # BUILD DLL
 #
-#$(GTKGAIM_TARGET).dll.a $(GTKGAIM_TARGET).dll: INCLUDE_PATHS = $(GTKGAIM_INCLUDE_PATHS)
-#Once the UI split has finished for server.c, this will be the correct line
-#$(GTKGAIM_TARGET).dll.a $(GTKGAIM_TARGET).dll: $(LIBGAIM_TARGET).dll.a $(GTKGAIM_OBJECTS)
 $(GTKGAIM_TARGET).dll.a $(GTKGAIM_TARGET).dll: $(LIBGAIM_TOP)/libgaim.dll.a $(GTKGAIM_OBJECTS) $(IDLETRACK_TOP)/idletrack.dll
 	$(CC) -shared $(LIBGAIM_OBJECTS) $(GTKGAIM_OBJECTS) $(LIB_PATHS) $(GTKGAIM_LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(GTKGAIM_TARGET).dll.a -o $(GTKGAIM_TARGET).dll
 
@@ -224,6 +238,7 @@
 	rm -rf $(GTKGAIM_TARGET).dll
 	rm -rf $(GTKGAIM_TARGET).dll.a
 	rm -rf $(EXE_TARGET).exe
+	$(MAKE) -C $(PLUGINS_TOP) -f Makefile.mingw clean
 
 clean_exe:
 	rm -rf win_gaim.o
--- a/gtk/pixmaps/Makefile.mingw	Sun Aug 20 22:47:25 2006 +0000
+++ b/gtk/pixmaps/Makefile.mingw	Sun Aug 20 23:08:42 2006 +0000
@@ -4,7 +4,9 @@
 # Description: Makefile for win32 (mingw) version of Gaim pixmaps
 #
 
-datadir = ../win32-install-dir
+GAIM_TOP := ../..
+
+datadir = $(GAIM_TOP)/win32-install-dir
 
 include ./Makefile.am
 
--- a/gtk/pixmaps/smileys/Makefile.mingw	Sun Aug 20 22:47:25 2006 +0000
+++ b/gtk/pixmaps/smileys/Makefile.mingw	Sun Aug 20 23:08:42 2006 +0000
@@ -4,7 +4,9 @@
 # Description: Makefile for win32 (mingw) version of Gaim pixmaps
 #
 
-INSTALL_DIR = ../../win32-install-dir/pixmaps/gaim/smileys
+GAIM_TOP = ../../..
+
+INSTALL_DIR = $(GAIM_TOP)/win32-install-dir/pixmaps/gaim/smileys
 
 include ./Makefile.am
 
--- a/gtk/pixmaps/smileys/default/Makefile.mingw	Sun Aug 20 22:47:25 2006 +0000
+++ b/gtk/pixmaps/smileys/default/Makefile.mingw	Sun Aug 20 23:08:42 2006 +0000
@@ -4,7 +4,9 @@
 # Description: Makefile for win32 (mingw) version of Gaim pixmaps
 #
 
-datadir = ../../../win32-install-dir
+GAIM_TOP = ../../../..
+
+datadir = $(GAIM_TOP)/win32-install-dir
 include ./Makefile.am
 
 install:
--- a/gtk/pixmaps/smileys/none/Makefile.mingw	Sun Aug 20 22:47:25 2006 +0000
+++ b/gtk/pixmaps/smileys/none/Makefile.mingw	Sun Aug 20 23:08:42 2006 +0000
@@ -4,7 +4,9 @@
 # Description: Makefile for win32 (mingw) version of Gaim pixmaps
 #
 
-datadir = ../../../win32-install-dir
+GAIM_TOP = ../../../..
+
+datadir = $(GAIM_TOP)/win32-install-dir
 include ./Makefile.am
 
 install:
--- a/gtk/pixmaps/status/Makefile.mingw	Sun Aug 20 22:47:25 2006 +0000
+++ b/gtk/pixmaps/status/Makefile.mingw	Sun Aug 20 23:08:42 2006 +0000
@@ -4,7 +4,9 @@
 # Description: Makefile for win32 (mingw) version of Gaim pixmaps
 #
 
-INSTALL_DIR = ../../win32-install-dir/pixmaps/gaim/status
+GAIM_TOP = ../../..
+
+INSTALL_DIR = $(GAIM_TOP)/win32-install-dir/pixmaps/gaim/status
 
 include ./Makefile.am
 
--- a/gtk/pixmaps/status/default/Makefile.mingw	Sun Aug 20 22:47:25 2006 +0000
+++ b/gtk/pixmaps/status/default/Makefile.mingw	Sun Aug 20 23:08:42 2006 +0000
@@ -4,7 +4,9 @@
 # Description: Makefile for win32 (mingw) version of Gaim pixmaps
 #
 
-datadir = ../../../win32-install-dir
+GAIM_TOP = ../../../..
+
+datadir = $(GAIM_TOP)/win32-install-dir
 include ./Makefile.am
 
 install:
--- a/libgaim/Makefile.mingw	Sun Aug 20 22:47:25 2006 +0000
+++ b/libgaim/Makefile.mingw	Sun Aug 20 23:08:42 2006 +0000
@@ -8,13 +8,17 @@
 # PATHS
 #
 
-INCLUDE_DIR :=		.
 GTK_TOP :=		../../win32-dev/gtk_2_0
 GAIM_TOP :=		..
-GAIM_SRC :=		.
+LIBGAIM_TOP :=		.
+PLUGINS_TOP :=		$(LIBGAIM_TOP)/plugins
+PROTOCOLS_TOP :=	$(LIBGAIM_TOP)/protocols
 GAIM_INSTALL_DIR :=	$(GAIM_TOP)/win32-install-dir
 LIBXML2_DIR :=		../../win32-dev/libxml2
 
+NEEDED_DLLS = $(LIBXML2_DIR)/bin/libxml2.dll
+
+
 ##
 ## VARIABLE DEFINITIONS
 ##
@@ -31,15 +35,15 @@
 ## INCLUDE  MAKEFILES
 ##
 
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(LIBGAIM_TOP)/win32/global.mak
 
 ##
 ## INCLUDE PATHS
 ##
 
 INCLUDE_PATHS =	\
-			-I$(INCLUDE_DIR) \
-			-I$(INCLUDE_DIR)/win32 \
+			-I$(LIBGAIM_TOP) \
+			-I$(LIBGAIM_TOP)/win32 \
 			-I$(GAIM_TOP) \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
@@ -47,7 +51,7 @@
 			-I$(LIBXML2_DIR)/include
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_SRC) \
+			-L$(LIBGAIM_TOP) \
 			-L$(LIBXML2_DIR)/lib
 
 ##
@@ -134,11 +138,14 @@
 .PHONY: all clean include_path
 
 all: $(TARGET).dll
-	$(MAKE) -C protocols -f Makefile.mingw
+	$(MAKE) -C $(PROTOCOLS_TOP) -f Makefile.mingw
+	$(MAKE) -C $(PLUGINS_TOP) -f Makefile.mingw
 
 install: all
-	$(MAKE) -C protocols -f Makefile.mingw install
-	cp $(GAIM_SRC)/$(TARGET).dll $(GAIM_INSTALL_DIR)
+	$(MAKE) -C $(PROTOCOLS_TOP) -f Makefile.mingw install
+	$(MAKE) -C $(PLUGINS_TOP) -f Makefile.mingw install
+	cp $(LIBGAIM_TOP)/$(TARGET).dll $(GAIM_INSTALL_DIR)
+	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
 
 #
 # BUILD DLL
@@ -155,4 +162,5 @@
 	rm -rf *.o ./win32/*.o
 	rm -rf $(TARGET).dll
 	rm -rf $(TARGET).dll.a
-	$(MAKE) -C protocols -f Makefile.mingw clean
+	$(MAKE) -C $(PROTOCOLS_TOP) -f Makefile.mingw clean
+	$(MAKE) -C $(PLUGINS_TOP) -f Makefile.mingw clean