pidgin/purple-plugin-pack

merge of '20596bbe045d59d64864297e50a66695b6a496c2'
org.guifications.plugins
2008-05-10, grim
488562a7c42b
Parents bf527750a21d12d0dca52428
Children 21a74ee979bd
merge of '20596bbe045d59d64864297e50a66695b6a496c2'
and 'eb10c96aa302a69ffafddc7ed6de0c7f803fd69b'
3 files changed, 31 insertions(+), 12 deletions(-)
  • +20 -12
    Makefile.mingw
  • +4 -0
    autoprofile/component.h
  • +7 -0
    pp_config.h.mingw
    • --- a/Makefile.mingw Sat May 10 20:39:34 2008 -0400
    +++ b/Makefile.mingw Sat May 10 23:09:09 2008 -0400
    @@ -6,33 +6,41 @@
    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; \
    --- a/autoprofile/component.h Sat May 10 20:39:34 2008 -0400
    +++ b/autoprofile/component.h Sat May 10 23:09:09 2008 -0400
    @@ -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"
    --- a/pp_config.h.mingw Sat May 10 20:39:34 2008 -0400
    +++ b/pp_config.h.mingw Sat May 10 23:09:09 2008 -0400
    @@ -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 */