[Telepathy-commits] [telepathy-qt4/master] tests/: make it clearer why only some of the CXXFLAGS are passed to moc

[Simon McVittie]

---
 tests/Makefile.am           |   10 ++++++----
 tests/dbus/Makefile.am      |    8 +++++---
 tests/pinocchio/Makefile.am |    8 +++++---
 tests/prototype/Makefile.am |    8 +++++---
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c6424a1..04f2391 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,15 +27,17 @@ LDADD = \
     $(QTTEST_LIBS) \
     ${top_builddir}/TelepathyQt4/libtelepathy-qt4.la
 
-LIB_CFLAGS = \
+# A subset of the CXXFLAGS sufficient to run moc - -Istuff is a valid
+# argument to moc but -Wstuff is not
+MOC_INCLUDES = \
     $(QTCORE_CFLAGS) \
     $(QTDBUS_CFLAGS) \
     $(QTTEST_CFLAGS) \
-    -I${top_srcdir}
+    $(TP_QT4_CFLAGS)
 
 AM_CXXFLAGS = \
     $(ERROR_CXXFLAGS) \
-    $(LIB_CFLAGS)
+    $(MOC_INCLUDES)
 
 TESTS_ENV = \
     abs_top_builddir=@abs_top_builddir@ \
@@ -60,4 +62,4 @@ EXTRA_DIST = \
     test-key-file-format-error.ini
 
 %.moc.hpp: %.cpp
-	$(MOC) $(LIB_CFLAGS) -i $< -o $@
+	$(MOC) $(MOC_INCLUDES) -i $< -o $@
diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am
index 3fa28c1..243f090 100644
--- a/tests/dbus/Makefile.am
+++ b/tests/dbus/Makefile.am
@@ -8,7 +8,7 @@ BUILT_SOURCES = \
 
 _gen/%.moc.hpp: %.cpp
 	$(mkdir_p) _gen
-	$(MOC) $(LIB_CFLAGS) -i $< -o $@
+	$(MOC) $(MOC_INCLUDES) -i $< -o $@
 
 noinst_PROGRAMS = $(TESTS)
 
@@ -32,7 +32,9 @@ LDADD = \
     $(QTTEST_LIBS) \
     ${top_builddir}/TelepathyQt4/libtelepathy-qt4.la
 
-LIB_CFLAGS = \
+# A subset of the CXXFLAGS sufficient to run moc - -Istuff is a valid
+# argument to moc but -Wstuff is not
+MOC_INCLUDES = \
     $(QTCORE_CFLAGS) \
     $(QTDBUS_CFLAGS) \
     $(QTTEST_CFLAGS) \
@@ -40,7 +42,7 @@ LIB_CFLAGS = \
 
 AM_CXXFLAGS = \
     $(ERROR_CXXFLAGS) \
-    $(LIB_CFLAGS)
+    $(MOC_INCLUDES)
 
 TESTS_ENV = \
     abs_top_builddir=@abs_top_builddir@ \
diff --git a/tests/pinocchio/Makefile.am b/tests/pinocchio/Makefile.am
index 3c9b70d..1ea8f8a 100644
--- a/tests/pinocchio/Makefile.am
+++ b/tests/pinocchio/Makefile.am
@@ -21,7 +21,7 @@ BUILT_SOURCES = \
 
 _gen/%.moc.hpp: %
 	$(mkdir_p) _gen
-	$(MOC) $(LIB_CFLAGS) -i $< -o $@
+	$(MOC) $(MOC_INCLUDES) -i $< -o $@
 
 noinst_PROGRAMS = $(TESTS)
 
@@ -33,7 +33,9 @@ test_conn_basics_SOURCES = conn-basics.cpp lib.cpp
 
 test_do_nothing_SOURCES = do-nothing.cpp lib.cpp
 
-LIB_CFLAGS = \
+# A subset of the CXXFLAGS sufficient to run moc - -Istuff is a valid
+# argument to moc but -Wstuff is not
+MOC_INCLUDES = \
     $(QTCORE_CFLAGS) \
     $(QTDBUS_CFLAGS) \
     $(QTTEST_CFLAGS) \
@@ -47,7 +49,7 @@ LDADD = \
 
 AM_CXXFLAGS = \
     $(ERROR_CXXFLAGS) \
-    $(LIB_CFLAGS)
+    $(MOC_INCLUDES)
 
 # FIXME: XDG_DATA_DIRS should not depend on external setup
 TESTS_ENV = \
diff --git a/tests/prototype/Makefile.am b/tests/prototype/Makefile.am
index 4d70f0d..1b6f60d 100644
--- a/tests/prototype/Makefile.am
+++ b/tests/prototype/Makefile.am
@@ -20,7 +20,9 @@ test_prototype_SOURCES = prototype.cpp prototype.h
 
 EXTRA_DIST = avatar.png
 
-DEP_CFLAGS = \
+# A subset of the CXXFLAGS sufficient to run moc - -Istuff is a valid
+# argument to moc but -Wstuff is not
+MOC_INCLUDES = \
     $(QTCORE_CFLAGS) \
     $(QTDBUS_CFLAGS) \
     $(QTGUI_CFLAGS) \
@@ -38,7 +40,7 @@ LDADD = \
 
 AM_CXXFLAGS = \
     $(ERROR_CXXFLAGS) \
-    $(DEP_CFLAGS)
+    $(MOC_INCLUDES)
 
 TESTS_ENV = \
     abs_top_builddir=@abs_top_builddir@ \
@@ -55,7 +57,7 @@ CLEANFILES = \
 
 _gen/%.moc: %
 	$(mkdir_p) _gen
-	$(MOC) $(DEP_CFLAGS) -i $< -o $@
+	$(MOC) $(MOC_INCLUDES) -i $< -o $@
 
 distclean-local:
 	rm -rf _gen
-- 
1.5.6.5