X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=7b43733eb1d683f5c7a477fb7251ed33e6b3e870;hp=791508bb0ffa827eb3134d8ea11c924f6bb97467;hb=9c0f842033c577d58b6b263073468ec5802478fc;hpb=8d3ae2bd4c9bf9fc2e57f7b3776325a1c750ca30

diff --git a/Makefile.am b/Makefile.am
index 791508bb0..7b43733eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -385,6 +385,7 @@ rootlibexec_PROGRAMS = \
 	systemd-remount-fs \
 	systemd-reply-password \
 	systemd-fsck \
+	systemd-machine-id-commit \
 	systemd-ac-power \
 	systemd-sysctl \
 	systemd-sleep \
@@ -536,6 +537,7 @@ nodist_systemunit_DATA = \
 	units/systemd-kexec.service \
 	units/systemd-fsck@.service \
 	units/systemd-fsck-root.service \
+	units/systemd-machine-id-commit.service \
 	units/systemd-udevd.service \
 	units/systemd-udev-trigger.service \
 	units/systemd-udev-settle.service \
@@ -588,6 +590,7 @@ EXTRA_DIST += \
 	units/user/systemd-exit.service.in \
 	units/systemd-fsck@.service.in \
 	units/systemd-fsck-root.service.in \
+	units/systemd-machine-id-commit.service.in \
 	units/user@.service.in \
 	units/debug-shell.service.in \
 	units/systemd-suspend.service.in \
@@ -811,6 +814,7 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/socket-util.h \
 	src/shared/in-addr-util.c \
 	src/shared/in-addr-util.h \
+	src/shared/ether-addr-util.h \
 	src/shared/conf-files.c \
 	src/shared/conf-files.h \
 	src/shared/cgroup-util.c \
@@ -1382,6 +1386,40 @@ EXTRA_DIST += \
 	test/testsuite.target \
 	test/timers.target \
 	test/unstoppable.service \
+	test/path-changed.service \
+	test/path-directorynotempty.service \
+	test/path-existsglob.service \
+	test/path-exists.service \
+	test/path-makedirectory.service \
+	test/path-modified.service \
+	test/path-mycustomunit.service \
+	test/path-service.service \
+	test/path-changed.path \
+	test/path-directorynotempty.path \
+	test/path-existsglob.path \
+	test/path-exists.path \
+	test/path-makedirectory.path \
+	test/path-modified.path \
+	test/path-unit.path \
+	test/exec-environment-empty.service \
+	test/exec-environment-multiple.service \
+	test/exec-environment.service \
+	test/exec-group.service \
+	test/exec-ignoresigpipe-no.service \
+	test/exec-ignoresigpipe-yes.service \
+	test/exec-personality-x86-64.service \
+	test/exec-personality-x86.service \
+	test/exec-privatedevices-no.service \
+	test/exec-privatedevices-yes.service \
+	test/exec-privatetmp-no.service \
+	test/exec-privatetmp-yes.service \
+	test/exec-systemcallerrornumber.service \
+	test/exec-systemcallfilter-failing2.service \
+	test/exec-systemcallfilter-failing.service \
+	test/exec-systemcallfilter-not-failing2.service \
+	test/exec-systemcallfilter-not-failing.service \
+	test/exec-user.service \
+	test/exec-workingdirectory.service \
 	test/bus-policy/hello.conf \
 	test/bus-policy/methods.conf \
 	test/bus-policy/ownerships.conf \
@@ -2180,6 +2218,20 @@ systemd_fsck_LDADD = \
 	libudev-internal.la \
 	libsystemd-shared.la
 
+# ------------------------------------------------------------------------------
+systemd_machine_id_commit_SOURCES = \
+	src/machine-id-commit/machine-id-commit.c \
+	src/core/machine-id-setup.c \
+	src/core/machine-id-setup.h
+
+systemd_machine_id_commit_LDADD = \
+	libsystemd-label.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
+SYSINIT_TARGET_WANTS += \
+	systemd-machine-id-commit.service
+
 # ------------------------------------------------------------------------------
 systemd_ac_power_SOURCES = \
 	src/ac-power/ac-power.c
@@ -2730,6 +2782,7 @@ tests += \
 	test-bus-gvariant \
 	test-event \
 	test-rtnl \
+	test-local-addresses \
 	test-resolve
 
 bin_PROGRAMS += \
@@ -2888,6 +2941,13 @@ test_rtnl_LDADD = \
 	libsystemd-internal.la \
 	libsystemd-shared.la
 
+test_local_addresses_SOURCES = \
+	src/libsystemd/sd-rtnl/test-local-addresses.c
+
+test_local_addresses_LDADD = \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
 test_resolve_SOURCES = \
 	src/libsystemd/sd-resolve/test-resolve.c
 
@@ -4418,14 +4478,18 @@ rootlibexec_PROGRAMS += \
 nodist_systemunit_DATA += \
 	units/systemd-vconsole-setup.service
 
-dist_udevrules_DATA += \
+nodist_udevrules_DATA += \
 	src/vconsole/90-vconsole.rules
 
 SYSINIT_TARGET_WANTS += \
 	systemd-vconsole-setup.service
+
+CLEANFILES += \
+	src/vconsole/90-vconsole.rules
 endif
 
 EXTRA_DIST += \
+	src/vconsole/90-vconsole.rules.in \
 	units/systemd-vconsole-setup.service.in
 
 # ------------------------------------------------------------------------------
@@ -4447,6 +4511,15 @@ rootlibexec_PROGRAMS += \
 
 dist_pkgsysconf_DATA += \
 	src/bootchart/bootchart.conf
+
+nodist_systemunit_DATA += \
+	units/systemd-bootchart.service
+
+EXTRA_DIST += \
+	units/systemd-bootchart.service.in
+
+CLEANFILES += \
+	units/systemd-bootchart.service
 endif
 
 # ------------------------------------------------------------------------------
@@ -5822,6 +5895,10 @@ src/%: src/%.m4
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
 
+sysusers.d/%: sysusers.d/%.m4
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
+
 tmpfiles.d/%: tmpfiles.d/%.m4
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@