[Telepathy-commits] [telepathy-qt4/master] Use TP_QT4_CFLAGS so it's the same as if we got them from pkg-config

[Simon McVittie]

---
 configure.ac                    |    8 ++++----
 examples/extensions/Makefile.am |    6 +++---
 tests/dbus/Makefile.am          |    2 +-
 tests/pinocchio/Makefile.am     |    2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index bfa0d66..1185c45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,11 +130,11 @@ PKG_CHECK_MODULES(QTDBUS, [QtDBus >= 4.5])
 AC_SUBST(QTDBUS_CFLAGS)
 AC_SUBST(QTDBUS_LIBS)
 
-dnl We want the examples to be able to use TP_QT4_CXXFLAGS, TP_QT4_LIBS
-dnl as though they were independent programs
-TP_QT4_CXXFLAGS='-I${top_builddir} -I${top_srcdir}'
+dnl We want the examples to be able to use TP_QT4_CFLAGS, TP_QT4_LIBS
+dnl as though they were independent programs that got them from pkgconfig
+TP_QT4_CFLAGS='-I${top_builddir} -I${top_srcdir}'
 TP_QT4_LIBS='${top_builddir}/TelepathyQt4/libtelepathy-qt4.la'
-AC_SUBST(TP_QT4_CXXFLAGS)
+AC_SUBST(TP_QT4_CFLAGS)
 AC_SUBST(TP_QT4_LIBS)
 
 AC_PATH_PROGS([PINOCCHIO], [telepathy-pinocchio], [none],
diff --git a/examples/extensions/Makefile.am b/examples/extensions/Makefile.am
index 13d8ef1..da4f047 100644
--- a/examples/extensions/Makefile.am
+++ b/examples/extensions/Makefile.am
@@ -18,9 +18,9 @@ tools_dir = $(top_srcdir)/tools
 
 AM_CXXFLAGS = \
     $(ERROR_CXXFLAGS) \
-    @QTCORE_CFLAGS@ \
-    @QTDBUS_CFLAGS@ \
-    $(TP_QT4_CXXFLAGS)
+    $(QTCORE_CFLAGS) \
+    $(QTDBUS_CFLAGS) \
+    $(TP_QT4_CFLAGS)
 
 EXTRA_DIST = \
     all.xml \
diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am
index c2f2ce4..eafd2a4 100644
--- a/tests/dbus/Makefile.am
+++ b/tests/dbus/Makefile.am
@@ -12,7 +12,7 @@ AM_CXXFLAGS = \
     $(ERROR_CXXFLAGS) \
     $(QTCORE_CFLAGS) \
     $(QTDBUS_CFLAGS) \
-    $(TP_QT4_CXXFLAGS)
+    $(TP_QT4_CFLAGS)
 
 TESTS_ENV = \
     abs_top_builddir=@abs_top_builddir@ \
diff --git a/tests/pinocchio/Makefile.am b/tests/pinocchio/Makefile.am
index 1b85c46..aec4bea 100644
--- a/tests/pinocchio/Makefile.am
+++ b/tests/pinocchio/Makefile.am
@@ -14,7 +14,7 @@ AM_CXXFLAGS = \
     $(ERROR_CXXFLAGS) \
     $(QTCORE_CFLAGS) \
     $(QTDBUS_CFLAGS) \
-    $(TP_QT4_CXXFLAGS)
+    $(TP_QT4_CFLAGS)
 
 TESTS_ENV = \
     abs_top_builddir=@abs_top_builddir@ \
-- 
1.5.6.5