changeset
merge of 'ce9f33e26b221b8afb475eb58cf222c87a3ab3a5'
Fri, 27 Jul 2007 16:13:34 +0000
- author
- Sadrul Habib Chowdhury <sadrul@pidgin.im>
- date
- Fri, 27 Jul 2007 16:13:34 +0000
- changeset 18958
- 9655ffbc6c25
- parent 18956
- ce9f33e26b22 (current diff)
- parent 18957
- a9c2ef06b34b (diff)
- child 18959
- 980d3693a45d
- child 18964
- 0b15ffc5d2a4
- child 19173
- 467db4a9cc44
merge of 'ce9f33e26b221b8afb475eb58cf222c87a3ab3a5'
and 'a9c2ef06b34b48552cfd002889fa5539d3900fd7'
--- 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
--- 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)
--- 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 ;\
--- 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;
--- 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; +
