[Telepathy-commits] [telepathy-qt4/master] Clean up and simplify header search paths

Simon McVittie simon.mcvittie at collabora.co.uk
Mon Mar 23 09:19:30 PDT 2009


Ensuring that $(top_srcdir) and $(top_builddir) are first on the -I path
is always a good idea - it means we always use this library's headers,
and not those of an installed copy of telepathy-qt4 that might be on the
-I path (due to sharing a directory with the installed telepathy-glib).

AM_CPPFLAGS is passed to every compilation, so we can use it for both C
and C++. It's also exactly what we want when running moc.

It also seems a good idea to make it explicit that we're linking QtCore.
---
 TelepathyQt4/Makefile.am           |   19 ++++++++++---------
 TelepathyQt4/Prototype/Makefile.am |   16 ++++++++--------
 examples/accounts/Makefile.am      |   10 +++++++---
 examples/call/Makefile.am          |   13 ++++++++-----
 examples/extensions/Makefile.am    |    7 +++++--
 examples/roster/Makefile.am        |   11 ++++++++---
 tests/Makefile.am                  |   13 +++++--------
 tests/dbus/Makefile.am             |   15 ++++++---------
 tests/lib/Makefile.am              |   15 ++++++---------
 tests/pinocchio/Makefile.am        |   13 +++++--------
 tests/prototype/Makefile.am        |   14 +++++---------
 11 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/TelepathyQt4/Makefile.am b/TelepathyQt4/Makefile.am
index 1152241..8af8617 100644
--- a/TelepathyQt4/Makefile.am
+++ b/TelepathyQt4/Makefile.am
@@ -269,16 +269,17 @@ distclean-local:
 include $(top_srcdir)/tools/check-coding-style.mk
 check-local: check-coding-style
 
+AM_CPPFLAGS = \
+    -I$(top_srcdir) -I$(top_builddir) \
+    $(QTCORE_CFLAGS) \
+    $(QTDBUS_CFLAGS)
+
 AM_CXXFLAGS = \
-    $(ERROR_CXXFLAGS) \
-    @QTCORE_CFLAGS@ \
-    @QTDBUS_CFLAGS@ \
-    -I$(top_builddir) \
-    -I$(top_srcdir)
+    $(ERROR_CXXFLAGS)
 
 ALL_LIBS = \
-    @QTCORE_LIBS@ \
-    @QTDBUS_LIBS@
+    $(QTCORE_LIBS) \
+    $(QTDBUS_LIBS)
 
 # Generated stuff
 
@@ -389,7 +390,7 @@ _gen/cli-%.h _gen/cli-%-body.hpp: _gen/spec-%.xml \
 
 Client/_gen/%.moc.hpp: $(srcdir)/Client/%.h _gen/constants.h _gen/types.h
 	$(mkdir_p) Client/_gen
-	$(MOC) @QTCORE_CFLAGS@ @QTDBUS_CFLAGS@ -I$(top_builddir) -I$(top_srcdir) -i $< -o $@
+	$(MOC) $(AM_CPPFLAGS) -i $< -o $@
 
 _gen/%.moc.hpp: _gen/%.h _gen/constants.h _gen/types.h
-	$(MOC) @QTCORE_CFLAGS@ @QTDBUS_CFLAGS@ -I$(top_builddir) -I$(top_srcdir) -i $< -o $@
+	$(MOC) $(AM_CPPFLAGS) -i $< -o $@
diff --git a/TelepathyQt4/Prototype/Makefile.am b/TelepathyQt4/Prototype/Makefile.am
index 49906ba..c7942dd 100644
--- a/TelepathyQt4/Prototype/Makefile.am
+++ b/TelepathyQt4/Prototype/Makefile.am
@@ -104,17 +104,17 @@ include $(top_srcdir)/tools/check-coding-style.mk
 check-local: check-coding-style
 
 AM_CXXFLAGS = \
