X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=25bbcab888bff43ed8e55e66579ee18ef8a1c6eb;hp=7c6241440c829aa36290c23de1f06dd28b3a09f2;hb=d514feaa872820d5cb4e9321ad32673c09fbb3f4;hpb=cde360cd5de39fb910ebfcc0839f8c3fa465ef8b

diff --git a/Makefile.am b/Makefile.am
index 7c6241440..25bbcab88 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -652,10 +652,12 @@ test_rtnl_SOURCES = \
 test_rtnl_LDADD = \
 	libsystemd-rtnl.la \
 	libsystemd-bus-internal.la \
+	libsystemd-daemon-internal.la \
 	libsystemd-id128-internal.la \
 	libsystemd-shared.la
 
-tests += test-rtnl
+tests += \
+	test-rtnl
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -1349,10 +1351,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 +1417,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 \
@@ -1997,6 +1998,8 @@ libsystemd_bus_la_SOURCES = \
 	src/libsystemd-bus/bus-introspect.h \
 	src/libsystemd-bus/bus-objects.c \
 	src/libsystemd-bus/bus-objects.h \
+	src/libsystemd-bus/bus-gvariant.c \
+	src/libsystemd-bus/bus-gvariant.h \
 	src/libsystemd-bus/bus-convenience.c \
 	src/libsystemd-bus/kdbus.h \
 	src/libsystemd-bus/sd-memfd.c \
@@ -2004,7 +2007,8 @@ libsystemd_bus_la_SOURCES = \
 	src/libsystemd-bus/bus-util.h \
 	src/libsystemd-bus/sd-utf8.c \
 	src/libsystemd-bus/sd-event.c \
-	src/libsystemd-bus/event-util.h
+	src/libsystemd-bus/event-util.h \
+	src/libsystemd-bus/bus-protocol.h
 
 libsystemd_bus_la_LIBADD = \
 	libsystemd-id128-internal.la \
@@ -2024,7 +2028,9 @@ pkgconfiglib_DATA += \
 	src/libsystemd-bus/libsystemd-bus.pc
 
 EXTRA_DIST += \
-	src/libsystemd-bus/libsystemd-bus.pc.in
+	src/libsystemd-bus/libsystemd-bus.pc.in \
+	src/libsystemd-bus/DIFFERENCES \
+	src/libsystemd-bus/GVARIANT-SERIALIZATION
 
 lib_LTLIBRARIES += \
 	libsystemd-bus.la
@@ -2064,6 +2070,7 @@ tests += \
 	test-bus-objects \
 	test-bus-error \
 	test-bus-creds \
+	test-bus-gvariant \
 	test-event
 
 bin_PROGRAMS += \
@@ -2148,6 +2155,24 @@ test_bus_error_LDADD = \
 	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
+test_bus_gvariant_SOURCES = \
+	src/libsystemd-bus/test-bus-gvariant.c
+
+test_bus_gvariant_LDADD = \
+	libsystemd-bus-internal.la \
+	libsystemd-id128-internal.la \
+	libsystemd-daemon-internal.la \
+	libsystemd-shared.la \
+	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
 
@@ -2927,7 +2952,9 @@ systemd_journald_SOURCES = \
 	src/journal/journald-server.h
 
 systemd_journald_LDADD = \
-	libsystemd-journal-core.la
+	libsystemd-journal-core.la \
+	libsystemd-bus-internal.la \
+	libsystemd-shared.la
 
 systemd_cat_SOURCES = \
 	src/journal/cat.c
@@ -3034,8 +3061,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 = \
@@ -3293,9 +3320,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
 
@@ -3940,10 +3970,12 @@ test_network_LDADD = \
 	libudev-internal.la \
 	libsystemd-bus-internal.la \
 	libsystemd-id128-internal.la \
+	libsystemd-daemon-internal.la \
 	libsystemd-rtnl.la \
 	libsystemd-shared.la
 
-tests += test-network
+tests += \
+	test-network
 
 EXTRA_DIST += \
 	src/network/networkd-gperf.gperf \