changeset 22589:8b952cb84f45

Ugly hackery to support INSTALL_PIXMAPS for the win32 build.
author Daniel Atallah <daniel.atallah@gmail.com>
date Mon, 31 Mar 2008 22:01:43 +0000
parents 40c93093a555
children dcfe7a855d7e 8e14188032a9
files .mtn-ignore libpurple/win32/global.mak pidgin/pixmaps/Makefile.mingw pidgin/pixmaps/buddy_icons/qq/Makefile.mingw pidgin/pixmaps/emotes/default/24/Makefile.mingw pidgin/pixmaps/emotes/none/Makefile.mingw
diffstat 6 files changed, 32 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/.mtn-ignore	Mon Mar 31 17:19:02 2008 +0000
+++ b/.mtn-ignore	Mon Mar 31 22:01:43 2008 +0000
@@ -1,5 +1,6 @@
 (.*/)?\.svn
 .*/?Makefile(\.in)?$
+.*/?Makefile\.am\.mingw$
 (.*/)?TAGS$
 .*/?.*\.pc$
 .*/perl/common/[^/]+\.c$
--- a/libpurple/win32/global.mak	Mon Mar 31 17:19:02 2008 +0000
+++ b/libpurple/win32/global.mak	Mon Mar 31 22:01:43 2008 +0000
@@ -110,3 +110,6 @@
 PIDGIN_COMMON_RULES := $(PURPLE_TOP)/win32/rules.mak
 PIDGIN_COMMON_TARGETS := $(PURPLE_TOP)/win32/targets.mak
 MINGW_MAKEFILE := Makefile.mingw
+
+INSTALL_PIXMAPS ?= 1
+
--- a/pidgin/pixmaps/Makefile.mingw	Mon Mar 31 17:19:02 2008 +0000
+++ b/pidgin/pixmaps/Makefile.mingw	Mon Mar 31 22:01:43 2008 +0000
@@ -8,11 +8,11 @@
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 datadir := $(PIDGIN_INSTALL_DIR)
-include ./Makefile.am
+-include ./Makefile.am.mingw
 
 .PHONY: install clean
 
-install:
+install: ./Makefile.am.mingw
 	if test '$(SUBDIRS)'; then \
 	  list='$(SUBDIRS)'; for subdir in $$list; do \
 	    $(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) install || exit 1 ;\
@@ -34,9 +34,14 @@
 	  cp $(pidgindistpix_DATA) $(pidgindistpixdir); \
 	fi;
 
-clean:
+clean: ./Makefile.am.mingw
 	if test '$(SUBDIRS)'; then \
 		list='$(SUBDIRS)'; for subdir in $$list; do \
 		$(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) clean;\
 		done; \
 	fi;
+
+./Makefile.am.mingw: ./Makefile.am
+	sed -e 's/^if\ INSTALL_PIXMAPS/ifeq (\$$(INSTALL_PIXMAPS), 1)/' ./Makefile.am > $@
+        include $@
+
--- a/pidgin/pixmaps/buddy_icons/qq/Makefile.mingw	Mon Mar 31 17:19:02 2008 +0000
+++ b/pidgin/pixmaps/buddy_icons/qq/Makefile.mingw	Mon Mar 31 22:01:43 2008 +0000
@@ -9,10 +9,15 @@
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 datadir = $(PIDGIN_INSTALL_DIR)
-include ./Makefile.am
+-include ./Makefile.am.mingw
 
-install:
+install: ./Makefile.am.mingw
 	if test '$(qqbuddyiconspix_DATA)'; then \
 	  mkdir -p $(qqbuddyiconspixdir); \
 	  cp $(qqbuddyiconspix_DATA) $(qqbuddyiconspixdir); \
 	fi;
+
+./Makefile.am.mingw: ./Makefile.am
+	sed -e 's/^if\ INSTALL_PIXMAPS/ifeq (\$$(INSTALL_PIXMAPS), 1)/' ./Makefile.am > $@
+        include $@
+
--- a/pidgin/pixmaps/emotes/default/24/Makefile.mingw	Mon Mar 31 17:19:02 2008 +0000
+++ b/pidgin/pixmaps/emotes/default/24/Makefile.mingw	Mon Mar 31 22:01:43 2008 +0000
@@ -8,11 +8,11 @@
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 datadir = $(PIDGIN_INSTALL_DIR)
-include ./Makefile.am
+-include ./Makefile.am.mingw
 
 .PHONY: install clean
 
-install: theme
+install: ./Makefile.am.mingw theme
 	if test '$(pidginsmileypix_DATA)'; then \
 	  mkdir -p $(pidginsmileypixdir); \
 	  cp $(pidginsmileypix_DATA) $(pidginsmileypixdir); \
@@ -20,3 +20,8 @@
 
 clean:
 	rm -f theme
+
+./Makefile.am.mingw: ./Makefile.am
+	sed -e 's/^if\ INSTALL_PIXMAPS/ifeq (\$$(INSTALL_PIXMAPS), 1)/' ./Makefile.am > $@
+        include $@
+
--- a/pidgin/pixmaps/emotes/none/Makefile.mingw	Mon Mar 31 17:19:02 2008 +0000
+++ b/pidgin/pixmaps/emotes/none/Makefile.mingw	Mon Mar 31 22:01:43 2008 +0000
@@ -8,11 +8,11 @@
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 datadir = $(PIDGIN_INSTALL_DIR)
-include ./Makefile.am
+-include ./Makefile.am.mingw
 
 .PHONY: install clean
 
-install: theme
+install: ./Makefile.am.mingw theme
 	if test '$(pidginsmileypix_DATA)'; then \
 	  mkdir -p $(pidginsmileypixdir); \
 	  cp $(pidginsmileypix_DATA) $(pidginsmileypixdir); \
@@ -21,3 +21,7 @@
 clean:
 	rm -f theme
 
+./Makefile.am.mingw: ./Makefile.am
+	sed -e 's/^if\ INSTALL_PIXMAPS/ifeq (\$$(INSTALL_PIXMAPS), 1)/' ./Makefile.am > $@
+        include $@
+