/cpw/tomkiewicz/masterpassword: eb934dc31159: Further keyring bu...

[Tomasz Wasilczyk]

Changeset: eb934dc3115941d8ad5900d24c48ae1899c7898b
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2013-03-18 18:53 +0100
Branch:	 soc.2008.masterpassword
URL: https://hg.pidgin.im/cpw/tomkiewicz/masterpassword/rev/eb934dc31159

Description:

Further keyring buildsystem improvements: clean kwallet.moc file and get rid of invalid C++ switches

diffstat:

 configure.ac                           |  2 ++
 libpurple/plugins/keyrings/Makefile.am |  7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diffs (51 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1476,6 +1476,7 @@ if test "x$GCC" = "xyes"; then
 	DEBUG_CFLAGS="-Wall $DEBUG_CFLAGS"
 	CFLAGS="-g $CFLAGS"
 fi
+DEBUG_CPPFLAGS=`echo "$DEBUG_CFLAGS" | $sedpath 's/-Wdeclaration-after-statement//' | $sedpath 's/-Wmissing-prototypes//'`
 
 if test "x$SUNCC" = "xyes"; then
         CFLAGS="$CFLAGS -features=extensions" 
@@ -2570,6 +2571,7 @@ if test "$ac_cv_cygwin" = yes ; then
 	AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])
 fi
 
+AC_SUBST(DEBUG_CPPFLAGS)
 AC_SUBST(DEBUG_CFLAGS)
 AC_SUBST(LDADD)
 AC_SUBST(LIBS)
diff --git a/libpurple/plugins/keyrings/Makefile.am b/libpurple/plugins/keyrings/Makefile.am
--- a/libpurple/plugins/keyrings/Makefile.am
+++ b/libpurple/plugins/keyrings/Makefile.am
@@ -1,5 +1,6 @@
 EXTRA_DIST = \
 		Makefile.mingw
+CLEANFILES =
 
 plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
@@ -39,6 +40,8 @@ kwallet.cpp: kwallet.moc
 kwallet.moc:
 	$(AM_V_GEN)$(MOC) $(kwallet_la_CXXFLAGS) -i kwallet.cpp -o $@
 
+CLEANFILES += kwallet.moc
+
 endif
 
 if PLUGINS
@@ -63,10 +66,10 @@ endif
 
 endif
 
+#XXX: that might be done better than adding DEBUG_CPPFLAGS to all objects (not only C++ ones)
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
-	$(DEBUG_CFLAGS) \
+	$(DEBUG_CPPFLAGS) \
 	$(PLUGIN_CFLAGS)
-