-    $(ERROR_CXXFLAGS) \
+    $(ERROR_CXXFLAGS)
+
+AM_CPPFLAGS = \
+    -I$(top_srcdir) -I$(top_builddir) \
     $(QTCORE_CFLAGS) \
-    $(QTDBUS_CFLAGS) \
-    $(TP_QT4_CFLAGS) \
-    -I$(top_builddir) \
-    -I$(top_srcdir)
+    $(QTDBUS_CFLAGS)
 
 ALL_LIBS = \
     $(QTCORE_LIBS) \
     $(QTDBUS_LIBS) \
-    $(TP_QT4_LIBS)
+    $(top_builddir)/TelepathyQt4/libtelepathy-qt4.la
 
 # Generated stuff
 
@@ -192,7 +192,7 @@ _gen/cli-%.h _gen/cli-%-body.hpp: _gen/spec-%.xml \
 		$$mainiface
 
 _gen/%.moc: % _gen/constants.h _gen/types.h
-	$(MOC) @QTCORE_CFLAGS@ @QTDBUS_CFLAGS@ -I$(top_builddir) -I$(top_srcdir) -i $< -o $@
+	$(MOC) $(AM_CPPFLAGS) -i $< -o $@
 
 _gen/%.moc.hpp: _gen/%.h _gen/constants.h _gen/types.h
-	$(MOC) @QTCORE_CFLAGS@ @QTDBUS_CFLAGS@ -I$(top_builddir) -I$(top_srcdir) -i $< -o $@
+	$(MOC) $(AM_CPPFLAGS) -i $< -o $@
diff --git a/examples/accounts/Makefile.am b/examples/accounts/Makefile.am
index 5f77871..5e0fb46 100644
--- a/examples/accounts/Makefile.am
+++ b/examples/accounts/Makefile.am
@@ -1,13 +1,17 @@
-AM_CXXFLAGS = \
-	$(ERROR_CXXFLAGS) \
+AM_CPPFLAGS = \
+	-I$(top_srcdir) -I$(top_builddir) \
 	$(QTCORE_CFLAGS) \
 	$(QTGUI_CFLAGS) \
 	$(QTDBUS_CFLAGS) \
 	$(TP_QT4_CFLAGS)
 
+AM_CXXFLAGS = \
+	$(ERROR_CXXFLAGS)
+
 noinst_PROGRAMS = accounts
 
 accounts_LDADD = \
+	$(QTCORE_LIBS) \
 	$(QTGUI_LIBS) \
 	$(QTDBUS_LIBS) \
 	$(top_builddir)/TelepathyQt4/libtelepathy-qt4.la
@@ -31,4 +35,4 @@ CLEANFILES = \
 
 _gen/%.moc.hpp: %.h
 	$(mkdir_p) _gen
-	$(MOC) @QTCORE_CFLAGS@ @QTDBUS_CFLAGS@ -I$(top_builddir) -I$(top_srcdir) -i $< -o $@
+	$(MOC) $(AM_CPPFLAGS) -i $< -o $@
diff --git a/examples/call/Makefile.am b/examples/call/Makefile.am
index 962d88c..edd0b2d 100644
--- a/examples/call/Makefile.am
+++ b/examples/call/Makefile.am
@@ -1,11 +1,14 @@
-AM_CXXFLAGS = \
-	$(TP_QT4_CFLAGS) \
-	$(ERROR_CXXFLAGS) \
+AM_CPPFLAGS = \
+	-I$(top_srcdir) -I$(top_builddir) \
 	$(QTCORE_CFLAGS) \
 	$(QTGUI_CFLAGS) \
 	$(QTDBUS_CFLAGS) \
 	$(TP_GLIB_CFLAGS) \
-	$(TP_FARSIGHT_CFLAGS)
+	$(TP_FARSIGHT_CFLAGS) \
+	$(TP_QT4_CFLAGS)
+
+AM_CXXFLAGS = \
+	$(ERROR_CXXFLAGS)
 
 noinst_PROGRAMS = call
 
