# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1170702385 0
# Node ID cea917eed4db63bd3babe6423064c186d96f0055
# Parent  ad9e09c331f587f7397411010391de4c6bc22129# Parent  042a9d405bf6c74d3951e084b92015c031dc00a2
merge of '71bbd0bd3449d503142a4a48f440f8e96b255feb'
     and '81f667be556e49e7524f70e320b235230fcaf725'

diff -r 042a9d405bf6 -r cea917eed4db pidgin/pixmaps/toolbar/16/Makefile.mingw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/toolbar/16/Makefile.mingw	Mon Feb 05 19:06:25 2007 +0000
@@ -0,0 +1,20 @@
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+GAIM_TOP := ../../../..
+include $(GAIM_TOP)/libpurple/win32/global.mak
+
+datadir = $(GAIM_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidgintoolbarpix_DATA)'; then \
+	  mkdir -p $(pidgintoolbarpixdir); \
+	  cp $(pidgintoolbarpix_DATA) $(pidgintoolbarpixdir); \
+	fi;
+
diff -r 042a9d405bf6 -r cea917eed4db pidgin/pixmaps/toolbar/Makefile.mingw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/toolbar/Makefile.mingw	Mon Feb 05 19:06:25 2007 +0000
@@ -0,0 +1,14 @@
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+include ./Makefile.am
+
+install:
+	if test '$(SUBDIRS)'; then \
+	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
+	  done; \
+	fi;
diff -r 042a9d405bf6 -r cea917eed4db pidgin/plugins/Makefile.mingw
--- a/pidgin/plugins/Makefile.mingw	Mon Feb 05 19:06:20 2007 +0000
+++ b/pidgin/plugins/Makefile.mingw	Mon Feb 05 19:06:25 2007 +0000
@@ -57,13 +57,13 @@
 .PHONY: all clean plugins install
 
 all: plugins
-	$(MAKE) -C $(GTKPERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
+#	$(MAKE) -C $(GTKPERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
 	$(MAKE) -C $(TICKER_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
 	$(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
 	$(MAKE) -C $(WINPREFS_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
 
 install: all $(GAIM_INSTALL_PLUGINS_DIR)
-	$(MAKE) -C $(GTKPERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
+#	$(MAKE) -C $(GTKPERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
 	$(MAKE) -C $(TICKER_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
 	$(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
 	$(MAKE) -C $(WINPREFS_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
diff -r 042a9d405bf6 -r cea917eed4db pidgin/plugins/perl/common/Makefile.mingw
--- a/pidgin/plugins/perl/common/Makefile.mingw	Mon Feb 05 19:06:20 2007 +0000
+++ b/pidgin/plugins/perl/common/Makefile.mingw	Mon Feb 05 19:06:25 2007 +0000
@@ -10,7 +10,7 @@
 TARGET = GtkUI
 EXTUTILS ?= C:/perl/lib/ExtUtils
 
-CFLAGS += -Wno-comment
+CFLAGS += -Wno-comment -Wno-unused
 
 ##
 ## INCLUDE PATHS