# HG changeset patch
# User Daniel Atallah <datallah@pidgin.im>
# Date 1195441841 0
# Node ID f95e46280ca32ffedf23720211b1b2500b1f1544
# Parent  cb25ada4f6a04d1d2f5b47fb452ab109b357605c# Parent  5fb405d62f393576eafd3c0dbe43553f9235496c
merge of 'cb25ada4f6a04d1d2f5b47fb452ab109b357605c'
     and '5fb405d62f393576eafd3c0dbe43553f9235496c'

diff -r cb25ada4f6a0 -r f95e46280ca3 Makefile.mingw
--- a/Makefile.mingw	Mon Nov 19 02:45:41 2007 +0000
+++ b/Makefile.mingw	Mon Nov 19 03:10:41 2007 +0000
@@ -97,15 +97,15 @@
 
 installer: create_release_install_dir
 	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DWITH_GTK /DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
-	mv pidgin/win32/nsis/pidgin*.exe ./
+	mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION).exe ./
 
 installer_nogtk: create_release_install_dir
 	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
-	mv pidgin/win32/nsis/pidgin*.exe ./
+	mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-no-gtk.exe ./
 
 installer_debug: install
 	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DPIDGIN_INSTALL_DIR="$(PIDGIN_INSTALL_DIR)" /DDEBUG /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
-	mv pidgin/win32/nsis/pidgin*.exe ./
+	mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-debug.exe ./
 
 installer_zip: create_release_install_dir
 	rm -f pidgin-$(PIDGIN_VERSION)-win32-bin.zip
@@ -124,10 +124,11 @@
 	$(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE) clean
 	$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) clean
 	$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) clean
-	rm -f $(PIDGIN_CONFIG_H) ./VERSION pidgin*.exe
+	rm -f $(PIDGIN_CONFIG_H) ./VERSION pidgin-$(PIDGIN_VERSION)*.exe pidgin-$(PIDGIN_VERSION)-win32-bin.zip
 	rm -rf doc/html Doxyfile.mingw
 
 uninstall:
-	rm -rf $(PURPLE_INSTALL_PERLMOD_DIR) $(PIDGIN_INSTALL_PLUGINS_DIR) $(PURPLE_INSTALL_PO_DIR) $(PIDGIN_INSTALL_DIR) $(PIDGIN_INSTALL_DIR).release
+	rm -rf $(PURPLE_INSTALL_PERLMOD_DIR) $(PIDGIN_INSTALL_PLUGINS_DIR) $(PURPLE_INSTALL_PO_DIR) $(PIDGIN_INSTALL_DIR) $(STRIPPED_RELEASE_DIR)
+	rm -f ./VERSION
 
 include $(PIDGIN_COMMON_TARGETS)
diff -r cb25ada4f6a0 -r f95e46280ca3 libpurple/Makefile.mingw
--- a/libpurple/Makefile.mingw	Mon Nov 19 02:45:41 2007 +0000
+++ b/libpurple/Makefile.mingw	Mon Nov 19 03:10:41 2007 +0000
@@ -128,7 +128,7 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -f $(OBJECTS) $(RC_SRC) $(PURPLE_VERSION_H)
+	rm -f $(OBJECTS) $(RC_SRC) $(PURPLE_VERSION_H) $(PURPLE_PURPLE_H)
 	rm -f $(TARGET).dll $(TARGET).dll.a $(TARGET).def
 	$(MAKE) -C $(PURPLE_PROTOS_TOP) -f $(MINGW_MAKEFILE) clean
 	$(MAKE) -C $(PURPLE_PLUGINS_TOP) -f $(MINGW_MAKEFILE) clean
diff -r cb25ada4f6a0 -r f95e46280ca3 pidgin/Makefile.mingw
--- a/pidgin/Makefile.mingw	Mon Nov 19 02:45:41 2007 +0000
+++ b/pidgin/Makefile.mingw	Mon Nov 19 03:10:41 2007 +0000
@@ -170,6 +170,7 @@
 clean:
 	$(MAKE) -C $(PIDGIN_IDLETRACK_TOP) -f $(MINGW_MAKEFILE) clean
 	$(MAKE) -C $(PIDGIN_PLUGINS_TOP) -f $(MINGW_MAKEFILE) clean
+	$(MAKE) -C $(PIDGIN_PIXMAPS_TOP) -f $(MINGW_MAKEFILE) clean
 	rm -f $(PIDGIN_OBJECTS) $(PIDGIN_RC_SRC) $(EXE_OBJECTS) $(EXE_RC_SRC)
 	rm -f $(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a $(PIDGIN_TARGET).def
 	rm -f $(EXE_TARGET).exe
diff -r cb25ada4f6a0 -r f95e46280ca3 pidgin/pixmaps/Makefile.mingw
--- a/pidgin/pixmaps/Makefile.mingw	Mon Nov 19 02:45:41 2007 +0000
+++ b/pidgin/pixmaps/Makefile.mingw	Mon Nov 19 03:10:41 2007 +0000
@@ -34,3 +34,9 @@
 	  cp $(pidgindistpix_DATA) $(pidgindistpixdir); \
 	fi;
 
+clean:
+	if test '$(SUBDIRS)'; then \
+		list='$(SUBDIRS)'; for subdir in $$list; do \
+		$(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) clean;\
+		done; \
+	fi;