X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=19da6eab9597f6c4a9f415cb7672f5cff5d91294;hb=e599ba01f564161966b3b8c93cc229daf847e807;hp=7bedd76f397e55af0bd775e164db1aba94a9d97b;hpb=bc25a2fb66ebf14589bb7ce5ecbd35301ee484ac;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 7bedd76f3..19da6eab9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1349,10 +1349,9 @@ test_cgroup_LDADD = \
 test_cgroup_mask_SOURCES = \
 	src/test/test-cgroup-mask.c
 
-test_cgroup_mask_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	-D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)"
+test_cgroup_mask_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-DTEST_DIR=\"$(abs_top_srcdir)/test\"
 
 test_cgroup_mask_LDADD = \
 	libsystemd-core.la \
@@ -1416,9 +1415,9 @@ test_watchdog_LDADD = \
 test_sched_prio_SOURCES = \
 	src/test/test-sched-prio.c
 
-test_sched_prio_CFLAGS = \
-	$(AM_CFLAGS) \
-	-D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)"
+test_sched_prio_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-DTEST_DIR=\"$(abs_top_srcdir)/test\"
 
 test_sched_prio_LDADD = \
 	libsystemd-core.la \
@@ -2162,11 +2161,15 @@ test_bus_gvariant_LDADD = \
 	libsystemd-id128-internal.la \
 	libsystemd-daemon-internal.la \
 	libsystemd-shared.la \
-	$(GLIB_LIBS)
+	libsystemd-bus-dump.la \
+	libsystemd-capability.la \
+	$(GLIB_LIBS) \
+	$(CAP_LIBS)
 
 test_bus_gvariant_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(GLIB_CFLAGS)
+	$(CAP_CFLAGS)
 
 test_bus_creds_SOURCES = \
 	src/libsystemd-bus/test-bus-creds.c
@@ -3054,8 +3057,8 @@ test_mmap_cache_LDADD = \
 test_catalog_SOURCES = \
 	src/journal/test-catalog.c
 
-test_catalog_CFLAGS = \
-	$(AM_CFLAGS) \
+test_catalog_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
 	-DCATALOG_DIR=\"$(abs_top_srcdir)/catalog\"
 
 test_catalog_LDADD = \
@@ -3313,9 +3316,12 @@ systemd_journal_gatewayd_LDADD = \
 
 systemd_journal_gatewayd_CFLAGS = \
 	$(AM_CFLAGS) \
-	-DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \
 	$(MICROHTTPD_CFLAGS)
 
+systemd_journal_gatewayd_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\"
+
 dist_systemunit_DATA += \
 	units/systemd-journal-gatewayd.socket