aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-12-08 10:03:10 -0600
committerTed Gould <ted@gould.cx>2010-12-08 10:03:10 -0600
commit4a94c8c8c2756fb91164b35ecc767a90f1c61a25 (patch)
tree7172c7b84d60651bf3e41d8a68417a643f17c872
parent9530e6993889a539081131ab1bd14635062569fa (diff)
downloadlibayatana-appindicator-4a94c8c8c2756fb91164b35ecc767a90f1c61a25.tar.gz
libayatana-appindicator-4a94c8c8c2756fb91164b35ecc767a90f1c61a25.tar.bz2
libayatana-appindicator-4a94c8c8c2756fb91164b35ecc767a90f1c61a25.zip
Adding a build for dbus-glib for tests so that we can pass them unmodified.
-rw-r--r--configure.ac4
-rw-r--r--tests/Makefile.am32
2 files changed, 20 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac
index 7b192ca..30b2279 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,10 @@ AS_IF([test "x$with_gtk" = x3],
)
AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
+PKG_CHECK_MODULES(TESTDEPS, dbus-glib-1)
+AC_SUBST(TESTDEPS_CFLAGS)
+AC_SUBST(TESTDEPS_LIBS)
+
###########################
# GObject Introspection
###########################
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 15e477e..5040b77 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,13 +24,13 @@ test_libappindicator_SOURCES = \
test-libappindicator.c
test_libappindicator_CFLAGS = \
- $(LIBRARY_CFLAGS) \
+ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
-DSRCDIR="\"$(srcdir)\"" \
-Wall -Werror \
-I$(top_srcdir)/src
test_libappindicator_LDADD = \
- $(LIBRARY_LIBS) \
+ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
$(top_builddir)/src/libappindicator.la
#########################################
@@ -42,12 +42,12 @@ test_libappindicator_dbus_client_SOURCES = \
test-libappindicator-dbus-client.c
test_libappindicator_dbus_client_CFLAGS = \
- $(LIBRARY_CFLAGS) \
+ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
-Wall -Werror \
-I$(top_srcdir)/src
test_libappindicator_dbus_client_LDADD = \
- $(LIBRARY_LIBS) \
+ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
$(top_builddir)/src/libappindicator.la
#########################################
@@ -59,12 +59,12 @@ test_libappindicator_dbus_server_SOURCES = \
test-libappindicator-dbus-server.c
test_libappindicator_dbus_server_CFLAGS = \
- $(LIBRARY_CFLAGS) \
+ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
-Wall -Werror \
-I$(top_srcdir)/src
test_libappindicator_dbus_server_LDADD = \
- $(LIBRARY_LIBS) \
+ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
$(top_builddir)/src/libappindicator.la
#########################################
@@ -76,12 +76,12 @@ test_libappindicator_status_client_SOURCES = \
test-libappindicator-status-client.c
test_libappindicator_status_client_CFLAGS = \
- $(LIBRARY_CFLAGS) \
+ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
-Wall -Werror \
-I$(top_srcdir)/src
test_libappindicator_status_client_LDADD = \
- $(LIBRARY_LIBS) \
+ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
$(top_builddir)/src/libappindicator.la
#########################################
@@ -93,12 +93,12 @@ test_libappindicator_status_server_SOURCES = \
test-libappindicator-status-server.c
test_libappindicator_status_server_CFLAGS = \
- $(LIBRARY_CFLAGS) \
+ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
-Wall -Werror \
-I$(top_srcdir)/src
test_libappindicator_status_server_LDADD = \
- $(LIBRARY_LIBS) \
+ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
$(top_builddir)/src/libappindicator.la
#########################################
@@ -109,24 +109,24 @@ test_libappindicator_fallback_watcher_SOURCES = \
test-libappindicator-fallback-watcher.c
test_libappindicator_fallback_watcher_CFLAGS = \
- $(LIBRARY_CFLAGS) \
+ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
-Wall -Werror \
-I$(top_srcdir)/src
test_libappindicator_fallback_watcher_LDADD = \
- $(LIBRARY_LIBS) \
+ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
$(top_builddir)/src/libappindicator.la
test_libappindicator_fallback_item_SOURCES = \
test-libappindicator-fallback-item.c
test_libappindicator_fallback_item_CFLAGS = \
- $(LIBRARY_CFLAGS) \
+ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
-Wall -Werror \
-I$(top_srcdir)/src
test_libappindicator_fallback_item_LDADD = \
- $(LIBRARY_LIBS) \
+ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
$(top_builddir)/src/libappindicator.la
test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libappindicator-fallback-item Makefile.am
@@ -185,11 +185,11 @@ test_simple_app_SOURCES = \
test-simple-app.c
test_simple_app_CFLAGS = \
- $(LIBRARY_CFLAGS) \
+ $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
-Wall -Werror \
-I$(top_srcdir)/src
test_simple_app_LDADD = \
- $(LIBRARY_LIBS) \
+ $(TESTDEPS_LIBS) $(LIBRARY_LIBS) \
$(top_builddir)/src/libappindicator.la