X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=f6c22bd28149f723eacac42a3ef45eb794323493;hb=edbb03e95a3c31bf719d5c6c46eec14d0bcb9c8f;hp=ee7dd2d6cf0bc43f26b5ab6dd770be58b7518d0b;hpb=b77c08e06b67d5b1dd8aaf67b732e93851d8ae43;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index ee7dd2d6c..f6c22bd28 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -646,8 +646,7 @@ EXTRA_DIST += \
 	tools/make-man-index.py \
 	tools/make-directive-index.py \
 	tools/make-man-rules.py \
-	tools/xml_helper.py \
-	man/less-variables.xml
+	tools/xml_helper.py
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -674,6 +673,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/util.h \
 	src/shared/virt.c \
 	src/shared/virt.h \
+	src/shared/architecture.c \
+	src/shared/architecture.h \
 	src/shared/efivars.c \
 	src/shared/efivars.h \
 	src/shared/path-util.c \
@@ -1018,6 +1019,7 @@ libsystemd_core_la_CFLAGS = \
 	$(AUDIT_CFLAGS) \
 	$(CAP_CFLAGS) \
 	$(KMOD_CFLAGS) \
+	$(APPARMOR_CFLAGS) \
 	$(SECCOMP_CFLAGS) \
 	-pthread
 
@@ -1033,6 +1035,7 @@ libsystemd_core_la_LIBADD = \
 	$(AUDIT_LIBS) \
 	$(CAP_LIBS) \
 	$(KMOD_LIBS) \
+	$(APPARMOR_LIBS) \
 	$(SECCOMP_LIBS)
 
 if HAVE_SECCOMP
@@ -1150,7 +1153,8 @@ tests += \
 	test-list \
 	test-tables \
 	test-device-nodes \
-	test-xml
+	test-xml \
+	test-architecture
 
 EXTRA_DIST += \
 	test/sched_idle_bad.service \
@@ -1298,6 +1302,12 @@ test_time_SOURCES = \
 test_time_LDADD = \
 	libsystemd-core.la
 
+test_architecture_SOURCES = \
+	src/test/test-architecture.c
+
+test_architecture_LDADD = \
+	libsystemd-shared.la
+
 test_log_SOURCES = \
 	src/test/test-log.c
 
@@ -1728,6 +1738,9 @@ bootctl_LDADD = \
 bin_PROGRAMS += \
 	bootctl
 
+dist_bashcompletion_DATA += \
+	shell-completion/bash/bootctl
+
 dist_zshcompletion_DATA += \
 	shell-completion/zsh/_bootctl
 
@@ -1870,9 +1883,13 @@ systemd_nspawn_LDADD = \
 	libsystemd-capability.la \
 	libsystemd-internal.la \
 	libudev-internal.la \
-	libsystemd-shared.la \
+	libsystemd-shared.la
+
+if HAVE_SECCOMP
+systemd_nspawn_LDADD += \
 	libsystemd-seccomp.la \
 	$(SECCOMP_LIBS)
+endif
 
 # ------------------------------------------------------------------------------
 systemd_run_SOURCES = \
@@ -3925,7 +3942,8 @@ systemd_networkd_SOURCES = \
 	src/network/networkd-manager.c
 
 nodist_systemd_networkd_SOURCES = \
-	src/network/networkd-gperf.c
+	src/network/networkd-network-gperf.c \
+	src/network/networkd-netdev-gperf.c
 
 systemd_networkd_LDADD = \
 	libudev-internal.la \
@@ -3937,9 +3955,6 @@ systemd_networkd_LDADD = \
 nodist_systemunit_DATA += \
 	units/systemd-networkd.service
 
-MULTI_USER_TARGET_WANTS += \
-	systemd-networkd.service
-
 test_network_SOURCES = \
 	src/network/test-network.c \
 	src/network/networkd.h \
@@ -3949,7 +3964,8 @@ test_network_SOURCES = \
 	src/network/networkd-address.c \
 	src/network/networkd-route.c \
 	src/network/networkd-manager.c \
-	src/network/networkd-gperf.c
+	src/network/networkd-network-gperf.c \
+	src/network/networkd-netdev-gperf.c
 
 test_network_LDADD = \
 	libudev-internal.la \
@@ -3962,11 +3978,13 @@ tests += \
 	test-network
 
 EXTRA_DIST += \
-	src/network/networkd-gperf.gperf \
+	src/network/networkd-network-gperf.gperf \
+	src/network/networkd-netdev-gperf.gperf \
 	units/systemd-networkd.service.in
 
 CLEANFILES += \
-	src/network/networkd-gperf.c
+	src/network/networkd-network-gperf.c \
+	src/network/networkd-netdev-gperf.c
 endif
 
 # ------------------------------------------------------------------------------
@@ -4727,6 +4745,7 @@ USER_UNIT_ALIASES += \
 
 GENERAL_ALIASES += \
 	$(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
+	$(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \
 	$(systemunitdir)/getty@.service $(pkgsysconfdir)/system/getty.target.wants/getty@tty1.service \
 	$(pkgsysconfdir)/user $(sysconfdir)/xdg/systemd/user \
 	../system-services/org.freedesktop.systemd1.service $(dbussessionservicedir)/org.freedesktop.systemd1.service