# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1185552814 0
# Node ID c5bf7a32968c4d08b9269be788dcf1b82be4310d
# Parent  1987beefd494f284d5c7d5b1c78f5f667b141c46# Parent  46629aab70b1fbd55b91ad8107d1137e62d0e176
merge of '4f8fceee3836599ee91cd637f42647433a481086'
     and 'e8bdb2a0f6283614d8c9e5918dadc916b9520618'

diff -r 1987beefd494 -r c5bf7a32968c libpurple/Makefile.mingw
--- a/libpurple/Makefile.mingw	Fri Jul 27 16:08:18 2007 +0000
+++ b/libpurple/Makefile.mingw	Fri Jul 27 16:13:34 2007 +0000
@@ -127,8 +127,8 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -f $(OBJECTS) $(RC_SRC)
-	rm -f $(TARGET).dll $(TARGET).dll.a $(PURPLE_VERSION_H)
+	rm -f $(OBJECTS) $(RC_SRC) $(PURPLE_VERSION_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 1987beefd494 -r c5bf7a32968c pidgin/Makefile.mingw
--- a/pidgin/Makefile.mingw	Fri Jul 27 16:08:18 2007 +0000
+++ b/pidgin/Makefile.mingw	Fri Jul 27 16:13:34 2007 +0000
@@ -167,8 +167,9 @@
 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
+	rm -f $(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a $(PIDGIN_TARGET).def
 	rm -f $(EXE_TARGET).exe
 
 include $(PIDGIN_COMMON_TARGETS)
diff -r 1987beefd494 -r c5bf7a32968c pidgin/pixmaps/Makefile.mingw
--- a/pidgin/pixmaps/Makefile.mingw	Fri Jul 27 16:08:18 2007 +0000
+++ b/pidgin/pixmaps/Makefile.mingw	Fri Jul 27 16:13:34 2007 +0000
@@ -10,7 +10,7 @@
 datadir := $(PIDGIN_INSTALL_DIR)
 include ./Makefile.am
 
-.PHONY: install
+.PHONY: install clean
 
 install:
 	if test '$(SUBDIRS)'; then \
@@ -27,3 +27,5 @@
 	  cp $(pidgindistpix_DATA) $(pidgindistpixdir); \
 	fi;
 
+clean:
+	$(MAKE) -C emotes -f $(MINGW_MAKEFILE) clean || exit 1 ;\
diff -r 1987beefd494 -r c5bf7a32968c pidgin/pixmaps/emotes/Makefile.mingw
--- a/pidgin/pixmaps/emotes/Makefile.mingw	Fri Jul 27 16:08:18 2007 +0000
+++ b/pidgin/pixmaps/emotes/Makefile.mingw	Fri Jul 27 16:13:34 2007 +0000
@@ -6,7 +6,7 @@
 
 include ./Makefile.am
 
-.PHONY: install
+.PHONY: install clean
 
 install:
 	if test '$(SUBDIRS)'; then \
@@ -14,3 +14,10 @@
 	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
 	  done; \
 	fi;
+
+clean:
+	if test '$(SUBDIRS)'; then \
+	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	    $(MAKE) -C $$subdir -f Makefile.mingw clean || exit 1; \
+	  done; \
+	fi;
diff -r 1987beefd494 -r c5bf7a32968c pidgin/pixmaps/emotes/default/Makefile.mingw
--- a/pidgin/pixmaps/emotes/default/Makefile.mingw	Fri Jul 27 16:08:18 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/Makefile.mingw	Fri Jul 27 16:13:34 2007 +0000
@@ -6,7 +6,7 @@
 
 include ./Makefile.am
 
-.PHONY: install
+.PHONY: install clean
 
 install:
 	if test '$(SUBDIRS)'; then \
@@ -14,3 +14,11 @@
 	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
 	  done; \
 	fi;
+
+clean:
+	if test '$(SUBDIRS)'; then \
+	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	    $(MAKE) -C $$subdir -f Makefile.mingw clean || exit 1; \
+	  done; \
+	fi;
+