X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=78cf4a94f0880603b8b1be07b4953dc15809d53c;hp=65bb176bfd13c2664e73b754e5979783b325fde5;hb=a90e23051b5b29deca4726a397574a34621038aa;hpb=bedd083aaedb3bbb14ef579a047bf4b4fed56d9b

diff --git a/Makefile.am b/Makefile.am
index 65bb176bf..78cf4a94f 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,7 +590,8 @@ EXTRA_DIST += \
 	units/user/systemd-exit.service.in \
 	units/systemd-fsck@.service.in \
 	units/systemd-fsck-root.service.in \
-	units/user@.service.in \
+	units/systemd-machine-id-commit.service.in \
+	units/user@.service.m4.in \
 	units/debug-shell.service.in \
 	units/systemd-suspend.service.in \
 	units/quotaon.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 \
@@ -1149,6 +1153,7 @@ libsystemd_core_la_CFLAGS = \
 	$(KMOD_CFLAGS) \
 	$(APPARMOR_CFLAGS) \
 	$(SECCOMP_CFLAGS) \
+	$(MOUNT_CFLAGS) \
 	-pthread
 
 libsystemd_core_la_LIBADD = \
@@ -1161,7 +1166,8 @@ libsystemd_core_la_LIBADD = \
 	$(AUDIT_LIBS) \
 	$(KMOD_LIBS) \
 	$(APPARMOR_LIBS) \
-	$(SECCOMP_LIBS)
+	$(SECCOMP_LIBS) \
+	$(MOUNT_LIBS)
 
 if HAVE_SECCOMP
 libsystemd_core_la_LIBADD += \
@@ -1380,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 \
@@ -2178,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
@@ -2525,9 +2579,16 @@ dist_userunit_DATA += \
 endif
 
 EXTRA_DIST += \
-	units/systemd-bus-proxyd@.service.in \
+	units/systemd-bus-proxyd@.service.m4.in \
 	units/user/systemd-bus-proxyd@.service.in
 
+if HAVE_SMACK
+bus-proxyd-set-cap-hook:
+	$(SETCAP) cap_mac_admin+ei $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd
+
+INSTALL_EXEC_HOOKS += bus-proxyd-set-cap-hook
+endif
+
 # ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
 	src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -2728,6 +2789,7 @@ tests += \
 	test-bus-gvariant \
 	test-event \
 	test-rtnl \
+	test-local-addresses \
 	test-resolve
 
 bin_PROGRAMS += \
@@ -2886,6 +2948,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
 
@@ -3286,6 +3355,7 @@ dist_udevrules_DATA += \
 	rules/50-udev-default.rules \
 	rules/60-drm.rules \
 	rules/60-keyboard.rules \
+	rules/70-mouse.rules \
 	rules/60-persistent-storage-tape.rules \
 	rules/60-persistent-serial.rules \
 	rules/60-persistent-input.rules \
@@ -3312,7 +3382,8 @@ dist_udevhwdb_DATA = \
 	hwdb/20-acpi-vendor.hwdb \
 	hwdb/20-OUI.hwdb \
 	hwdb/20-net-ifname.hwdb \
-	hwdb/60-keyboard.hwdb
+	hwdb/60-keyboard.hwdb \
+	hwdb/70-mouse.hwdb
 
 udevconfdir = $(sysconfdir)/udev
 dist_udevconf_DATA = \
@@ -4414,14 +4485,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
 
 # ------------------------------------------------------------------------------
@@ -4443,6 +4518,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
 
 # ------------------------------------------------------------------------------
@@ -5818,6 +5902,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) < $< > $@