@@ -49,4 +52,4 @@ CLEANFILES = \
 
 _gen/%.moc.hpp: %.h
 	$(mkdir_p) _gen
-	$(MOC) @QTCORE_CFLAGS@ @QTDBUS_CFLAGS@ @TP_FARSIGHT_CFLAGS@ -I$(top_builddir) -I$(top_srcdir) -i $< -o $@
+	$(MOC) $(AM_CPPFLAGS) -i $< -o $@
diff --git a/examples/extensions/Makefile.am b/examples/extensions/Makefile.am
index 8d11840..a775973 100644
--- a/examples/extensions/Makefile.am
+++ b/examples/extensions/Makefile.am
@@ -17,7 +17,10 @@
 tools_dir = $(top_srcdir)/tools
 
 AM_CXXFLAGS = \
-    $(ERROR_CXXFLAGS) \
+    $(ERROR_CXXFLAGS)
+
+AM_CPPFLAGS = \
+    -I$(top_srcdir) -I$(top_builddir) \
     $(QTCORE_CFLAGS) \
     $(QTDBUS_CFLAGS) \
     $(TP_QT4_CFLAGS)
@@ -103,4 +106,4 @@ _gen/cli-connection-body.hpp _gen/cli-connection.h: _gen/connection.xml \
 		--mainiface='Telepathy::Client::ConnectionInterface'
 
 %.moc.hpp: %.h _gen/constants.h _gen/types.h
-	$(MOC) @QTCORE_CFLAGS@ @QTDBUS_CFLAGS@ -I$(top_builddir) -I$(top_srcdir) -i $< -o $@
+	$(MOC) $(AM_CPPFLAGS) -i $< -o $@
diff --git a/examples/roster/Makefile.am b/examples/roster/Makefile.am
index cf39a2a..116c97c 100644
--- a/examples/roster/Makefile.am
+++ b/examples/roster/Makefile.am
@@ -1,13 +1,17 @@
-AM_CXXFLAGS = \
-	$(ERROR_CXXFLAGS) \
+AM_CPPFLAGS = \
+	-I$(top_srcdir) -I$(top_builddir) \
 	$(QTCORE_CFLAGS) \
 	$(QTGUI_CFLAGS) \
 	$(QTDBUS_CFLAGS) \
 	$(TP_QT4_CFLAGS)
 
+AM_CXXFLAGS = \
+	$(ERROR_CXXFLAGS)
+
 noinst_LTLIBRARIES = libtelepathy-qt4-examples-roster.la
 
 libtelepathy_qt4_examples_roster_la_LIBADD = \
+	$(QTCORE_LIBS) \
 	$(QTGUI_LIBS) \
 	$(QTDBUS_LIBS) \
 	$(top_builddir)/TelepathyQt4/libtelepathy-qt4.la
@@ -25,6 +29,7 @@ nodist_libtelepathy_qt4_examples_roster_la_SOURCES = \
 noinst_PROGRAMS = roster
 
 roster_LDADD = \
+	$(QTCORE_LIBS) \
 	$(QTGUI_LIBS) \
 	$(QTDBUS_LIBS) \
 	$(top_builddir)/TelepathyQt4/libtelepathy-qt4.la \
@@ -47,4 +52,4 @@ CLEANFILES = \
 
 _gen/%.moc.hpp: %.h
 	$(mkdir_p) _gen
-	$(MOC) @QTCORE_CFLAGS@ @QTDBUS_CFLAGS@ -I$(top_builddir) -I$(top_srcdir) -i $< -o $@
+	$(MOC) $(AM_CPPFLAGS) -i $< -o $@
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2d5f636..07fbf2d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -28,17 +28,14 @@ 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 = \
+AM_CPPFLAGS = \
+    -I$(top_srcdir) -I$(top_builddir) \
     $(QTCORE_CFLAGS) \
     $(QTDBUS_CFLAGS) \
