[Telepathy-commits] [telepathy-qt4/master] callable cm: Fixed Makefile.am.

[Andre Moreira Magalhaes (andrunko)]

---
 tests/lib/callable/Makefile.am |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/tests/lib/callable/Makefile.am b/tests/lib/callable/Makefile.am
index 2d7d8a9..63be08a 100644
--- a/tests/lib/callable/Makefile.am
+++ b/tests/lib/callable/Makefile.am
@@ -5,6 +5,16 @@
 # copy-and-modify (moving it to a better namespace), or make changes in the
 # copy in telepathy-glib first.
 
+AM_CFLAGS = \
+	$(ERROR_CFLAGS) \
+	-I$(top_builddir) -I$(top_srcdir)
+AM_CXXFLAGS = $(ERROR_CXXFLAGS)
+
+if ENABLE_TP_GLIB_TESTS
+
+AM_CFLAGS += $(TP_GLIB_CFLAGS)
+AM_CXXFLAGS += $(TP_GLIB_CFLAGS)
+
 noinst_LTLIBRARIES = libexample-cm-callable.la
 
 libexample_cm_callable_la_SOURCES = \
@@ -19,11 +29,8 @@ libexample_cm_callable_la_SOURCES = \
     media-stream.c \
     media-stream.h
 
-libexample_cm_callable_la_LIBADD = $(TP_GLIB_LIBS)
-
-AM_CFLAGS = \
-    $(ERROR_CFLAGS) \
-    $(TP_GLIB_CFLAGS)
+libexample_cm_callable_la_LIBADD = \
+	$(TP_GLIB_LIBS)
 
 EXTRA_DIST = manager-file.py
 
@@ -37,3 +44,5 @@ CLEANFILES = $(BUILT_SOURCES)
 
 clean-local:
 	rm -rf _gen
+
+endif
-- 
1.5.6.5