[Telepathy-commits] [telepathy-qt4/master] Fix inclusion order in call example, and be more explicit

[Simon McVittie]

$(TP_QT4_CFLAGS) has to come first, despite the usual rule that
higher-level libraries come later, so that if telepathy-glib,
telepathy-farsight and telepathy-qt4 are all installed in
/usr/include/telepathy-1.0 (this is currently true), the copy of
telepathy-qt4 currently being built is used rather than the system copy.

Including telepathy-glib's CFLAGS is probably unnecessary, but we should
do it anyway - explicit is better than implicit. Likewise for the
libraries.
---
 examples/call/Makefile.am |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/examples/call/Makefile.am b/examples/call/Makefile.am
index a9eaba0..962d88c 100644
--- a/examples/call/Makefile.am
+++ b/examples/call/Makefile.am
@@ -1,16 +1,19 @@
 AM_CXXFLAGS = \
+	$(TP_QT4_CFLAGS) \
 	$(ERROR_CXXFLAGS) \
 	$(QTCORE_CFLAGS) \
 	$(QTGUI_CFLAGS) \
 	$(QTDBUS_CFLAGS) \
-	$(TP_FARSIGHT_CFLAGS) \
-	$(TP_QT4_CFLAGS)
+	$(TP_GLIB_CFLAGS) \
+	$(TP_FARSIGHT_CFLAGS)
 
 noinst_PROGRAMS = call
 
 call_LDADD = \
+	$(QTCORE_LIBS) \
 	$(QTGUI_LIBS) \
 	$(QTDBUS_LIBS) \
+	$(TP_GLIB_LIBS) \
 	$(TP_FARSIGHT_LIBS) \
 	$(top_builddir)/TelepathyQt4/libtelepathy-qt4.la \
 	$(top_builddir)/examples/roster/libtelepathy-qt4-examples-roster.la
-- 
1.5.6.5