-    $(QTTEST_CFLAGS) \
-    $(TP_QT4_CFLAGS)
+    $(QTTEST_CFLAGS)
 
 AM_CXXFLAGS = \
-    $(ERROR_CXXFLAGS) \
-    $(MOC_INCLUDES)
+    $(ERROR_CXXFLAGS)
 
 TESTS_ENV = \
     abs_top_builddir=@abs_top_builddir@ \
@@ -64,7 +61,7 @@ EXTRA_DIST = \
 
 _gen/%.moc.hpp: %
 	$(mkdir_p) _gen
-	$(MOC) $(MOC_INCLUDES) -i $< -o $@
+	$(MOC) $(AM_CPPFLAGS) -i $< -o $@
 
 distclean-local:
 	rm -rf _gen
diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am
index 62cc802..0efed5b 100644
--- a/tests/dbus/Makefile.am
+++ b/tests/dbus/Makefile.am
@@ -8,19 +8,17 @@ BUILT_SOURCES = \
 
 _gen/%.moc.hpp: %
 	$(mkdir_p) _gen
-	$(MOC) $(MOC_INCLUDES) -i $< -o $@
+	$(MOC) $(AM_CPPFLAGS) -i $< -o $@
 
 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 = \
+AM_CPPFLAGS = \
+    -I$(top_srcdir) -I$(top_builddir) \
     $(QTCORE_CFLAGS) \
     $(QTDBUS_CFLAGS) \
-    $(QTTEST_CFLAGS) \
-    $(TP_QT4_CFLAGS)
+    $(QTTEST_CFLAGS)
 
 if HAVE_TEST_PYTHON
 # Tests which can only be run if we have suitable versions of Python and
@@ -63,7 +61,7 @@ BUILT_SOURCES += \
     _gen/streamed-media-chan.cpp.moc.hpp \
     _gen/text-chan.cpp.moc.hpp
 
-MOC_INCLUDES += $(TP_GLIB_CFLAGS)
+AM_CPPFLAGS += $(TP_GLIB_CFLAGS)
 
 test_chan_basics_SOURCES = chan-basics.cpp
 test_chan_basics_LDADD = $(LDADD) $(top_builddir)/tests/lib/echo2/libtp-glib-echo2-tests.la
@@ -109,8 +107,7 @@ LDADD = \
     ${top_builddir}/TelepathyQt4/libtelepathy-qt4.la
 
 AM_CXXFLAGS = \
-    $(ERROR_CXXFLAGS) \
-    $(MOC_INCLUDES)
+    $(ERROR_CXXFLAGS)
 
 TESTS_ENV = \
     abs_top_builddir=@abs_top_builddir@ \
diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index e770a0f..a1d9c69 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -1,16 +1,14 @@
 SUBDIRS =
 
-AM_CFLAGS = \
-    $(ERROR_CFLAGS) \
-    -I$(top_builddir) -I$(top_srcdir)
-
-MOC_INCLUDES = \
+AM_CPPFLAGS = \
+    -I$(top_builddir) -I$(top_srcdir) \
     $(QTCORE_CFLAGS) \
     $(QTDBUS_CFLAGS) \
     $(QTTEST_CFLAGS) \
     $(TP_QT4_CFLAGS)
 
-AM_CXXFLAGS = $(ERROR_CXXFLAGS) $(MOC_INCLUDES)
+AM_CFLAGS = $(ERROR_CFLAGS)
+AM_CXXFLAGS = $(ERROR_CXXFLAGS)
 
 noinst_LTLIBRARIES = libtp-qt4-tests.la
 
@@ -29,8 +27,7 @@ libtp_qt4_tests_la_LIBADD = $(top_builddir)/TelepathyQt4/libtelepathy-qt4.la
 if ENABLE_TP_GLIB_TESTS
 
 SUBDIRS += callable contactlist echo
