[commit-gajim] r10841 - in branches/osx_newbuildsys: . src/traymodule - Commits

13 Dec 2008

Author: js
Date: 2008-12-13 17:55:21 +0100 (Sat, 13 Dec 2008)
New Revision: 10841
Modified:
   branches/osx_newbuildsys/buildsys.mk.in
   branches/osx_newbuildsys/src/traymodule/Makefile
Log:
Update buildsys to latest rev.
Modified: branches/osx_newbuildsys/buildsys.mk.in
===================================================================

--- branches/osx_newbuildsys/buildsys.mk.in	2008-12-13 16:39:34 UTC (rev 10840)
+++ branches/osx_newbuildsys/buildsys.mk.in	2008-12-13 16:55:21 UTC (rev 10841)
@@ -123,19 +123,18 @@
    done; \
    if test x"$$regen" = x"1" -a x"$$deps" != "x"; then \
    	${DEPEND_STATUS}; \
-		if ${MAKE} ${MFLAGS} $$deps; then \
-			test -f .deps && rm .deps; \
-			cat $$deps >.deps; \
+		if ${MAKE} ${MFLAGS} $$deps && cat $$deps >.deps; then \
    		rm -f $$deps; \
    		${DEPEND_OK}; \
    	else \
    		:> .deps; \
+			touch -t 0001010000 .deps; \
    		${DEPEND_FAILED}; \
    	fi; \
    fi
.c.dep .cc.dep .cxx.dep .m.dep:
-	${CPP} ${CPPFLAGS} -M $< >$@ || rm -f $@
+	${CPP} ${CPPFLAGS} -M $< >$@ || (rm -f $@; exit 1)
.d.dep:
 .xpm.dep:
Modified: branches/osx_newbuildsys/src/traymodule/Makefile
===================================================================
--- branches/osx_newbuildsys/src/traymodule/Makefile	2008-12-13 16:39:34 UTC (rev 10840)
+++ branches/osx_newbuildsys/src/traymodule/Makefile	2008-12-13 16:55:21 UTC (rev 10841)
@@ -7,11 +7,12 @@
 include ../../buildsys.mk
 include ../../extra.mk
-CFLAGS += ${PLUGIN_CFLAGS} ${PYTHON_CFLAGS} ${PYGTK_CFLAGS}
+CPPFLAGS += ${PYTHON_CFLAGS} ${PYGTK_CFLAGS}
+CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${PYTHON_LIBS} ${PYGTK_LIBS}
 LDFLAGS += ${PLUGIN_LDFLAGS} ${PYTHON_LDFLAGS}
-trayicon.c: Makefile trayicon.defs trayicon.override
+trayicon.c: trayicon.defs trayicon.override
    pygtk-codegen-2.0 --prefix trayicon		\
    	--register ${PYGTK_DEFS}/gdk-types.defs	\
    	--register ${PYGTK_DEFS}/gtk-types.defs	\

    