org.guifications.plugins: eb10c96aa302a69ffafddc7ed6de0c7f803fd69b

datallah at guifications.org datallah at guifications.org
Sat May 10 18:10:11 CDT 2008


-----------------------------------------------------------------
Revision: eb10c96aa302a69ffafddc7ed6de0c7f803fd69b
Ancestor: 71ef6f75954eb7d907471a2c37d6e75203e699af
Author: datallah at guifications.org
Date: 2008-05-10T23:06:21
Branch: org.guifications.plugins

Modified files:
        Makefile.mingw autoprofile/component.h pp_config.h.mingw

ChangeLog: 

Build fixes for win32.

-----------------------------------------------------------------
This revision's diffstat output:
 Makefile.mingw          |   32 ++++++++++++++++++++------------
 autoprofile/component.h |    4 ++++
 pp_config.h.mingw       |    7 +++++++
 3 files changed, 31 insertions(+), 12 deletions(-)
-------------- next part --------------
============================================================
--- Makefile.mingw	b10f7d18e515cd8132baa7f4c3eccba9027f20db
+++ Makefile.mingw	2e9b713ec4dc69b365353ff231fc561910d95cad
@@ -6,33 +6,41 @@ VERSION := $(shell cat ./VERSION)
 
 VERSION := $(shell cat ./VERSION)
 
+ALL_PLUGINS_LIST := $(shell python plugin_pack.py build_dirs purple,pidgin all)
+
+comma:= ,
+empty:=
+space:= $(empty) $(empty)
+
+ALL_PLUGINS := $(subst $(comma),$(space),$(ALL_PLUGINS_LIST))
+
 all:
-	list='$(shell ls -D)'; for subdir in $$list; do \
-	  if test -d $$subdir; then if test -e $$subdir/.build; then if test -e $$subdir/Makefile.mingw; then \
+	list='$(ALL_PLUGINS)'; for subdir in $$list; do \
+	  if test -d $$subdir; then if test -e $$subdir/Makefile.mingw; then \
 	    $(MAKE) -C $$subdir -f Makefile.mingw || exit 1; \
-	  fi; fi; fi; \
+	  fi; fi; \
 	done;
 
 install: all
-	list='$(shell ls -D)'; for subdir in $$list; do \
-	  if test -d $$subdir; then if test -e $$subdir/.build; then if test -e $$subdir/Makefile.mingw; then \
+	list='$(ALL_PLUGINS)'; for subdir in $$list; do \
+	  if test -d $$subdir; then if test -e $$subdir/Makefile.mingw; then \
 	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1;\
-	  fi; fi; fi; \
+	  fi; fi; \
 	done;
 
 clean:
-	list='$(shell ls -D)'; for subdir in $$list; do \
-	  if test -d $$subdir; then if test -e $$subdir/.build; then if test -e $$subdir/Makefile.mingw; then \
+	list='$(ALL_PLUGINS)'; for subdir in $$list; do \
+	  if test -d $$subdir; then if test -e $$subdir/Makefile.mingw; then \
 	    $(MAKE) -C $$subdir -f Makefile.mingw clean || exit 1;\
-	  fi; fi; fi; \
+	  fi; fi; \
 	done; \
 	rm -rf pp_config.h win32-dist purple-plugin_pack*.zip
 
 install_zip:
-	list='$(shell ls -D)'; for subdir in $$list; do \
-	  if test -d $$subdir; then if test -e $$subdir/.build; then if test -e $$subdir/Makefile.mingw; then \
+	list='$(ALL_PLUGINS)'; for subdir in $$list; do \
+	  if test -d $$subdir; then if test -e $$subdir/Makefile.mingw; then \
 	    $(MAKE) -C $$subdir -f Makefile.mingw install_zip || exit 1;\
-	  fi; fi; fi; \
+	  fi; fi; \
 	done; \
 	pushd win32-dist; \
 	zip ../purple-plugin_pack-$(VERSION).zip *.dll; \
============================================================
--- autoprofile/component.h	a9ffdb1e6cfb42733c632676a595f722812da3b7
+++ autoprofile/component.h	cfe4b4bc5998ff45419f68a534ada6a69dc38f9d
@@ -24,6 +24,10 @@
 #ifndef _AP_COMPONENT_H_
 #define _AP_COMPONENT_H_
 
+#ifdef HAVE_CONFIG_H
+# include "../pp_config.h"
+#endif
+
 #include "widget.h"
 
 #include "sizes.h"
============================================================
--- pp_config.h.mingw	df114d21c7c1e0a2c13a14dd5f0e245915404125
+++ pp_config.h.mingw	012703bb63f95454e0421ba85d7f2fff1da1b6ad
@@ -5,6 +5,13 @@
 #ifndef PP_CONFIG_H
 #define PP_CONFIG_H
 
+#ifndef G_GNUC_NULL_TERMINATED
+#if     __GNUC__ >= 4
+#define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
+#else
+#define G_GNUC_NULL_TERMINATED
+#endif
+#endif
 
 /* Define if debugging is enabled. */
 /*#define DEBUG 1 */


More information about the Plugins-commits mailing list