[Telepathy-commits] [telepathy-qt4/master] Move MOC_INCLUDES further up tests/dbus/Makefile.am so we can append to it

Simon McVittie simon.mcvittie at collabora.co.uk
Fri Jan 9 08:56:30 PST 2009


We want to put telepathy-glib on the include path conditionally.
---
 tests/dbus/Makefile.am |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am
index 7fdc26e..fb46913 100644
--- a/tests/dbus/Makefile.am
+++ b/tests/dbus/Makefile.am
@@ -14,6 +14,14 @@ noinst_PROGRAMS = $(TESTS)
 
 test_do_nothing_SOURCES = do-nothing.cpp
 
+# 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) \
+    $(TP_QT4_CFLAGS)
+
 if HAVE_TEST_PYTHON
 # Tests which can only be run if we have suitable versions of Python and
 # dbus-python
@@ -32,14 +40,6 @@ LDADD = \
     $(QTTEST_LIBS) \
     ${top_builddir}/TelepathyQt4/libtelepathy-qt4.la
 
-# 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) \
-    $(TP_QT4_CFLAGS)
-
 AM_CXXFLAGS = \
     $(ERROR_CXXFLAGS) \
     $(MOC_INCLUDES)
-- 
1.5.6.5




More information about the Telepathy-commits mailing list