X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=0777d01338d9374d7fd6a92aaa3feb4b7f7a98f5;hp=194aaa8fbf8616671b870b2156b75666db724423;hb=6b46ea73e3b1d8a1e65f58ac04772821bd4a72fb;hpb=c1b9d935725103e95901f347b8981647ce4dd546

diff --git a/Makefile.am b/Makefile.am
index 194aaa8fb..0777d0133 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 += \
@@ -796,9 +798,6 @@ libsystemd_units_la_SOURCES = \
 	src/shared/specifier.c \
 	src/shared/specifier.h
 
-libsystemd_units_la_CFLAGS = \
-	$(AM_CFLAGS)
-
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
 	libsystemd-label.la
@@ -1349,10 +1348,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 +1414,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 \
@@ -1562,11 +1560,10 @@ EXTRA_DIST += \
 # ------------------------------------------------------------------------------
 if ENABLE_TMPFILES
 systemd_tmpfiles_SOURCES = \
-	src/tmpfiles/tmpfiles.c \
-	src/shared/specifier.c \
-	src/shared/specifier.h
+	src/tmpfiles/tmpfiles.c
 
 systemd_tmpfiles_LDADD = \
+	libsystemd-units.la \
 	libsystemd-label.la \
 	libsystemd-capability.la \
 	libsystemd-id128-internal.la \
@@ -2027,7 +2024,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
@@ -2046,7 +2045,7 @@ libsystemd_bus_dump_la_SOURCES = \
 	src/libsystemd-bus/bus-dump.h
 
 libsystemd_bus_dump_la_CFLAGS = \
-	$(AM_CFLAGS)
+	$(AM_CFLAGS) \
 	$(CAP_CFLAGS)
 
 noinst_LTLIBRARIES += \
@@ -2160,11 +2159,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
@@ -2945,7 +2948,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
@@ -3052,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 = \
@@ -3311,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
 
@@ -3834,6 +3842,46 @@ lib_LTLIBRARIES += \
 	libnss_myhostname.la
 endif
 
+# ------------------------------------------------------------------------------
+libsystemd_dhcp_la_SOURCES = \
+	src/systemd/sd-dhcp-client.h \
+	src/libsystemd-dhcp/dhcp-protocol.h \
+	src/libsystemd-dhcp/dhcp-internal.h \
+	src/libsystemd-dhcp/dhcp-network.c \
+	src/libsystemd-dhcp/dhcp-option.c \
+	src/libsystemd-dhcp/dhcp-client.c
+
+noinst_LTLIBRARIES += \
+	libsystemd-dhcp.la
+
+libsystemd_dhcp_la_LIBADD = \
+	libsystemd-shared.la \
+	libsystemd-bus.la
+
+test_dhcp_option_SOURCES = \
+	src/libsystemd-dhcp/dhcp-protocol.h \
+	src/libsystemd-dhcp/dhcp-internal.h \
+	src/libsystemd-dhcp/test-dhcp-option.c
+
+test_dhcp_option_LDADD = \
+	libsystemd-dhcp.la \
+	libsystemd-shared.la
+
+test_dhcp_client_SOURCES = \
+	src/libsystemd-dhcp/dhcp-protocol.h \
+	src/systemd/sd-dhcp-client.h \
+	src/libsystemd-dhcp/dhcp-internal.h \
+	src/libsystemd-dhcp/test-dhcp-client.c
+
+test_dhcp_client_LDADD = \
+	libsystemd-dhcp.la \
+	libsystemd-shared.la \
+	libsystemd-bus.la
+
+tests += \
+	test-dhcp-option \
+	test-dhcp-client
+
 # ------------------------------------------------------------------------------
 if ENABLE_MACHINED
 systemd_machined_SOURCES = \
@@ -3958,10 +4006,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 \