X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=9ece7a053825b6eed6589e1d22efba5d192af343;hb=61b5c82d91694a51bc886a61d5cc94f473dc7dd6;hp=2926e98d43c59316635cc1017b784c94f6e8e98b;hpb=813e3a6ffcd094696001716480bbd68008cc54c8;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 2926e98d4..9ece7a053 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -371,7 +371,8 @@ rootlibexec_PROGRAMS = \
 systemgenerator_PROGRAMS = \
 	systemd-getty-generator \
 	systemd-fstab-generator \
-	systemd-system-update-generator
+	systemd-system-update-generator \
+	systemd-debug-generator
 
 dist_bashcompletion_DATA = \
 	shell-completion/bash/busctl \
@@ -1242,7 +1243,8 @@ tests += \
 	test-xml \
 	test-architecture \
 	test-socket-util \
-	test-fdset
+	test-fdset \
+	test-conf-files
 
 EXTRA_DIST += \
 	test/sched_idle_bad.service \
@@ -1599,6 +1601,12 @@ test_sched_prio_LDADD = \
 	libsystemd-core.la \
 	$(RT_LIBS)
 
+test_conf_files_SOURCES = \
+	src/test/test-conf-files.c
+
+test_conf_files_LDADD = \
+	libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 ## .PHONY so it always rebuilds it
 .PHONY: coverage lcov-run lcov-report coverage-sync
@@ -1820,6 +1828,9 @@ EXTRA_DIST += \
 	units/systemd-sysusers.service.in \
 	sysusers.d/systemd.conf.in
 
+CLEANFILES += \
+	sysusers.d/systemd.conf
+
 INSTALL_DIRS += \
 	$(sysusersdir)
 endif
@@ -1891,6 +1902,14 @@ systemd_getty_generator_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la
 
+# ------------------------------------------------------------------------------
+systemd_debug_generator_SOURCES = \
+	src/debug-generator/debug-generator.c
+
+systemd_debug_generator_LDADD = \
+	libsystemd-label.la \
+	libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 systemd_fstab_generator_SOURCES = \
 	src/fstab-generator/fstab-generator.c \
@@ -2596,12 +2615,17 @@ libsystemd_network_la_SOURCES = \
 	src/libsystemd-network/ipv4ll-internal.h \
 	src/libsystemd-network/network-internal.c \
 	src/libsystemd-network/network-internal.h \
-	src/systemd/sd-dhcp6-client.h \
 	src/systemd/sd-icmp6-nd.h \
-	src/libsystemd-network/sd-dhcp6-client.c \
+	src/systemd/sd-dhcp6-client.h \
+	src/systemd/sd-dhcp6-lease.h \
 	src/libsystemd-network/sd-icmp6-nd.c \
+	src/libsystemd-network/sd-dhcp6-client.c \
 	src/libsystemd-network/dhcp6-internal.h \
-	src/libsystemd-network/dhcp6-network.c
+	src/libsystemd-network/dhcp6-protocol.h \
+	src/libsystemd-network/dhcp6-network.c \
+	src/libsystemd-network/dhcp6-option.c \
+	src/libsystemd-network/dhcp6-lease-internal.h \
+	src/libsystemd-network/sd-dhcp6-lease.c
 
 libsystemd_network_la_LIBADD = \
 	libudev-internal.la \
@@ -2653,7 +2677,7 @@ test_ipv4ll_LDADD = \
 
 test_icmp6_rs_SOURCES = \
 	src/systemd/sd-dhcp6-client.h \
-	src/libsystemd-network/sd-icmp6-nd.h \
+	src/systemd/sd-icmp6-nd.h \
 	src/libsystemd-network/dhcp6-internal.h \
 	src/libsystemd-network/test-icmp6-rs.c
 
@@ -2664,6 +2688,7 @@ test_icmp6_rs_LDADD = \
 
 test_dhcp6_client_SOURCES = \
 	src/systemd/sd-dhcp6-client.h \
+	src/libsystemd-network/dhcp6-internal.h \
 	src/libsystemd-network/test-dhcp6-client.c
 
 test_dhcp6_client_LDADD = \