Mercurial > pidgin

changeset 21148:3635ddf4170f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '6f297cb9eebbeafa2feb340ad3f46f4157854b90' and '8a99c217891d1f2b2baaeaa0a98248f5eddfc160'
author Luke Schierer <lschiere@pidgin.im>
date Mon, 05 Nov 2007 22:03:58 +0000
parents 75ad6af0b02c (current diff) 1f8e878cc501 (diff)
children b2d9f859663e
files
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/Makefile.mingw	Mon Nov 05 20:53:22 2007 +0000
+++ b/pidgin/Makefile.mingw	Mon Nov 05 22:03:58 2007 +0000
@@ -20,6 +20,8 @@
 
 LDFLAGS := $(WINAPP)
 
+#CFLAGS += -DWINPIDGIN_USE_GLIB_IO_CHANNEL=1
+
 ##
 ## INCLUDE PATHS
 ##
@@ -167,7 +169,6 @@
 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
--- a/pidgin/pixmaps/Makefile.mingw	Mon Nov 05 20:53:22 2007 +0000
+++ b/pidgin/pixmaps/Makefile.mingw	Mon Nov 05 22:03:58 2007 +0000
@@ -36,5 +36,3 @@
 	  cp $(pidgindistpix_DATA) $(pidgindistpixdir); \
 	fi;
 
-clean:
-	$(MAKE) -C emotes -f $(MINGW_MAKEFILE) clean || exit 1 ;\