-AM_CFLAGS += $(TP_GLIB_CFLAGS)
-AM_CXXFLAGS += $(TP_GLIB_CFLAGS)
+AM_CPPFLAGS += $(TP_GLIB_CFLAGS)
 
 noinst_LTLIBRARIES += libtp-glib-tests.la
 
@@ -58,4 +55,4 @@ endif
 
 _gen/%.moc.hpp: %
 	$(mkdir_p) _gen
-	$(MOC) $(MOC_INCLUDES) -i $< -o $@
+	$(MOC) $(AM_CPPFLAGS) -i $< -o $@
diff --git a/tests/pinocchio/Makefile.am b/tests/pinocchio/Makefile.am
index 4b83953..321a3a7 100644
--- a/tests/pinocchio/Makefile.am
+++ b/tests/pinocchio/Makefile.am
@@ -21,7 +21,7 @@ BUILT_SOURCES = \
 
 _gen/%.moc.hpp: %
 	$(mkdir_p) _gen
-	$(MOC) $(MOC_INCLUDES) -i $< -o $@
+	$(MOC) $(AM_CPPFLAGS) -i $< -o $@
 
 noinst_PROGRAMS = $(TESTS)
 
@@ -33,13 +33,11 @@ test_do_nothing_SOURCES = do-nothing.cpp lib.cpp
 
 test_handles_SOURCES = handles.cpp lib.cpp
 
-# A subset of the CXXFLAGS sufficient to run moc - -Istuff is a valid
-# argument to moc but -Wstuff is not
-MOC_INCLUDES = \
+AM_CPPFLAGS = \
+    -I$(top_srcdir) -I$(top_builddir) \
     $(QTCORE_CFLAGS) \
     $(QTDBUS_CFLAGS) \
-    $(QTTEST_CFLAGS) \
-    $(TP_QT4_CFLAGS)
+    $(QTTEST_CFLAGS)
 
 LDADD = \
     $(QTCORE_LIBS) \
@@ -49,8 +47,7 @@ LDADD = \
     ${top_builddir}/TelepathyQt4/libtelepathy-qt4.la
 
 AM_CXXFLAGS = \
-    $(ERROR_CXXFLAGS) \
-    $(MOC_INCLUDES)
+    $(ERROR_CXXFLAGS)
 
 # 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 1b6f60d..457b894 100644
--- a/tests/prototype/Makefile.am
+++ b/tests/prototype/Makefile.am
@@ -20,15 +20,12 @@ test_prototype_SOURCES = prototype.cpp prototype.h
 
 EXTRA_DIST = avatar.png
 
-# A subset of the CXXFLAGS sufficient to run moc - -Istuff is a valid
-# argument to moc but -Wstuff is not
-MOC_INCLUDES = \
+AM_CPPFLAGS = \
+    -I$(top_srcdir) -I$(top_builddir) \
     $(QTCORE_CFLAGS) \
     $(QTDBUS_CFLAGS) \
     $(QTGUI_CFLAGS) \
-    $(QTTEST_CFLAGS) \
-    $(TP_QT4_CFLAGS) \
-    $(PROTO_CFLAGS)
+    $(QTTEST_CFLAGS)
 
 LDADD = \
     $(QTCORE_LIBS) \
@@ -39,8 +36,7 @@ LDADD = \
     $(top_builddir)/TelepathyQt4/Prototype/libtpqt4-prototype.la
 
 AM_CXXFLAGS = \
-    $(ERROR_CXXFLAGS) \
-    $(MOC_INCLUDES)
+    $(ERROR_CXXFLAGS)
 
 TESTS_ENV = \
     abs_top_builddir=@abs_top_builddir@ \
@@ -57,7 +53,7 @@ CLEANFILES = \
 
 _gen/%.moc: %
 	$(mkdir_p) _gen
-	$(MOC) $(MOC_INCLUDES) -i $< -o $@
+	$(MOC) $(AM_CPPFLAGS) -i $< -o $@
 
 distclean-local:
 	rm -rf _gen
-- 
1.5.6.5




More information about the telepathy-commits mailing list