Mercurial > pidgin.yaz
changeset 14576:5d03b309b482
[gaim-migrate @ 17300]
Fix mingw makefile .PHONY targets.
Fix gtkwin32dep.h missing includes.
committer: Tailor Script <tailor@pidgin.im>
line wrap: on
line diff
--- a/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -31,6 +31,7 @@ exit; \ }' VERSION) +.PHONY: all install installer installer_nogtk installer_debug installers clean all: $(GAIM_CONFIG_H) $(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE) @@ -57,8 +58,7 @@ $(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 -f $(GAIM_CONFIG_H) gaim*.exe rm -rf $(GAIM_INSTALL_PERLMOD_DIR) $(GAIM_INSTALL_PLUGINS_DIR) $(GAIM_INSTALL_PO_DIR) $(GAIM_INSTALL_DIR) include $(GAIM_COMMON_TARGETS)
--- a/README.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/README.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -1,10 +1,6 @@ -How to build Gaim using MinGw +How to build Gaim using MinGW ============================= -Since these instructions are constantly changing and in order for me to -avoid maintaining two versions of these instructions please refer to: +Since these instructions are constantly changing, please refer to: -http://gaim.sourceforge.net/win32 - -- Herman - +http://gaim.sourceforge.net/win32/build.php
--- a/gtk/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/gtk/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -129,7 +129,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean clean_exe +.PHONY: all install clean clean_exe all: $(EXE_TARGET).exe $(GTKGAIM_TARGET).dll $(MAKE) -C $(GAIM_GTK_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE)
--- a/gtk/pixmaps/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/gtk/pixmaps/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -10,6 +10,8 @@ datadir := $(GAIM_INSTALL_DIR) include ./Makefile.am +.PHONY: install + install: if test '$(SUBDIRS)'; then \ list='$(SUBDIRS)'; for subdir in $$list; do \
--- a/gtk/pixmaps/smileys/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/gtk/pixmaps/smileys/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -6,6 +6,8 @@ include ./Makefile.am +.PHONY: install + install: if test '$(SUBDIRS)'; then \ list='$(SUBDIRS)'; for subdir in $$list; do \
--- a/gtk/pixmaps/smileys/default/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/gtk/pixmaps/smileys/default/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -10,6 +10,8 @@ datadir = $(GAIM_INSTALL_DIR) include ./Makefile.am +.PHONY: install + install: if test '$(gaimsmileypix_DATA)'; then \ mkdir -p $(gaimsmileypixdir); \
--- a/gtk/pixmaps/smileys/none/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/gtk/pixmaps/smileys/none/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -10,6 +10,8 @@ datadir = $(GAIM_INSTALL_DIR) include ./Makefile.am +.PHONY: install + install: if test '$(gaimsmileypix_DATA)'; then \ mkdir -p $(gaimsmileypixdir); \
--- a/gtk/plugins/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/gtk/plugins/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -55,7 +55,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all clean plugins install all: plugins $(MAKE) -C $(DOCKLET_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) @@ -64,7 +64,7 @@ $(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) $(MAKE) -C $(WINPREFS_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) -install: $(GAIM_INSTALL_PLUGINS_DIR) +install: all $(GAIM_INSTALL_PLUGINS_DIR) $(MAKE) -C $(DOCKLET_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install $(MAKE) -C $(GTKPERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install $(MAKE) -C $(TICKER_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install @@ -91,8 +91,7 @@ ## CLEAN RULES ## clean: - rm -f *.o - rm -f *.dll + rm -f *.o *.dll $(MAKE) -C $(DOCKLET_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean $(MAKE) -C $(GTKPERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean $(MAKE) -C $(TICKER_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean
--- a/gtk/plugins/docklet/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/gtk/plugins/docklet/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -55,7 +55,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll
--- a/gtk/plugins/perl/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/gtk/plugins/perl/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -10,7 +10,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(MAKE) -C ./common -f $(GAIM_WIN32_MAKEFILE)
--- a/gtk/plugins/perl/common/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/gtk/plugins/perl/common/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -82,7 +82,7 @@ ## ## TARGETS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll
--- a/gtk/plugins/ticker/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/gtk/plugins/ticker/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -55,7 +55,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll
--- a/gtk/plugins/win32/transparency/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/gtk/plugins/win32/transparency/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -55,7 +55,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll
--- a/gtk/plugins/win32/winprefs/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/gtk/plugins/win32/winprefs/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -57,7 +57,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll
--- a/gtk/sounds/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/gtk/sounds/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -10,6 +10,8 @@ datadir := $(GAIM_INSTALL_DIR) include ./Makefile.am +.PHONY: install + install: if test '$(sounds_DATA)'; then \ mkdir -p $(soundsdir); \
--- a/gtk/win32/IdleTracker/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/gtk/win32/IdleTracker/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -23,7 +23,7 @@ ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll @@ -42,8 +42,6 @@ ## clean: - rm -rf $(OBJECTS) - rm -rf $(TARGET).dll - rm -rf $(TARGET).dll.a + rm -f $(OBJECTS) $(TARGET).dll $(TARGET).dll.a include $(GAIM_COMMON_TARGETS)
--- a/gtk/win32/gtkwin32dep.h Mon Sep 18 00:04:14 2006 +0000 +++ b/gtk/win32/gtkwin32dep.h Mon Sep 18 01:13:07 2006 +0000 @@ -22,6 +22,8 @@ */ #ifndef _GTKWIN32DEP_H_ #define _GTKWIN32DEP_H_ +#include <windows.h> +#include <gtk/gtk.h> HINSTANCE gtkwgaim_hinstance(void);
--- a/libgaim/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/libgaim/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -98,7 +98,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll $(MAKE) -C $(GAIM_PROTOS_TOP) -f $(GAIM_WIN32_MAKEFILE)
--- a/libgaim/plugins/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/libgaim/plugins/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -42,7 +42,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all clean plugins install all: $(GAIM_LIBGAIM_DLL).a plugins $(MAKE) -C $(PERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) @@ -53,7 +53,7 @@ $(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) + cp *.dll $(GAIM_INSTALL_PLUGINS_DIR) .c.dll: $(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@.o -c $< @@ -69,8 +69,7 @@ ## CLEAN RULES ## clean: - rm -rf $(GAIM_LIB_PLUGINS_TOP)/*.o - rm -rf $(GAIM_LIB_PLUGINS_TOP)/*.dll + rm -f *.o *.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
--- a/libgaim/plugins/perl/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/libgaim/plugins/perl/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -54,7 +54,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll $(MAKE) -C ./common -f $(GAIM_WIN32_MAKEFILE)
--- a/libgaim/plugins/perl/common/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/libgaim/plugins/perl/common/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -87,7 +87,7 @@ ## ## TARGETS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll $(AUTOSPLIT)
--- a/libgaim/plugins/ssl/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/libgaim/plugins/ssl/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -64,7 +64,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll $(TARGET_NSS).dll @@ -88,7 +88,6 @@ ## CLEAN RULES ## clean: - rm -rf $(OBJECTS) $(OBJECTS_NSS) - rm -rf $(TARGET).dll $(TARGET_NSS).dll + rm -f $(OBJECTS) $(OBJECTS_NSS) $(TARGET).dll $(TARGET_NSS).dll include $(GAIM_COMMON_TARGETS)
--- a/libgaim/plugins/tcl/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/libgaim/plugins/tcl/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -55,7 +55,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll
--- a/libgaim/protocols/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/libgaim/protocols/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -37,6 +37,8 @@ TOC_TYPE = PLUGIN YAHOO_TYPE = PLUGIN +.PHONY: all install clean + all: $(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f $(GAIM_WIN32_MAKEFILE) $(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f $(GAIM_WIN32_MAKEFILE)
--- a/libgaim/protocols/bonjour/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/libgaim/protocols/bonjour/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -62,7 +62,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll
--- a/libgaim/protocols/gg/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/libgaim/protocols/gg/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -69,7 +69,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll
--- a/libgaim/protocols/irc/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/libgaim/protocols/irc/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -59,7 +59,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll
--- a/libgaim/protocols/jabber/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/libgaim/protocols/jabber/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -73,7 +73,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll
--- a/libgaim/protocols/msn/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/libgaim/protocols/msn/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -83,7 +83,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll
--- a/libgaim/protocols/novell/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/libgaim/protocols/novell/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -66,7 +66,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll
--- a/libgaim/protocols/oscar/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/libgaim/protocols/oscar/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -89,7 +89,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll
--- a/libgaim/protocols/qq/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/libgaim/protocols/qq/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -89,7 +89,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll
--- a/libgaim/protocols/sametime/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/libgaim/protocols/sametime/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -59,7 +59,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll
--- a/libgaim/protocols/silc/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/libgaim/protocols/silc/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -68,7 +68,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll
--- a/libgaim/protocols/simple/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/libgaim/protocols/simple/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -56,7 +56,7 @@ ## ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll
--- a/libgaim/protocols/toc/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/libgaim/protocols/toc/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -56,7 +56,7 @@ ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll
--- a/libgaim/protocols/yahoo/Makefile.mingw Mon Sep 18 00:04:14 2006 +0000 +++ b/libgaim/protocols/yahoo/Makefile.mingw Mon Sep 18 01:13:07 2006 +0000 @@ -67,7 +67,7 @@ ## TARGET DEFINITIONS ## -.PHONY: all clean +.PHONY: all install clean all: $(TARGET).dll