Menu
▾
▴
[Gaim-commits] SF.net SVN: gaim: [17008] trunk
|
From: <dat...@us...> - 2006-08-23 21:35:32
|
Revision: 17008 Author: datallah Date: 2006-08-23 14:34:43 -0700 (Wed, 23 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=17008&view=rev Log Message: ----------- Lee Roach revamped the win32 makefiles. This makes me happy, they were in dire need of some loving. This makes life a great deal easier for anyone who wants to build out-of-tree plugins. Modified Paths: -------------- trunk/Makefile.mingw trunk/gtk/Makefile.mingw trunk/gtk/pixmaps/Makefile.mingw trunk/gtk/pixmaps/smileys/Makefile.mingw trunk/gtk/pixmaps/smileys/default/Makefile.mingw trunk/gtk/pixmaps/smileys/none/Makefile.mingw trunk/gtk/pixmaps/status/Makefile.mingw trunk/gtk/pixmaps/status/default/Makefile.mingw trunk/gtk/plugins/Makefile.mingw trunk/gtk/plugins/docklet/Makefile.mingw trunk/gtk/plugins/ticker/Makefile.mingw trunk/gtk/plugins/win32/transparency/Makefile.mingw trunk/gtk/plugins/win32/winprefs/Makefile.mingw trunk/gtk/win32/IdleTracker/Makefile.mingw trunk/libgaim/Makefile.mingw trunk/libgaim/plugins/Makefile.mingw trunk/libgaim/plugins/perl/Makefile.mingw trunk/libgaim/plugins/perl/common/Makefile.mingw trunk/libgaim/plugins/perl/common/module.h trunk/libgaim/plugins/ssl/Makefile.mingw trunk/libgaim/plugins/tcl/Makefile.mingw trunk/libgaim/protocols/Makefile.mingw trunk/libgaim/protocols/bonjour/Makefile.mingw trunk/libgaim/protocols/gg/Makefile.mingw trunk/libgaim/protocols/irc/Makefile.mingw trunk/libgaim/protocols/jabber/Makefile.mingw trunk/libgaim/protocols/msn/Makefile.mingw trunk/libgaim/protocols/novell/Makefile.mingw trunk/libgaim/protocols/oscar/Makefile.mingw trunk/libgaim/protocols/qq/Makefile.mingw trunk/libgaim/protocols/sametime/Makefile.mingw trunk/libgaim/protocols/silc/Makefile.mingw trunk/libgaim/protocols/simple/Makefile.mingw trunk/libgaim/protocols/toc/Makefile.mingw trunk/libgaim/protocols/yahoo/Makefile.mingw trunk/libgaim/protocols/zephyr/Makefile.mingw trunk/libgaim/win32/global.mak trunk/po/Makefile.mingw Added Paths: ----------- trunk/gtk/sounds/Makefile.mingw trunk/libgaim/win32/rules.mak trunk/libgaim/win32/targets.mak Modified: trunk/Makefile.mingw =================================================================== --- trunk/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -5,44 +5,37 @@ # Description: Top Makefile for win32 (mingw) port of Gaim # -LIBGAIM_TOP = ./libgaim -GTKGAIM_TOP = ./gtk -GAIM_SOUNDS = ./sounds -GAIM_INSTALL_DIR = ./win32-install-dir -PO = ./po +GAIM_TOP := . +include $(GAIM_TOP)/libgaim/win32/global.mak -MAKENSIS := makensis.exe +all: $(GAIM_CONFIG_H) + $(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE) + $(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) + $(MAKE) -C $(GAIM_PO_TOP) -f $(GAIM_WIN32_MAKEFILE) -VERSION := $(shell cat ./VERSION) +install: all $(GAIM_INSTALL_DIR) + $(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE) install + $(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) install + $(MAKE) -C $(GAIM_PO_TOP) -f $(GAIM_WIN32_MAKEFILE) install +installer: install + $(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DWITH_GTK gaim-installer.nsi -all: - cp config.h.mingw config.h - $(MAKE) -C $(LIBGAIM_TOP) -f Makefile.mingw - $(MAKE) -C $(GTKGAIM_TOP) -f Makefile.mingw +installer_nogtk: install + $(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" gaim-installer.nsi -install: all - mkdir -p $(GAIM_INSTALL_DIR)/plugins - mkdir -p $(GAIM_INSTALL_DIR)/sounds/gaim - $(MAKE) -C $(PO) -f Makefile.mingw install - $(MAKE) -C $(LIBGAIM_TOP) -f Makefile.mingw install - $(MAKE) -C $(GTKGAIM_TOP) -f Makefile.mingw install +installer_debug: install + $(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DDEBUG gaim-installer.nsi -installer: - $(MAKENSIS) /DGAIM_VERSION="$(VERSION)" /DWITH_GTK gaim-installer.nsi - -installer_nogtk: - $(MAKENSIS) /DGAIM_VERSION="$(VERSION)" gaim-installer.nsi - -installer_debug: - $(MAKENSIS) /DGAIM_VERSION="$(VERSION)" /DDEBUG gaim-installer.nsi - installers: installer installer_nogtk - clean: - $(MAKE) -C $(PO) -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) + $(MAKE) -C $(GAIM_PO_TOP) -f $(GAIM_WIN32_MAKEFILE) clean + $(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) clean + $(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE) clean + rm -rf $(GAIM_CONFIG_H) rm -rf gaim*.exe + rm -rf $(GAIM_INSTALL_PERLMOD_DIR) $(GAIM_INSTALL_PIXMAPS_DIR) $(GAIM_INSTALL_PLUGINS_DIR) + rm -rf $(GAIM_INSTALL_PO_DIR) $(GAIM_INSTALL_SOUNDS_DIR) $(GAIM_INSTALL_DIR) + +include $(GAIM_COMMON_TARGETS) Modified: trunk/gtk/Makefile.mingw =================================================================== --- trunk/gtk/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/gtk/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -4,46 +4,17 @@ # Description: Makefile for win32 (mingw) version of Gaim # -# -# PATHS -# +GAIM_TOP := .. +include $(GAIM_TOP)/libgaim/win32/global.mak -GTK_TOP := ../../win32-dev/gtk_2_0 -GAIM_TOP := .. -GTKGAIM_TOP := . -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 -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 ## - EXE_TARGET = gaim - GTKGAIM_TARGET = gtkgaim -# Compiler and Linker Options - -CFLAGS = - -DEFINES = - ifeq ($(MAKECMDGOALS), $(EXE_TARGET)-portable.exe) DEFINES := $(DEFINES) -DPORTABLE endif @@ -54,33 +25,22 @@ LDFLAGS := $(WINAPP) -WINDRES := windres - ## -## INCLUDE MAKEFILES -## - -include $(LIBGAIM_TOP)/win32/global.mak - -## ## INCLUDE PATHS ## - LIBGAIM_INCLUDE_PATHS = \ - -I$(LIBGAIM_TOP) \ - -I$(LIBGAIM_TOP)/win32 \ + -I$(GAIM_LIB_TOP) \ + -I$(GAIM_LIB_TOP)/win32 \ -I$(GAIM_TOP) \ -I$(GTK_TOP)/include \ -I$(GTK_TOP)/include/glib-2.0 \ -I$(GTK_TOP)/lib/glib-2.0/include -# -I$(LIBXML2_DIR)/include - INCLUDE_PATHS = \ $(LIBGAIM_INCLUDE_PATHS) \ - -I$(IDLETRACK_TOP) \ - -I$(GTKGAIM_TOP) \ - -I$(GTKGAIM_TOP)/win32 \ + -I$(GAIM_GTK_IDLETRACK_TOP) \ + -I$(GAIM_GTK_TOP) \ + -I$(GAIM_GTK_TOP)/win32 \ -I$(GTK_TOP)/include/gtk-2.0 \ -I$(GTK_TOP)/include/pango-1.0 \ -I$(GTK_TOP)/include/atk-1.0 \ @@ -88,20 +48,15 @@ -I$(GTKSPELL_TOP) \ -I$(ASPELL_TOP)/include - - LIB_PATHS = -L$(GTK_TOP)/lib \ - -L$(LIBGAIM_TOP) \ - -L$(GTKGAIM_TOP) \ - -L$(IDLETRACK_TOP) \ + -L$(GAIM_LIB_TOP) \ + -L$(GAIM_GTK_TOP) \ + -L$(GAIM_GTK_IDLETRACK_TOP) \ -L$(ASPELL_TOP)/lib -# -L$(LIBXML2_DIR)/lib - ## ## SOURCES, OBJECTS ## - GTKGAIM_C_SRC = \ gaimstock.c \ gtkaccount.c \ @@ -140,18 +95,14 @@ win32/untar.c \ win32/wspell.c -RC_SRC = win32/gaimrc.rc - -EXE_C_SRC = win32/win_gaim.c - +RC_SRC = win32/gaimrc.rc +EXE_C_SRC = win32/win_gaim.c GTKGAIM_OBJECTS = $(GTKGAIM_C_SRC:%.c=%.o) - EXE_OBJECTS = $(EXE_C_SRC:%.c=%.o) $(RC_SRC:%.rc=%.o) ## ## LIBRARIES ## - LIBGAIM_LIBS = \ -lgaim \ -lglib-2.0 \ @@ -165,8 +116,6 @@ -liberty \ -lidletrack -# -lxml2 - GTKGAIM_LIBS = \ $(LIBGAIM_LIBS) \ -lgtk-win32-2.0 \ @@ -175,70 +124,49 @@ -lgdk-win32-2.0 \ -lgdk_pixbuf-2.0 -EXE_LIBS = +include $(GAIM_COMMON_RULES) ## -## RULES -## - -# How to make a C file -%.o: %.c - $(CC) $(CFLAGS) $(INCLUDE_PATHS) $(DEFINES) -c $< -o $@ - -# How to make an RC file -%.o: %.rc - $(WINDRES) -i $< -o $@ - -## ## TARGET DEFINITIONS ## - .PHONY: all clean all: $(EXE_TARGET).exe $(GTKGAIM_TARGET).dll - $(MAKE) -C $(PLUGINS_TOP) -f Makefile.mingw + $(MAKE) -C $(GAIM_GTK_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE) -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) +install: all $(GAIM_INSTALL_DIR) + $(MAKE) -C $(GAIM_GTK_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE) install + $(MAKE) -C $(GAIM_GTK_PIXMAPS_TOP) -f $(GAIM_WIN32_MAKEFILE) install + $(MAKE) -C $(GAIM_GTK_SOUNDS_TOP) -f $(GAIM_WIN32_MAKEFILE) install + $(MAKE) -C $(GAIM_GTK_IDLETRACK_TOP) -f $(GAIM_WIN32_MAKEFILE) install + cp $(EXE_TARGET).exe $(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 +$(GTKGAIM_OBJECTS): $(GAIM_CONFIG_H) -$(IDLETRACK_TOP)/idletrack.dll: - $(MAKE) -C $(IDLETRACK_TOP) -f Makefile.mingw - -# -# BUILD DLL -# -$(GTKGAIM_TARGET).dll.a $(GTKGAIM_TARGET).dll: $(LIBGAIM_TOP)/libgaim.dll.a $(GTKGAIM_OBJECTS) $(IDLETRACK_TOP)/idletrack.dll +$(GTKGAIM_TARGET).dll $(GTKGAIM_TARGET).dll.a: $(GAIM_LIBGAIM_DLL).a $(GAIM_IDLETRACK_DLL).a $(GTKGAIM_OBJECTS) $(CC) -shared $(LIBGAIM_OBJECTS) $(GTKGAIM_OBJECTS) $(LIB_PATHS) $(GTKGAIM_LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(GTKGAIM_TARGET).dll.a -o $(GTKGAIM_TARGET).dll -# -# BUILD EXE -# - -$(EXE_TARGET).exe: $(GTKGAIM_TARGET).dll $(EXE_OBJECTS) +$(EXE_TARGET).exe: $(GAIM_CONFIG_H) $(GAIM_GTKGAIM_DLL).a $(GAIM_IDLETRACK_DLL).a $(EXE_OBJECTS) $(CC) $(LDFLAGS) $(EXE_OBJECTS) $(LIB_PATHS) $(EXE_LIBS) -o $(EXE_TARGET).exe -$(EXE_TARGET)-portable.exe: clean_exe $(EXE_OBJECTS) +$(EXE_TARGET)-portable.exe: clean_exe $(GAIM_CONFIG_H) $(GAIM_GTKGAIM_DLL).a $(GAIM_IDLETRACK_DLL).a $(EXE_OBJECTS) $(CC) $(LDFLAGS) $(EXE_OBJECTS) $(LIB_PATHS) $(EXE_LIBS) -o $(EXE_TARGET)-portable.exe rm win_gaim.o ## ## CLEAN RULES ## - clean: - $(MAKE) -C $(IDLETRACK_TOP) -f Makefile.mingw clean - rm -rf *.o ./win32/*.o - rm -rf $(GTKGAIM_TARGET).dll - rm -rf $(GTKGAIM_TARGET).dll.a - rm -rf $(EXE_TARGET).exe - $(MAKE) -C $(PLUGINS_TOP) -f Makefile.mingw clean + $(MAKE) -C $(GAIM_GTK_IDLETRACK_TOP) -f $(GAIM_WIN32_MAKEFILE) clean + $(MAKE) -C $(GAIM_GTK_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE) clean + rm -rf $(GTKGAIM_OBJECTS) $(EXE_OBJECTS) + rm $(GTKGAIM_TARGET).dll + rm $(GTKGAIM_TARGET).dll.a + rm $(EXE_TARGET).exe + rm $(EXE_TARGET)-portable.exe clean_exe: - rm -rf win_gaim.o + rm win_gaim.o + +include $(GAIM_COMMON_TARGETS) Modified: trunk/gtk/pixmaps/Makefile.mingw =================================================================== --- trunk/gtk/pixmaps/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/gtk/pixmaps/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -5,9 +5,9 @@ # GAIM_TOP := ../.. +include $(GAIM_TOP)/libgaim/win32/global.mak -datadir = $(GAIM_TOP)/win32-install-dir - +datadir = $(GAIM_INSTALL_DIR) include ./Makefile.am install: Modified: trunk/gtk/pixmaps/smileys/Makefile.mingw =================================================================== --- trunk/gtk/pixmaps/smileys/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/gtk/pixmaps/smileys/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -4,10 +4,6 @@ # Description: Makefile for win32 (mingw) version of Gaim pixmaps # -GAIM_TOP = ../../.. - -INSTALL_DIR = $(GAIM_TOP)/win32-install-dir/pixmaps/gaim/smileys - include ./Makefile.am install: Modified: trunk/gtk/pixmaps/smileys/default/Makefile.mingw =================================================================== --- trunk/gtk/pixmaps/smileys/default/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/gtk/pixmaps/smileys/default/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -4,9 +4,10 @@ # Description: Makefile for win32 (mingw) version of Gaim pixmaps # -GAIM_TOP = ../../../.. +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libgaim/win32/global.mak -datadir = $(GAIM_TOP)/win32-install-dir +datadir = $(GAIM_INSTALL_DIR) include ./Makefile.am install: Modified: trunk/gtk/pixmaps/smileys/none/Makefile.mingw =================================================================== --- trunk/gtk/pixmaps/smileys/none/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/gtk/pixmaps/smileys/none/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -4,9 +4,10 @@ # Description: Makefile for win32 (mingw) version of Gaim pixmaps # -GAIM_TOP = ../../../.. +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libgaim/win32/global.mak -datadir = $(GAIM_TOP)/win32-install-dir +datadir = $(GAIM_INSTALL_DIR) include ./Makefile.am install: Modified: trunk/gtk/pixmaps/status/Makefile.mingw =================================================================== --- trunk/gtk/pixmaps/status/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/gtk/pixmaps/status/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -4,10 +4,6 @@ # Description: Makefile for win32 (mingw) version of Gaim pixmaps # -GAIM_TOP = ../../.. - -INSTALL_DIR = $(GAIM_TOP)/win32-install-dir/pixmaps/gaim/status - include ./Makefile.am install: Modified: trunk/gtk/pixmaps/status/default/Makefile.mingw =================================================================== --- trunk/gtk/pixmaps/status/default/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/gtk/pixmaps/status/default/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -5,8 +5,9 @@ # GAIM_TOP = ../../../.. +include $(GAIM_TOP)/libgaim/win32/global.mak -datadir = $(GAIM_TOP)/win32-install-dir +datadir = $(GAIM_INSTALL_DIR) include ./Makefile.am install: Modified: trunk/gtk/plugins/Makefile.mingw =================================================================== --- trunk/gtk/plugins/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/gtk/plugins/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -4,46 +4,20 @@ # Description: Makefile for win32 (mingw) version of Gaim Plugins # -# -# PATHS -# +GAIM_TOP := ../.. +include $(GAIM_TOP)/libgaim/win32/global.mak -GAIM_PLUGINS := . -GAIM_TOP := ../.. -GTKGAIM_TOP := .. -LIBGAIM_TOP := $(GAIM_TOP)/libgaim -GTK_TOP := ../../../win32-dev/gtk_2_0 -#OSCAR_ROOT := ../src/protocols/oscar -GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir -TICKER := ./ticker -TRANSPARENCY := ./win32/transparency -WINPREFS := ./win32/winprefs -#PERL_PLUGIN_LOADER := ./perl -DOCKLET := ./docklet +DOCKLET_PLUGIN := $(GAIM_GTK_PLUGINS_TOP)/docklet +TICKER_PLUGIN := $(GAIM_GTK_PLUGINS_TOP)/ticker +TRANSPARENCY_PLUGIN := $(GAIM_GTK_PLUGINS_TOP)/win32/transparency +WINPREFS_PLUGIN := $(GAIM_GTK_PLUGINS_TOP)/win32/winprefs -## -## VARIABLE DEFINITIONS -## - -# Compiler Options - -CFLAGS = - -DEFINES = - .SUFFIXES: .SUFFIXES: .c .dll ## -## INCLUDE MAKEFILES -## - -include $(LIBGAIM_TOP)/win32/global.mak - -## ## INCLUDE PATHS ## - INCLUDE_PATHS += \ -I$(GTK_TOP)/include \ -I$(GTK_TOP)/include/gtk-2.0 \ @@ -53,21 +27,18 @@ -I$(GTK_TOP)/lib/glib-2.0/include \ -I$(GTK_TOP)/lib/gtk-2.0/include \ -I$(GAIM_TOP) \ - -I$(LIBGAIM_TOP) \ - -I$(LIBGAIM_TOP)/win32 \ - -I$(GTKGAIM_TOP) \ - -I$(GTKGAIM_TOP)/win32 + -I$(GAIM_LIB_TOP) \ + -I$(GAIM_LIB_TOP)/win32 \ + -I$(GAIM_GTK_TOP) \ + -I$(GAIM_GTK_TOP)/win32 - LIB_PATHS = -L$(GTK_TOP)/lib \ - -L$(LIBGAIM_TOP) \ - -L$(GTKGAIM_TOP) + -L$(GAIM_LIB_TOP) \ + -L$(GAIM_GTK_TOP) - ## ## LIBRARIES ## - LIBS = -lgtk-win32-2.0 \ -lglib-2.0 \ -lgdk-win32-2.0 \ @@ -81,32 +52,23 @@ -lgtkgaim ## -## RULES -## - -## ## TARGET DEFINITIONS ## - .PHONY: all clean all: plugins - $(MAKE) -C $(TICKER) -f Makefile.mingw - $(MAKE) -C $(WINPREFS) -f Makefile.mingw - $(MAKE) -C $(TRANSPARENCY) -f Makefile.mingw - $(MAKE) -C $(DOCKLET) -f Makefile.mingw + $(MAKE) -C $(DOCKLET_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) + $(MAKE) -C $(TICKER_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) + $(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) + $(MAKE) -C $(WINPREFS_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) -install: - cp $(GAIM_PLUGINS)/*.dll $(GAIM_INSTALL_DIR)/plugins - $(MAKE) -C $(TICKER) -f Makefile.mingw install - $(MAKE) -C $(WINPREFS) -f Makefile.mingw install - $(MAKE) -C $(TRANSPARENCY) -f Makefile.mingw install - $(MAKE) -C $(DOCKLET) -f Makefile.mingw install +install: $(GAIM_INSTALL_PLUGINS_DIR) + $(MAKE) -C $(DOCKLET_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install + $(MAKE) -C $(TICKER_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install + $(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install + $(MAKE) -C $(WINPREFS_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install + cp $(GAIM_GTK_PLUGINS_TOP)/*.dll $(GAIM_INSTALL_PLUGINS_DIR) -# -# BUILD Plugin -# - .c.dll: $(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@.o -c $< $(CC) -shared $@.o $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $@ @@ -115,22 +77,22 @@ extplacement.dll \ gaimrc.dll \ history.dll \ - iconaway.dll \ + iconaway.dll \ notify.dll \ relnot.dll \ spellchk.dll \ timestamp_format.dll \ timestamp.dll - ## ## CLEAN RULES ## - clean: - rm -rf *.o - rm -rf *.dll - $(MAKE) -C $(TICKER) -f Makefile.mingw clean - $(MAKE) -C $(TRANSPARENCY) -f Makefile.mingw clean - $(MAKE) -C $(WINPREFS) -f Makefile.mingw clean - $(MAKE) -C $(DOCKLET) -f Makefile.mingw clean + rm -rf $(GAIM_GTK_PLUGINS_TOP)/*.o + rm -rf $(GAIM_GTK_PLUGINS_TOP)/*.dll + $(MAKE) -C $(DOCKLET_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean + $(MAKE) -C $(TICKER_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean + $(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean + $(MAKE) -C $(WINPREFS_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean + +include $(GAIM_COMMON_TARGETS) Modified: trunk/gtk/plugins/docklet/Makefile.mingw =================================================================== --- trunk/gtk/plugins/docklet/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/gtk/plugins/docklet/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -4,39 +4,14 @@ # Description: Makefile for docklet plugin. # -# -# PATHS -# +GAIM_TOP := ../../.. +include $(GAIM_TOP)/libgaim/win32/global.mak -GTK_TOP := ../../../../win32-dev/gtk_2_0 -GAIM_TOP := ../../.. -LIBGAIM_TOP := $(GAIM_TOP)/libgaim -GTKGAIM_TOP := $(GAIM_TOP)/gtk -GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir -DLL_INSTALL_DIR := $(GAIM_INSTALL_DIR)/plugins - -## -## VARIABLE DEFINITIONS -## - TARGET = docklet -# Compiler Options - -CFLAGS = - -DEFINES = - ## -## INCLUDE MAKEFILES -## - -include $(LIBGAIM_TOP)/win32/global.mak - -## ## INCLUDE PATHS ## - INCLUDE_PATHS += -I. \ -I$(GTK_TOP)/include \ -I$(GTK_TOP)/include/gtk-2.0 \ @@ -45,34 +20,28 @@ -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$(GTKGAIM_TOP) \ - -I$(GTKGAIM_TOP)/win32 \ + -I$(GAIM_LIB_TOP) \ + -I$(GAIM_LIB_TOP)/win32 \ + -I$(GAIM_GTK_TOP) \ + -I$(GAIM_GTK_TOP)/win32 \ -I$(GAIM_TOP) - LIB_PATHS = -L$(GTK_TOP)/lib \ - -L$(LIBGAIM_TOP) \ - -L$(GTKGAIM_TOP) + -L$(GAIM_LIB_TOP) \ + -L$(GAIM_GTK_TOP) - ## ## SOURCES, OBJECTS ## - C_SRC = docklet.c \ docklet-win32.c \ MinimizeToTray.c - OBJECTS = $(C_SRC:%.c=%.o) - ## ## LIBRARIES ## - LIBS = -lgtk-win32-2.0 \ -lglib-2.0 \ -lgdk-win32-2.0 \ @@ -81,47 +50,28 @@ -lgaim \ -lgtkgaim +include $(GAIM_COMMON_RULES) ## -## RULES -## - -# How to make a C file - -%.o: %.c - $(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@ -c $< - -## ## TARGET DEFINITIONS ## - .PHONY: all clean all: $(TARGET).dll -install: all - cp $(TARGET).dll $(DLL_INSTALL_DIR) +install: all $(GAIM_INSTALL_PLUGINS_DIR) + cp $(TARGET).dll $(GAIM_INSTALL_PLUGINS_DIR) +$(OBJECTS): $(GAIM_CONFIG_H) -## -## BUILD Dependencies -## - -$(GTKGAIM_TOP)/gtkgaim.dll.a: - $(MAKE) -C $(GTKGAIM_TOP) -f Makefile.mingw gtkgaim.dll.a - - -## -## BUILD DLL -## - -$(TARGET).dll: $(OBJECTS) $(GTKGAIM_TOP)/gtkgaim.dll.a +$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(GAIM_GTKGAIM_DLL).a $(OBJECTS) $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll ## ## CLEAN RULES ## - clean: - rm -rf *.o + rm -rf $(OBJECTS) rm -rf $(TARGET).dll + +include $(GAIM_COMMON_TARGETS) Modified: trunk/gtk/plugins/ticker/Makefile.mingw =================================================================== --- trunk/gtk/plugins/ticker/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/gtk/plugins/ticker/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -4,42 +4,15 @@ # Description: Makefile for ticker plugin. # -# -# PATHS -# +GAIM_TOP := ../../.. +include $(GAIM_TOP)/libgaim/win32/global.mak -GTK_TOP := ../../../../win32-dev/gtk_2_0 -GAIM_TOP := ../../.. -GTKGAIM_TOP := $(GAIM_TOP)/gtk -LIBGAIM_TOP := $(GAIM_TOP)/libgaim -TICKER_ROOT := . -GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir -DLL_INSTALL_DIR := $(GAIM_INSTALL_DIR)/plugins - -## -## VARIABLE DEFINITIONS -## - TARGET = ticker -# Compiler Options - -CFLAGS = - -DEFINES = - - ## -## INCLUDE MAKEFILES -## - -include $(LIBGAIM_TOP)/win32/global.mak - -## ## INCLUDE PATHS ## - -INCLUDE_PATHS += -I$(TICKER_ROOT) \ +INCLUDE_PATHS += -I. \ -I$(GTK_TOP)/include \ -I$(GTK_TOP)/include/gtk-2.0 \ -I$(GTK_TOP)/include/glib-2.0 \ @@ -47,33 +20,27 @@ -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$(GTKGAIM_TOP) \ - -I$(GTKGAIM_TOP)/win32 \ + -I$(GAIM_LIB_TOP) \ + -I$(GAIM_LIB_TOP)/win32 \ + -I$(GAIM_GTK_TOP) \ + -I$(GAIM_GTK_TOP)/win32 \ -I$(GAIM_TOP) - LIB_PATHS = -L$(GTK_TOP)/lib \ - -L$(LIBGAIM_TOP) \ - -L$(GTKGAIM_TOP) + -L$(GAIM_LIB_TOP) \ + -L$(GAIM_GTK_TOP) - ## ## SOURCES, OBJECTS ## - C_SRC = ticker.c \ gtkticker.c - OBJECTS = $(C_SRC:%.c=%.o) - ## ## LIBRARIES ## - LIBS = -lgtk-win32-2.0 \ -lglib-2.0 \ -lgdk-win32-2.0 \ @@ -83,45 +50,28 @@ -lgaim \ -lgtkgaim -## -## RULES -## +include $(GAIM_COMMON_RULES) -# How to make a C file - -%.o: %.c - $(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@ -c $< - ## ## TARGET DEFINITIONS ## - .PHONY: all clean all: $(TARGET).dll -install: - cp $(TICKER_ROOT)/$(TARGET).dll $(DLL_INSTALL_DIR) +install: $(GAIM_INSTALL_PLUGINS_DIR) + cp $(TARGET).dll $(GAIM_INSTALL_PLUGINS_DIR) +$(OBJECTS): $(GAIM_CONFIG_H) -## -## BUILD Dependencies -## - -$(GTKGAIM_TOP)/gtkgaim.dll.a: - $(MAKE) -C $(GTKGAIM_TOP) -f Makefile.mingw gtkgaim.dll.a - -## -## BUILD DLL -## - -$(TARGET).dll: $(OBJECTS) $(GTKGAIM_TOP)/gtkgaim.dll.a +$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(GAIM_GTKGAIM_DLL).a $(OBJECTS) $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll ## ## CLEAN RULES ## - clean: - rm -rf *.o + rm -rf $(OBJECTS) rm -rf $(TARGET).dll + +include $(GAIM_COMMON_TARGETS) Modified: trunk/gtk/plugins/win32/transparency/Makefile.mingw =================================================================== --- trunk/gtk/plugins/win32/transparency/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/gtk/plugins/win32/transparency/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -4,40 +4,15 @@ # Description: Makefile for win32trans plugin. # -# -# PATHS -# +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libgaim/win32/global.mak -GTK_TOP := ../../../../../win32-dev/gtk_2_0 -GAIM_TOP := ../../../.. -LIBGAIM_TOP := ../../../../libgaim -GTKGAIM_TOP := ../../../../gtk -GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir -DLL_INSTALL_DIR := $(GAIM_INSTALL_DIR)/plugins - -## -## VARIABLE DEFINITIONS -## - TARGET = win2ktrans +DEFINES += -D_WIN32_WINNT=0x0500 -# Compiler Options - -CFLAGS = - -# This plugin requires W2K+ API -DEFINES = -D_WIN32_WINNT=0x0500 - ## -## INCLUDE MAKEFILES -## - -include $(LIBGAIM_TOP)/win32/global.mak - -## ## INCLUDE PATHS ## - INCLUDE_PATHS += -I. \ -I$(GTK_TOP)/include \ -I$(GTK_TOP)/include/gtk-2.0 \ @@ -46,32 +21,26 @@ -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$(GTKGAIM_TOP) \ - -I$(GTKGAIM_TOP)/win32 \ + -I$(GAIM_LIB_TOP) \ + -I$(GAIM_LIB_TOP)/win32 \ + -I$(GAIM_GTK_TOP) \ + -I$(GAIM_GTK_TOP)/win32 \ -I$(GAIM_TOP) - LIB_PATHS = -L$(GTK_TOP)/lib \ - -L$(LIBGAIM_TOP) \ - -L$(GTKGAIM_TOP) + -L$(GAIM_LIB_TOP) \ + -L$(GAIM_GTK_TOP) - ## ## SOURCES, OBJECTS ## - C_SRC = win2ktrans.c - OBJECTS = $(C_SRC:%.c=%.o) - ## ## LIBRARIES ## - LIBS = -lgtk-win32-2.0 \ -lglib-2.0 \ -lgdk-win32-2.0 \ @@ -81,46 +50,26 @@ -lgtkgaim \ -lgaim +include $(GAIM_COMMON_RULES) ## -## RULES -## - -# How to make a C file - -%.o: %.c - $(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@ -c $< - -## ## TARGET DEFINITIONS ## - .PHONY: all clean all: $(TARGET).dll -install: all - cp $(TARGET).dll $(DLL_INSTALL_DIR) +install: all $(GAIM_INSTALL_PLUGINS_DIR) + cp $(TARGET).dll $(GAIM_INSTALL_PLUGINS_DIR) - -## -## BUILD Dependencies -## - -$(GTKGAIM_TOP)/gtkgaim.dll.a: - $(MAKE) -C $(GTKGAIM_TOP) -f Makefile.mingw gtkgaim.dll.a - -## -## BUILD DLL -## - -$(TARGET).dll: $(OBJECTS) $(GTKGAIM_TOP)/gtkgaim.dll.a +$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(GAIM_GTKGAIM_DLL).a $(OBJECTS) $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll ## ## CLEAN RULES ## - clean: - rm -rf *.o + rm -rf $(OBJECTS) rm -rf $(TARGET).dll + +include $(GAIM_COMMON_TARGETS) Modified: trunk/gtk/plugins/win32/winprefs/Makefile.mingw =================================================================== --- trunk/gtk/plugins/win32/winprefs/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/gtk/plugins/win32/winprefs/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -4,39 +4,15 @@ # Description: Makefile for winprefs plugin. # -# -# PATHS -# +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libgaim/win32/global.mak -GTK_TOP := ../../../../../win32-dev/gtk_2_0 -GAIM_TOP := ../../../.. -LIBGAIM_TOP := $(GAIM_TOP)/libgaim -GTKGAIM_TOP := $(GAIM_TOP)/gtk -GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir -DLL_INSTALL_DIR := $(GAIM_INSTALL_DIR)/plugins - -## -## VARIABLE DEFINITIONS -## - TARGET = winprefs +DEFINES += -DWINVER=0x500 -# Compiler Options - -CFLAGS = - -DEFINES = -DWINVER=0x500 - ## -## INCLUDE MAKEFILES -## - -include $(LIBGAIM_TOP)/win32/global.mak - -## ## INCLUDE PATHS ## - INCLUDE_PATHS += -I. \ -I$(GTK_TOP)/include \ -I$(GTK_TOP)/include/gtk-2.0 \ @@ -45,33 +21,27 @@ -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$(GTKGAIM_TOP) \ - -I$(GTKGAIM_TOP)/win32 \ + -I$(GAIM_LIB_TOP) \ + -I$(GAIM_LIB_TOP)/win32 \ + -I$(GAIM_GTK_TOP) \ + -I$(GAIM_GTK_TOP)/win32 \ -I$(GAIM_TOP) - LIB_PATHS = -L$(GTK_TOP)/lib \ - -L$(LIBGAIM_TOP) \ - -L$(GTKGAIM_TOP) + -L$(GAIM_LIB_TOP) \ + -L$(GAIM_GTK_TOP) - ## ## SOURCES, OBJECTS ## - C_SRC = winprefs.c \ gtkappbar.c - OBJECTS = $(C_SRC:%.c=%.o) - ## ## LIBRARIES ## - LIBS = -lgtk-win32-2.0 \ -lglib-2.0 \ -lgdk-win32-2.0 \ @@ -82,46 +52,29 @@ -lgaim \ -lgtkgaim +include $(GAIM_COMMON_RULES) ## -## RULES -## - -# How to make a C file - -%.o: %.c - $(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@ -c $< - -## ## TARGET DEFINITIONS ## - .PHONY: all clean all: $(TARGET).dll -install: $(TARGET).dll - cp $(TARGET).dll $(DLL_INSTALL_DIR) +install: $(TARGET).dll $(GAIM_INSTALL_PLUGINS_DIR) + cp $(TARGET).dll $(GAIM_INSTALL_PLUGINS_DIR) - ## -## BUILD Dependencies -## - -$(GTKGAIM_TOP)/gtkgaim.dll.a: - $(MAKE) -C $(GTKGAIM_TOP) -f Makefile.mingw gtkgaim.dll.a - -## ## BUILD DLL ## - -$(TARGET).dll: $(OBJECTS) $(GTKGAIM_TOP)/gtkgaim.dll.a +$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(GAIM_GTKGAIM_DLL).a $(OBJECTS) $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll ## ## CLEAN RULES ## - clean: - rm -rf *.o + rm -rf $(OBJECTS) rm -rf $(TARGET).dll + +include $(GAIM_COMMON_TARGETS) Added: trunk/gtk/sounds/Makefile.mingw =================================================================== --- trunk/gtk/sounds/Makefile.mingw (rev 0) +++ trunk/gtk/sounds/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -0,0 +1,14 @@ +# +# Makefile.mingw +# +# Description: Makefile for win32 (mingw) version of Gaim +# + +GAIM_TOP := ../.. +include $(GAIM_TOP)/libgaim/win32/global.mak +include $(GAIM_GTK_SOUNDS_TOP)/Makefile.am + +install: $(GAIM_INSTALL_SOUNDS_DIR) + cp $(EXTRA_DIST) $(GAIM_INSTALL_SOUNDS_DIR) + +include $(GAIM_COMMON_TARGETS) Property changes on: trunk/gtk/sounds/Makefile.mingw ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: trunk/gtk/win32/IdleTracker/Makefile.mingw =================================================================== --- trunk/gtk/win32/IdleTracker/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/gtk/win32/IdleTracker/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -4,65 +4,22 @@ # Description: Makefile for idletrack # -# -# PATHS -# +GAIM_TOP := ../../.. +include $(GAIM_TOP)/libgaim/win32/global.mak -GAIM_TOP := ../../.. -LIBGAIM_TOP := $(GAIM_TOP)/libgaim -GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir - -## -## VARIABLE DEFINITIONS -## - TARGET = idletrack -# Compiler Options - -CFLAGS = - -DEFINES = - ## -## INCLUDE MAKEFILES -## - -include $(LIBGAIM_TOP)/win32/global.mak - -## -## INCLUDE PATHS -## - -INCLUDE_PATHS += - -LIB_PATHS = - -## ## SOURCES, OBJECTS ## -C_SRC = idletrack.c +C_SRC = idletrack.c OBJECTS = $(C_SRC:%.c=%.o) +include $(GAIM_COMMON_RULES) ## -## LIBRARIES -## - -LIBS = - -## -## RULES -## - -# How to make a C file - -%.o: %.c - $(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@ -c $< - -## ## TARGET DEFINITIONS ## @@ -70,14 +27,14 @@ all: $(TARGET).dll -install: +install: $(GAIM_INSTALL_DIR) + cp $(TARGET).dll $(GAIM_INSTALL_DIR) - ## ## BUILD DLL ## -$(TARGET).dll: $(OBJECTS) +$(TARGET).dll $(TARGET).dll.a: $(OBJECTS) $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).dll.a -o $(TARGET).dll ## @@ -85,6 +42,8 @@ ## clean: - rm -rf *.o + rm -rf $(OBJECTS) rm -rf $(TARGET).dll rm -rf $(TARGET).dll.a + +include $(GAIM_COMMON_TARGETS) Modified: trunk/libgaim/Makefile.mingw =================================================================== --- trunk/libgaim/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/libgaim/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -1,63 +1,33 @@ # # Makefile.mingw # -# Description: Makefile for win32 (mingw) version of Gaim +# Description: Makefile for win32 (mingw) version of libGaim # -# -# PATHS -# +GAIM_TOP := .. +include $(GAIM_TOP)/libgaim/win32/global.mak -GTK_TOP := ../../win32-dev/gtk_2_0 -GAIM_TOP := .. -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 -## - TARGET = libgaim +NEEDED_DLLS = $(LIBXML2_TOP)/bin/libxml2.dll -# Compiler and Linker Options - -CFLAGS = - -DEFINES = - ## -## INCLUDE MAKEFILES -## - -include $(LIBGAIM_TOP)/win32/global.mak - -## ## INCLUDE PATHS ## - INCLUDE_PATHS = \ - -I$(LIBGAIM_TOP) \ - -I$(LIBGAIM_TOP)/win32 \ + -I$(GAIM_LIB_TOP) \ + -I$(GAIM_LIB_TOP)/win32 \ -I$(GAIM_TOP) \ -I$(GTK_TOP)/include \ -I$(GTK_TOP)/include/glib-2.0 \ -I$(GTK_TOP)/lib/glib-2.0/include \ - -I$(LIBXML2_DIR)/include + -I$(LIBXML2_TOP)/include LIB_PATHS = -L$(GTK_TOP)/lib \ - -L$(LIBGAIM_TOP) \ - -L$(LIBXML2_DIR)/lib + -L$(LIBXML2_TOP)/lib ## ## SOURCES, OBJECTS ## - C_SRC = \ account.c \ accountopt.c \ @@ -106,13 +76,11 @@ win32/libc_interface.c \ win32/win32dep.c - OBJECTS = $(C_SRC:%.c=%.o) ## ## LIBRARIES ## - LIBS = \ -lglib-2.0 \ -lgthread-2.0 \ @@ -123,44 +91,36 @@ -liberty \ -lxml2 -## -## RULES -## +include $(GAIM_COMMON_RULES) -# How to make a C file -%.o: %.c - $(CC) $(CFLAGS) $(INCLUDE_PATHS) $(DEFINES) -c $< -o $@ - ## ## TARGET DEFINITIONS ## +.PHONY: all clean -.PHONY: all clean include_path - all: $(TARGET).dll - $(MAKE) -C $(PROTOCOLS_TOP) -f Makefile.mingw - $(MAKE) -C $(PLUGINS_TOP) -f Makefile.mingw + $(MAKE) -C $(GAIM_PROTOS_TOP) -f $(GAIM_WIN32_MAKEFILE) + $(MAKE) -C $(GAIM_LIB_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE) -install: all - $(MAKE) -C $(PROTOCOLS_TOP) -f Makefile.mingw install - $(MAKE) -C $(PLUGINS_TOP) -f Makefile.mingw install - cp $(LIBGAIM_TOP)/$(TARGET).dll $(GAIM_INSTALL_DIR) +install: all $(GAIM_INSTALL_DIR) + $(MAKE) -C $(GAIM_PROTOS_TOP) -f $(GAIM_WIN32_MAKEFILE) install + $(MAKE) -C $(GAIM_LIB_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE) install + cp $(TARGET).dll $(GAIM_INSTALL_DIR) cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR) -# -# BUILD DLL -# -$(TARGET).dll.a $(TARGET).dll: -$(TARGET).dll.a $(TARGET).dll: $(OBJECTS) +$(OBJECTS): $(GAIM_CONFIG_H) + +$(TARGET).dll $(TARGET).dll.a: $(OBJECTS) $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).dll.a -o $(TARGET).dll ## ## CLEAN RULES ## - clean: - rm -rf *.o ./win32/*.o + rm -rf $(OBJECTS) rm -rf $(TARGET).dll rm -rf $(TARGET).dll.a - $(MAKE) -C $(PROTOCOLS_TOP) -f Makefile.mingw clean - $(MAKE) -C $(PLUGINS_TOP) -f Makefile.mingw clean + $(MAKE) -C $(GAIM_PROTOS_TOP) -f $(GAIM_WIN32_MAKEFILE) clean + $(MAKE) -C $(GAIM_LIB_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE) clean + +include $(GAIM_COMMON_TARGETS) Modified: trunk/libgaim/plugins/Makefile.mingw =================================================================== --- trunk/libgaim/plugins/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/libgaim/plugins/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -4,59 +4,33 @@ # Description: Makefile for win32 (mingw) version of Gaim Plugins # -# -# PATHS -# +GAIM_TOP := ../.. +include $(GAIM_TOP)/libgaim/win32/global.mak -GAIM_PLUGINS := . -GAIM_TOP := ../.. -LIBGAIM_TOP := .. -GTK_TOP := ../../../win32-dev/gtk_2_0 -GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir -PERL_PLUGIN_LOADER := ./perl -TCL_PLUGIN_LOADER := ./tcl -SSL := ./ssl +PERL_PLUGIN := ./perl +TCL_PLUGIN := ./tcl +SSL_PLUGIN := ./ssl -## -## VARIABLE DEFINITIONS -## - -# Compiler Options - -CFLAGS = - -DEFINES = - .SUFFIXES: .SUFFIXES: .c .dll ## -## INCLUDE MAKEFILES -## - -include $(LIBGAIM_TOP)/win32/global.mak - -## ## INCLUDE PATHS ## - INCLUDE_PATHS += \ -I$(GTK_TOP)/include \ -I$(GTK_TOP)/include/glib-2.0 \ -I$(GTK_TOP)/lib/glib-2.0/include \ -I$(GAIM_TOP) \ - -I$(LIBGAIM_TOP) \ - -I$(LIBGAIM_TOP)/win32 + -I$(GAIM_LIB_TOP) \ + -I$(GAIM_LIB_TOP)/win32 - LIB_PATHS = -L$(GTK_TOP)/lib \ - -L$(LIBGAIM_TOP) + -L$(GAIM_LIB_TOP) - ## ## LIBRARIES ## - LIBS = \ -lglib-2.0 \ -lgobject-2.0 \ @@ -66,30 +40,21 @@ -lgaim ## -## RULES -## - -## ## TARGET DEFINITIONS ## - .PHONY: all clean -all: plugins -# $(MAKE) -C $(PERL_PLUGIN_LOADER) -f Makefile.mingw - $(MAKE) -C $(TCL_PLUGIN_LOADER) -f Makefile.mingw - $(MAKE) -C $(SSL) -f Makefile.mingw +all: $(GAIM_LIBGAIM_DLL).a plugins +# $(MAKE) -C $(PERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) + $(MAKE) -C $(TCL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) + $(MAKE) -C $(SSL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) -install: - cp $(GAIM_PLUGINS)/*.dll $(GAIM_INSTALL_DIR)/plugins -# $(MAKE) -C $(PERL_PLUGIN_LOADER) -f Makefile.mingw install - $(MAKE) -C $(TCL_PLUGIN_LOADER) -f Makefile.mingw install - $(MAKE) -C $(SSL) -f Makefile.mingw install +install: all $(GAIM_INSTALL_PLUGINS_DIR) +# $(MAKE) -C $(PERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install + $(MAKE) -C $(TCL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install + $(MAKE) -C $(SSL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install + cp $(GAIM_LIB_PLUGINS_TOP)/*.dll $(GAIM_INSTALL_PLUGINS_DIR) -# -# BUILD Plugin -# - .c.dll: $(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@.o -c $< $(CC) -shared $@.o $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $@ @@ -100,14 +65,14 @@ psychic.dll \ statenotify.dll - ## ## CLEAN RULES ## - clean: - rm -rf *.o - rm -rf *.dll - $(MAKE) -C $(PERL_PLUGIN_LOADER) -f Makefile.mingw clean - $(MAKE) -C $(TCL_PLUGIN_LOADER) -f Makefile.mingw clean - $(MAKE) -C $(SSL) -f Makefile.mingw clean + rm -rf $(GAIM_LIB_PLUGINS_TOP)/*.o + rm -rf $(GAIM_LIB_PLUGINS_TOP)/*.dll + $(MAKE) -C $(PERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean + $(MAKE) -C $(TCL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean + $(MAKE) -C $(SSL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean + +include $(GAIM_COMMON_TARGETS) Modified: trunk/libgaim/plugins/perl/Makefile.mingw =================================================================== --- trunk/libgaim/plugins/perl/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/libgaim/plugins/perl/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -4,78 +4,49 @@ # Description: Makefile for perl plugin loader plugin. # -# -# PATHS -# +GAIM_TOP := ../../.. +include $(GAIM_TOP)/libgaim/win32/global.mak -GTK_TOP := ../../../../win32-dev/gtk_2_0 -GAIM_TOP := ../../.. -LIBGAIM_TOP := ../.. -PERL_LIB_DIR := ../../../../win32-dev/perl58 -PERL_INCLUDE := $(PERL_LIB_DIR)/CORE -GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir -DLL_INSTALL_DIR := $(GAIM_INSTALL_DIR)/plugins - -## -## VARIABLE DEFINITIONS -## - TARGET = perl -CC := gcc.exe - -# Compiler Options - -CFLAGS = - -DEFINES = - -## -## INCLUDE MAKEFILES -## - -include $(LIBGAIM_TOP)/win32/global.mak - # Perl headers with /* /* */ type comments.. Turn off warnings. CFLAGS += -Wno-comment ## ## INCLUDE PATHS ## - INCLUDE_PATHS += -I. \ -I$(GAIM_TOP) \ - -I$(LIBGAIM_TOP) \ - -I$(LIBGAIM_TOP)/win32 \ + -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_INCLUDE) + -I$(PERL_LIB_TOP)/CORE - - - LIB_PATHS = -L$(GTK_TOP)/lib \ - -L$(GAIM_TOP)/src \ - -L$(PERL_LIB_DIR) + -L$(GAIM_LIB_TOP) \ + -L$(GAIM_GTK_TOP) \ + -L$(PERL_LIB_TOP) - ## ## SOURCES, OBJECTS ## - C_SRC = perl.c \ perl-common.c \ perl-handlers.c - OBJECTS = $(C_SRC:%.c=%.o) - ## ## LIBRARIES ## - LIBS = \ -lglib-2.0 \ -lgmodule-2.0 \ @@ -83,51 +54,37 @@ -lws2_32 \ -lintl \ -lgaim \ + -lgtkgaim \ -lperl58 +include $(GAIM_COMMON_RULES) ## -## RULES -## - -# How to make a C file - -%.o: %.c - $(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@ -c $< - -## ## TARGET DEFINITIONS ## - .PHONY: all clean all: $(TARGET).dll - $(MAKE) -C ./common -f Makefile.mingw + $(MAKE) -C ./common -f $(GAIM_WIN32_MAKEFILE) -install: - cp $(TARGET).dll $(DLL_INSTALL_DIR) - $(MAKE) -C ./common -f Makefile.mingw install +install: all $(GAIM_INSTALL_PLUGINS_DIR) + cp $(TARGET).dll $(GAIM_INSTALL_PLUGINS_DIR) + $(MAKE) -C ./common -f $(GAIM_WIN32_MAKEFILE) install -## -## BUILD Dependencies -## +$(OBJECTS): $(GAIM_CONFIG_H) -$(GAIM_TOP)/src/libgaim.dll.a: - $(MAKE) -C $(GAIM_TOP)/src -f Makefile.mingw libgaim.dll.a - ## ## BUILD DLL ## - -$(TARGET).dll: $(OBJECTS) $(GAIM_TOP)/src/libgaim.dll.a +$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(GAIM_GTKGAIM_DLL).a $(OBJECTS) $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--export-all-symbols -o $(TARGET).dll - ## ## CLEAN RULES ## - clean: - rm -rf *.o + rm -rf $(OBJECTS) rm -rf $(TARGET).dll $(TARGET).lib - $(MAKE) -C ./common -f Makefile.mingw clean + $(MAKE) -C ./common -f $(GAIM_WIN32_MAKEFILE) clean + +include $(GAIM_COMMON_TARGETS) Modified: trunk/libgaim/plugins/perl/common/Makefile.mingw =================================================================== --- trunk/libgaim/plugins/perl/common/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/libgaim/plugins/perl/common/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -4,32 +4,23 @@ # Description: Makefile for Gaim perl module. # +GAIM_TOP := ../../../.. +include $(GAIM_TOP)/libgaim/win32/global.mak + TARGET = Gaim AUTOSPLIT = lib/auto/Gaim/autosplit.ix - -## -## TOOLS -## - -CC := gcc -PERL := /cygdrive/c/perl/bin/perl - -## -## PATHS -## - EXTUTILS := C:/perl/lib/ExtUtils -GAIM_TOP := ../../.. -GTK_TOP := ../../../../win32-dev/gtk_2_0 -PERL_TOP := ../../../../win32-dev/perl58 PERL_PLUGIN_TOP := .. -GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir -PERLMOD_INSTALL_DIR := $(GAIM_INSTALL_DIR)/perlmod +CFLAGS += -Wno-comment +## +## INCLUDE PATHS +## INCLUDE_PATHS = -I. \ -I$(GAIM_TOP) \ - -I$(GAIM_TOP)/src \ + -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 \ @@ -37,18 +28,17 @@ -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_TOP)/CORE + -I$(PERL_LIB_TOP)/CORE -LIB_PATHS = -L$(PERL_TOP) \ +LIB_PATHS = -L$(PERL_LIB_TOP) \ -L$(PERL_PLUGIN_TOP) \ - -L$(GAIM_TOP)/src \ + -L$(GAIM_LIB_TOP) \ + -L$(GAIM_GTK_TOP) \ -L$(GTK_TOP)/lib - ## ## SOURCES, OBJECTS ## - XS_FILES = Account.xs \ AccountOpts.xs \ BuddyIcon.xs \ @@ -83,60 +73,50 @@ Util.xs \ XMLNode.xs \ -FALLBACKS = const-c.inc const-xs.inc - +FALLBACKS = const-c.inc const-xs.inc C_FILES = $(XS_FILES:%.xs=%.c) - OBJECTS = $(C_FILES:%.c=%.o) ## ## LIBRARIES ## - LIBS = -lperl58 \ -lperl \ -lgaim \ + -lgtkgaim \ -lglib-2.0 -## -## RULES -## +include $(GAIM_COMMON_RULES) -# How to make a C file -%.o: %.c - $(CC) $(CFLAGS) $(INCLUDE_PATHS) $(DEFINES) -c $< -o $@ - -# How to make a XS file -%.c: %.xs - $(PERL) $(EXTUTILS)/xsubpp -typemap $(EXTUTILS)/typemap -typemap typemap $< > $@ - %.inc: cp fallback/$@ ./ ## ## TARGETS ## - .PHONY: all clean all: $(TARGET).dll $(AUTOSPLIT) -install: - rm -rf $(PERLMOD_INSTALL_DIR) - cp -R lib $(PERLMOD_INSTALL_DIR) - cp $(TARGET).dll $(PERLMOD_INSTALL_DIR) - +install: all + rm -rf $(GAIM_INSTALL_PERLMOD_DIR) + cp -R lib $(GAIM_INSTALL_PERLMOD_DIR) + cp $(TARGET).dll $(GAIM_INSTALL_PERLMOD_DIR) + +$(C_FILES): $(GAIM_CONFIG_H) + $(AUTOSPLIT): Gaim.pm mkdir -p ./lib/auto cp Gaim.pm ./lib $(PERL) -MAutoSplit -e 'autosplit("lib/Gaim.pm")' -$(TARGET).dll: $(FALLBACKS) $(OBJECTS) +$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(GAIM_GTKGAIM_DLL).a $(FALLBACKS) $(OBJECTS) $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) -o $(TARGET).dll ## ## CLEAN ## - clean: rm -rf *.o $(TARGET).dll $(FALLBACKS) lib + +include $(GAIM_COMMON_TARGETS) Modified: trunk/libgaim/plugins/perl/common/module.h =================================================================== --- trunk/libgaim/plugins/perl/common/module.h 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/libgaim/plugins/perl/common/module.h 2006-08-23 21:34:43 UTC (rev 17008) @@ -53,7 +53,7 @@ #include "status.h" #include "stringref.h" /* Ewww. perl has it's own util.h which is in the include path :( */ -#include "src/util.h" +#include "libgaim/util.h" #include "value.h" #include "xmlnode.h" Modified: trunk/libgaim/plugins/ssl/Makefile.mingw =================================================================== --- trunk/libgaim/plugins/ssl/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/libgaim/plugins/ssl/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -4,82 +4,52 @@ # Description: Makefile for ssl plugin. # -# -# PATHS -# +GAIM_TOP := ../../.. +include $(GAIM_TOP)/libgaim/win32/global.mak -GTK_TOP := ../../../../win32-dev/gtk_2_0 -GAIM_TOP := ../../.. -LIBGAIM_TOP := ../.. -GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir -DLL_INSTALL_DIR := $(GAIM_INSTALL_DIR)/plugins -NSS_DIR := ../../../../win32-dev/nss-3.9 -NSPR_DIR := ../../../../win32-dev/nspr-4.4.1 - ## ## VARIABLE DEFINITIONS ## - TARGET = ssl TARGET_NSS = ssl-nss -NEEDED_DLLS = $(NSS_DIR)/lib/nss3.dll \ - $(NSS_DIR)/lib/nssckbi.dll \ - $(NSS_DIR)/lib/softokn3.dll \ - $(NSS_DIR)/lib/ssl3.dll \ - $(NSPR_DIR)/lib/nspr4.dll \ - $(NSPR_DIR)/lib/plc4.dll \ - $(NSPR_DIR)/lib/plds4.dll +NEEDED_DLLS = $(NSS_TOP)/lib/nss3.dll \ + $(NSS_TOP)/lib/nssckbi.dll \ + $(NSS_TOP)/lib/softokn3.dll \ + $(NSS_TOP)/lib/ssl3.dll \ + $(NSPR_TOP)/lib/nspr4.dll \ + $(NSPR_TOP)/lib/plc4.dll \ + $(NSPR_TOP)/lib/plds4.dll -# Compiler Options - -CFLAGS = - -DEFINES = - ## -## INCLUDE MAKEFILES -## - -include $(LIBGAIM_TOP)/win32/global.mak - -## ## INCLUDE PATHS ## - INCLUDE_PATHS += -I. \ -I$(GTK_TOP)/include \ -I$(GTK_TOP)/include/glib-2.0 \ -I$(GTK_TOP)/lib/glib-2.0/include \ - -I$(LIBGAIM_TOP) \ - -I$(LIBGAIM_TOP)/win32 \ + -I$(GAIM_LIB_TOP) \ + -I$(GAIM_LIB_TOP)/win32 \ -I$(GAIM_TOP) \ - -I$(NSS_DIR)/include \ - -I$(NSPR_DIR)/include + -I$(NSS_TOP)/include \ + -I$(NSPR_TOP)/include LIB_PATHS = -L$(GTK_TOP)/lib \ - -L$(LIBGAIM_TOP) \ - -L$(NSS_DIR)/lib \ - -L$(NSPR_DIR)/lib + -L$(GAIM_LIB_TOP) \ + -L$(NSS_TOP)/lib \ + -L$(NSPR_TOP)/lib ## ## SOURCES, OBJECTS ## - C_SRC = ssl.c - C_SRC_NSS = ssl-nss.c - - OBJECTS = $(C_SRC:%.c=%.o) - OBJECTS_NSS = $(C_SRC_NSS:%.c=%.o) - ## ## LIBRARIES ## - LIBS = \ -lglib-2.0 \ -lws2_32 \ @@ -89,51 +59,36 @@ -lnspr4 \ -lssl3 +include $(GAIM_COMMON_RULES) ## -## RULES -## - -# How to make a C file - -%.o: %.c - $(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@ -c $< - -## ## TARGET DEFINITIONS ## - .PHONY: all clean all: $(TARGET).dll $(TARGET_NSS).dll -install: - cp $(TARGET).dll $(DLL_INSTALL_DIR) - cp $(TARGET_NSS).dll $(DLL_INSTALL_DIR) +install: all $(GAIM_INSTALL_PLUGINS_DIR) $(GAIM_INSTALL_DIR) + cp $(TARGET).dll $(GAIM_INSTALL_PLUGINS_DIR) + cp $(TARGET_NSS).dll $(GAIM_INSTALL_PLUGINS_DIR) cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR) -## -## BUILD Dependencies -## +$(OBJECTS) $(OBJECTS_NSS): $(GAIM_CONFIG_H) -$(LIBGAIM_TOP)/libgaim.dll.a: - $(MAKE) -C $(LIBGAIM_TOP) -f Makefile.mingw libgaim.dll.a - ## ## BUILD DLL ## - -$(TARGET).dll: $(OBJECTS) $(LIBGAIM_TOP)/libgaim.dll.a +$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS) $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll -$(TARGET_NSS).dll: $(OBJECTS_NSS) $(LIBGAIM_TOP)/libgaim.dll.a +$(TARGET_NSS).dll: $(GAIM_LIBGAIM_DLL) $(OBJECTS_NSS) $(CC) -shared $(OBJECTS_NSS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET_NSS).dll ## ## CLEAN RULES ## - clean: - rm -rf *.o - rm -rf $(TARGET).dll - rm -rf $(TARGET_NSS).dll + rm -rf $(OBJECTS) $(OBJECTS_NSS) + rm -rf $(TARGET).dll $(TARGET_NSS).dll + +include $(GAIM_COMMON_TARGETS) Modified: trunk/libgaim/plugins/tcl/Makefile.mingw =================================================================== --- trunk/libgaim/plugins/tcl/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/libgaim/plugins/tcl/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -4,59 +4,32 @@ # Description: Makefile for tcl plugin loader plugin. # -# -# PATHS -# +GAIM_TOP := ../../.. +include $(GAIM_TOP)/libgaim/win32/global.mak -GTK_TOP := ../../../../win32-dev/gtk_2_0 -GAIM_TOP := ../../.. -LIBGAIM_TOP := ../.. -TCL_LIB_DIR := ../../../../win32-dev/tcl-8.4.5 -TCL_INC_DIR := $(TCL_LIB_DIR)/include -GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir -DLL_INSTALL_DIR := $(GAIM_INSTALL_DIR)/plugins - -## -## VARIABLE DEFINITIONS -## - TARGET = tcl +TCL_INC_DIR := $(TCL_LIB_TOP)/include +DEFINES += -DHAVE_TK -DUSE_TCL_STUBS -DUSE_TK_STUBS -# Compiler Options - -CFLAGS = - -DEFINES = -DHAVE_TK -DUSE_TCL_STUBS -DUSE_TK_STUBS - ## -## INCLUDE MAKEFILES -## - -include $(LIBGAIM_TOP)/win32/global.mak - -## ## INCLUDE PATHS ## - INCLUDE_PATHS += -I. \ -I$(GAIM_TOP) \ - -I$(LIBGAIM_TOP) \ - -I$(LIBGAIM_TOP)/win32 \ + -I$(GAIM_LIB_TOP) \ + -I$(GAIM_LIB_TOP)/win32 \ -I$(GTK_TOP)/include \ -I$(GTK_TOP)/include/glib-2.0 \ -I$(GTK_TOP)/lib/glib-2.0/include \ -I$(TCL_INC_DIR) +LIB_PATHS += -L$(GTK_TOP)/lib \ + -L$(GAIM_LIB_TOP) \ + -L$(TCL_LIB_TOP) -LIB_PATHS = -L$(GTK_TOP)/lib \ - -L$(LIBGAIM_TOP) \ - -L$(TCL_LIB_DIR) - - ## ## SOURCES, OBJECTS ## - C_SRC = tcl.c \ tcl_cmd.c \ tcl_cmds.c \ @@ -64,14 +37,11 @@ tcl_ref.c \ tcl_signals.c - OBJECTS = $(C_SRC:%.c=%.o) - ## ## LIBRARIES ## - LIBS = \ -lglib-2.0 \ -lws2_32 \ @@ -80,46 +50,28 @@ -ltclstub84 \ -ltkstub84 +include $(GAIM_COMMON_RULES) ## -## RULES -## - -# How to make a C file - -%.o: %.c - $(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@ -c $< - -## ## TARGET DEFINITIONS ## - .PHONY: all clean all: $(TARGET).dll -install: $(TARGET).dll - cp $(TARGET).dll $(DLL_INSTALL_DIR) +install: all $(GAIM_INSTALL_PLUGINS_DIR) + cp $(TARGET).dll $(GAIM_INSTALL_PLUGINS_DIR) -## -## BUILD Dependencies -## +$(OBJECTS): $(GAIM_CONFIG_H) -$(LIBGAIM_TOP)/libgaim.dll.a: - $(MAKE) -C $(LIBGAIM_TOP) -f Makefile.mingw libgaim.dll.a - -## -## BUILD DLL -## - -$(TARGET).dll: $(OBJECTS) $(LIBGAIM_TOP)/libgaim.dll.a +$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS) $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll - ## ## CLEAN RULES ## - clean: - rm -rf *.o + rm -rf $(OBJECTS) rm -rf $(TARGET).dll + +include $(GAIM_COMMON_TARGETS) Modified: trunk/libgaim/protocols/Makefile.mingw =================================================================== --- trunk/libgaim/protocols/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/libgaim/protocols/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -5,74 +5,70 @@ # Description: Top Makefile for win32 (mingw) port of Gaim # -GAIM_TOP = ../.. -LIBGAIM_TOP = ../ -GAIM_PROTOS = . -GAIM_INSTALL_DIR = $(GAIM_TOP)/win32-install-dir +GAIM_TOP := ../.. +include $(GAIM_TOP)/libgaim/win32/global.mak -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 +GG = $(GAIM_PROTOS_TOP)/gg +IRC = $(GAIM_PROTOS_TOP)/irc +JABBER = $(GAIM_PROTOS_TOP)/jabber +MSN = $(GAIM_PROTOS_TOP)/msn +NOVELL = $(GAIM_PROTOS_TOP)/novell +OSCAR = $(GAIM_PROTOS_TOP)/oscar +SAMETIME = $(GAIM_PROTOS_TOP)/sametime +SILC = $(GAIM_PROTOS_TOP)/silc +SIMPLE = $(GAIM_PROTOS_TOP)/simple +TOC = $(GAIM_PROTOS_TOP)/toc +YAHOO = $(GAIM_PROTOS_TOP)/yahoo ## ## 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 +GG_TYPE = PLUGIN IRC_TYPE = PLUGIN JABBER_TYPE = PLUGIN -GG_TYPE = PLUGIN +MSN_TYPE = PLUGIN NOVELL_TYPE = PLUGIN +OSCAR_TYPE = PLUGIN +SAMETIME_TYPE = PLUGIN SILC_TYPE = PLUGIN SIMPLE_TYPE = PLUGIN -SAMETIME_TYPE = PLUGIN +TOC_TYPE = PLUGIN +YAHOO_TYPE = PLUGIN all: - $(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) TYPE='$(GG_TYPE)' -C $(GG) -f $(GAIM_WIN32_MAKEFILE) + $(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f $(GAIM_WIN32_MAKEFILE) + $(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f $(GAIM_WIN32_MAKEFILE) + $(MAKE) TYPE='$(MSN_TYPE)' -C $(MSN) -f $(GAIM_WIN32_MAKEFILE) + $(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f $(GAIM_WIN32_MAKEFILE) + $(MAKE) TYPE='$(OSCAR_TYPE)' -C $(OSCAR) -f $(GAIM_WIN32_MAKEFILE) + $(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f $(GAIM_WIN32_MAKEFILE) + $(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f $(GAIM_WIN32_MAKEFILE) + $(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f $(GAIM_WIN32_MAKEFILE) + $(MAKE) TYPE='$(YAHOO_TYPE)' -C $(YAHOO) -f $(GAIM_WIN32_MAKEFILE) - install: all - mkdir -p $(GAIM_INSTALL_DIR)/plugins - $(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 + $(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f $(GAIM_WIN32_MAKEFILE) install + $(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f $(GAIM_WIN32_MAKEFILE) install + $(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f $(GAIM_WIN32_MAKEFILE) install + $(MAKE) TYPE='$(MSN_TYPE)' -C $(MSN) -f $(GAIM_WIN32_MAKEFILE) install + $(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f $(GAIM_WIN32_MAKEFILE) install + $(MAKE) TYPE='$(OSCAR_TYPE)' -C $(OSCAR) -f $(GAIM_WIN32_MAKEFILE) install + $(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f $(GAIM_WIN32_MAKEFILE) install + $(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f $(GAIM_WIN32_MAKEFILE) install + $(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f $(GAIM_WIN32_MAKEFILE) install + $(MAKE) TYPE='$(YAHOO_TYPE)' -C $(YAHOO) -f $(GAIM_WIN32_MAKEFILE) install 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) TYPE='$(GG_TYPE)' -C $(GG) -f $(GAIM_WIN32_MAKEFILE) clean + $(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f $(GAIM_WIN32_MAKEFILE) clean + $(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f $(GAIM_WIN32_MAKEFILE) clean + $(MAKE) TYPE='$(MSN_TYPE)' -C $(MSN) -f $(GAIM_WIN32_MAKEFILE) clean + $(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f $(GAIM_WIN32_MAKEFILE) clean + $(MAKE) TYPE='$(OSCAR_TYPE)' -C $(OSCAR) -f $(GAIM_WIN32_MAKEFILE) clean + $(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f $(GAIM_WIN32_MAKEFILE) clean + $(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f $(GAIM_WIN32_MAKEFILE) clean + $(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f $(GAIM_WIN32_MAKEFILE) clean + $(MAKE) TYPE='$(YAHOO_TYPE)' -C $(YAHOO) -f $(GAIM_WIN32_MAKEFILE) clean Modified: trunk/libgaim/protocols/bonjour/Makefile.mingw =================================================================== --- trunk/libgaim/protocols/bonjour/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/libgaim/protocols/bonjour/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -4,84 +4,51 @@ # Description: Makefile for win32 (mingw) version of libbonjour # -# -# PATHS -# +GAIM_TOP := ../../.. +include $(GAIM_TOP)/libgaim/win32/global.mak -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 - -## -## VARIABLE DEFINITIONS -## - TARGET = libbonjour +NEEDED_DLLS = $(HOWL_TOP)/bin/libhowl-1.dll -NEEDED_DLLS = $(HOWL_DIR)/bin/libhowl-1.dll - -# Compiler Options - -CFLAGS = - -DEFINES = - # Static or Plugin... ifeq ($(TYPE),STATIC) DEFINES += -DSTATIC DLL_INSTALL_DIR = $(GAIM_INSTALL_DIR) else ifeq ($(TYPE),PLUGIN) - DLL_INSTALL_DIR = $(GAIM_INSTALL_DIR)/plugins + DLL_INSTALL_DIR = $(GAIM_INSTALL_PLUGINS_DIR) endif endif - ## -## INCLUDE MAKEFILES -## - -include $(LIBGAIM_TOP)/win32/global.mak - -## ## INCLUDE PATHS ## - INCLUDE_PATHS += -I$(BONJOUR_ROOT) \ -I$(GTK_TOP)/include \ -I$(GTK_TOP)/include/glib-2.0 \ -I$(GTK_TOP)/lib/glib-2.0/include \ - -I$(HOWL_DIR)/include \ - -I$(LIBGAIM_TOP) \ - -I$(LIBGAIM_TOP)/win32 \ + -I$(HOWL_TOP)/include \ + -I$(GAIM_LIB_TOP) \ + -I$(GAIM_LIB_TOP)/win32 \ -I$(GAIM_TOP) - LIB_PATHS = -L$(GTK_TOP)/lib \ - -L$(HOWL_DIR)/lib \ - -L$(LIBGAIM_TOP) + -L$(HOWL_TOP)/lib \ + -L$(GAIM_LIB_TOP) - ## ## SOURCES, OBJECTS ## - C_SRC = bonjour.c \ buddy.c \ dns_sd.c \ jabber.c - OBJECTS = $(C_SRC:%.c=%.o) - ## ## LIBRARIES ## - LIBS = \ -lglib-2.0 \ -lws2_32 \ @@ -89,41 +56,22 @@ -lhowl \ -lgaim +include $(GAIM_COMMON_RULES) ## -## RULES -## - -# How to make a C file - -%.o: %.c - $(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@ -c $< - -## ## TARGET DEFINITIONS ## - .PHONY: all clean all: $(TARGET).dll -install: - cp $(BONJOUR_ROOT)/$(TARGET).dll $(DLL_INSTALL_DIR) +install: all $(DLL_INSTALL_DIR) + cp $(TARGET).dll $(DLL_INSTALL_DIR) cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR) +$(OBJECTS): $(GAIM_CONFIG_H) -## -## BUILD Dependencies -## - -$(LIBGAIM_TOP)/libgaim.dll.a: - $(MAKE) -C $(LIBGAIM_TOP) -f Makefile.mingw libgaim.dll.a - -## -## BUILD DLL -## - -$(TARGET).dll: $(OBJECTS) $(LIBGAIM_TOP)/libgaim.dll.a +$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS) $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll ## @@ -131,5 +79,7 @@ ## clean: - rm -rf *.o + rm -rf $(OBJECTS) rm -rf $(TARGET).dll + +include $(GAIM_COMMON_TARGETS) Modified: trunk/libgaim/protocols/gg/Makefile.mingw =================================================================== --- trunk/libgaim/protocols/gg/Makefile.mingw 2006-08-23 18:50:46 UTC (rev 17007) +++ trunk/libgaim/protocols/gg/Makefile.mingw 2006-08-23 21:34:43 UTC (rev 17008) @@ -4,67 +4,40 @@ # Description: Makefile for win32 (mingw) version of libgg # -# -# PATHS -# +GAIM_TOP := ../../.. +include $(GAIM_TOP)/libgaim/win32/global.mak -GTK_TOP := ../../../../win32-dev/gtk_2_0 -GAIM_TOP := ../../.. -LIBGAIM_TOP := ../.. -GG_ROOT := . -GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir - -## -## VARIABLE DEFINITIONS -## - TARGET = libgg +CFLAGS += -include win32dep.h -# Compiler Options - -CFLAGS = -include win32dep.h - -DEFINES = - # Static or Plugin... ifeq ($(TYPE),STATIC) DEFINES += -DSTATIC DLL_INSTALL_DIR = $(GAIM_INSTALL_DIR) else ifeq ($(TYPE),PLUGIN) - DLL_INSTALL_DIR = $(GAIM_INSTALL_DIR)/plugins + DLL_INSTALL_DIR = $(GAIM_INSTALL_PLUGINS_DIR) endif endif - ## -## INCLUDE MAKEFILES -## - -include $(LIBGAIM_TOP)/win32/global.mak - -## ## INCLUDE PATHS ## - -INCLUDE_PATHS += -I$(GG_ROOT) \ - -I$(GG_ROOT)/lib \ +INCLUDE_PATHS += -I. \ + -I./lib \ -I$(GTK_TOP)/include \ -I$(GTK_TOP)/include/glib-2.0 \ -I$(GTK_TOP)/lib/glib-2.0/include \ - -I$(LIBGAIM_TOP) \ - -I$(LIBGAIM_TOP)/win32 \ + -I$(GAIM_LIB_TOP) \ + -I$(GAIM_LIB_TOP)/win32 \ -I$(GAIM_TOP) - LIB_PATHS = -L$(GTK_TOP)/lib \ - -L$(LIBGAIM_TOP) \ + -L$(GAIM_LIB_TOP) \ - ## ## SOURCES, OBJECTS ## - C_SRC = \ lib/common.c \ lib/events.c \ @@ -81,11 +54,9 @@ OBJECTS = $(C_SRC:%.c=%.o) - ## ## LIBRARIES ## - LIBS = \ -lglib-2.0 \ -... [truncated message content] |
