X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=1fc23f72f80dd11c7a20612dc10ba68197a6cc15;hp=724e89b626cb0ce0221abde91343594c53a9f38d;hb=96197df081a16bec192a6cfb8f19674ca58f4835;hpb=4a8cf55467303b707113b891733575780db85f39

diff --git a/Makefile.am b/Makefile.am
index 724e89b62..1fc23f72f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,7 +87,7 @@ userunitdir=$(prefix)/lib/systemd/user
 userpresetdir=$(prefix)/lib/systemd/user-preset
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysctldir=$(prefix)/lib/sysctl.d
-networkdir=$(prefix)/lib/systemd/network
+networkdir=$(rootprefix)/lib/systemd/network
 pkgincludedir=$(includedir)/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
 usergeneratordir=$(prefix)/lib/systemd/user-generators
@@ -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 \
@@ -766,7 +767,9 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/audit.c \
 	src/shared/audit.h \
 	src/shared/xml.c \
-	src/shared/xml.h
+	src/shared/xml.h \
+	src/shared/condition-util.c \
+	src/shared/condition-util.h
 
 nodist_libsystemd_shared_la_SOURCES = \
 	src/shared/errno-from-name.h \
@@ -1016,6 +1019,7 @@ libsystemd_core_la_CFLAGS = \
 	$(AUDIT_CFLAGS) \
 	$(CAP_CFLAGS) \
 	$(KMOD_CFLAGS) \
+	$(APPARMOR_CFLAGS) \
 	$(SECCOMP_CFLAGS) \
 	-pthread
 
@@ -1031,6 +1035,7 @@ libsystemd_core_la_LIBADD = \
 	$(AUDIT_LIBS) \
 	$(CAP_LIBS) \
 	$(KMOD_LIBS) \
+	$(APPARMOR_LIBS) \
 	$(SECCOMP_LIBS)
 
 if HAVE_SECCOMP
@@ -1148,7 +1153,8 @@ tests += \
 	test-list \
 	test-tables \
 	test-device-nodes \
-	test-xml
+	test-xml \
+	test-architecture
 
 EXTRA_DIST += \
 	test/sched_idle_bad.service \
@@ -1296,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
 
@@ -1726,6 +1738,9 @@ bootctl_LDADD = \
 bin_PROGRAMS += \
 	bootctl
 
+dist_bashcompletion_DATA += \
+	shell-completion/bash/bootctl
+
 dist_zshcompletion_DATA += \
 	shell-completion/zsh/_bootctl
 
@@ -1868,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 = \
@@ -1925,7 +1944,6 @@ systemd_tty_ask_password_agent_LDADD = \
 
 # ------------------------------------------------------------------------------
 libsystemd_internal_la_SOURCES = \
-	src/libsystemd/libsystemd.sym \
 	src/systemd/sd-bus.h \
 	src/systemd/sd-bus-protocol.h \
 	src/systemd/sd-bus-vtable.h \
@@ -1991,6 +2009,7 @@ libsystemd_internal_la_SOURCES = \
 	src/login/login-shared.h
 
 nodist_libsystemd_internal_la_SOURCES = \
+	src/libsystemd/libsystemd.sym \
 	src/libsystemd/sd-bus/bus-error-mapping.c
 
 libsystemd_internal_la_CFLAGS = \
@@ -2012,14 +2031,19 @@ noinst_LTLIBRARIES += \
 	libsystemd-dump.la
 
 EXTRA_DIST += \
+	src/libsystemd/libsystemd.sym.m4 \
+	src/libsystemd/libsystemd.pc.in \
 	src/libsystemd/sd-bus/bus-error-mapping.gperf \
 	src/libsystemd/sd-bus/DIFFERENCES \
-	src/libsystemd/sd-bus/GVARIANT-SERIALIZATION \
-	src/libsystemd/libsystemd.pc.in
+	src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
 
 CLEANFILES += \
+	src/libsystemd/libsystemd.sym \
 	src/libsystemd/sd-bus/bus-error-mapping.c
 
+BUILT_SOURCES += \
+	src/libsystemd/libsystemd.sym
+
 libsystemd_la_SOURCES = \
 	$(libsystemd_internal_la_SOURCES) \
 	$(libsystemd_journal_internal_la_SOURCES)
@@ -2034,7 +2058,7 @@ libsystemd_la_CFLAGS = \
 libsystemd_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
-	-Wl,--version-script=$(top_srcdir)/src/libsystemd/libsystemd.sym
+	-Wl,--version-script=$(top_builddir)/src/libsystemd/libsystemd.sym
 
 libsystemd_la_LIBADD = \
 	libsystemd-shared.la \
@@ -2042,6 +2066,20 @@ libsystemd_la_LIBADD = \
 	$(RT_LIBS) \
 	-lresolv
 
+libsystemd-install-hook:
+	libname=libsystemd.so && $(move-to-rootlibdir)
+	-$(MKDIR_P) $(DESTDIR)/var/log/journal
+	-chown 0:0 $(DESTDIR)/var/log/journal
+	-chmod 755 $(DESTDIR)/var/log/journal
+	-setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/
+	-setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/
+
+libsystemd-uninstall-hook:
+	rm -f $(DESTDIR)$(rootlibdir)/libsystemd.so*
+
+INSTALL_EXEC_HOOKS += libsystemd-install-hook
+UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook
+
 pkgconfiglib_DATA += \
 	src/libsystemd/libsystemd.pc
 
@@ -2458,6 +2496,7 @@ dist_udevhwdb_DATA = \
 	hwdb/20-bluetooth-vendor-product.hwdb \
 	hwdb/20-acpi-vendor.hwdb \
 	hwdb/20-OUI.hwdb \
+	hwdb/20-net-ifname.hwdb \
 	hwdb/60-keyboard.hwdb
 
 udevconfdir = $(sysconfdir)/udev
@@ -3903,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 \
@@ -3915,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 \
@@ -3927,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 \
@@ -3940,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
 
 # ------------------------------------------------------------------------------
@@ -4225,7 +4265,8 @@ id128_la_LDFLAGS = \
 
 id128_la_LIBADD = \
 	$(PYTHON_DEVEL_LIBS) \
-	libsystemd.la
+	libsystemd.la \
+	libsystemd-shared.la
 
 _daemon_la_SOURCES = \
 	src/python-systemd/_daemon.c \
@@ -4246,7 +4287,8 @@ _daemon_la_LDFLAGS = \
 
 _daemon_la_LIBADD = \
 	$(PYTHON_DEVEL_LIBS) \
-	libsystemd.la
+	libsystemd.la \
+	libsystemd-shared.la
 
 _reader_la_SOURCES = \
 	src/python-systemd/_reader.c \
@@ -4335,6 +4377,9 @@ clean-python:
 # ------------------------------------------------------------------------------
 if ENABLE_COMPAT_LIBS
 
+EXTRA_DIST += \
+	src/compat-libs/linkwarning.h
+
 define generate-fake-lib
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)sed -r -n 's/^ +(sd_.*);/void new_\1(void);\n__asm__(".symver new_\1,\1@LIBSYSTEMD_209");\nstatic void (*resolve_\1(void)) (void) {\n\treturn new_\1;\n}\nvoid \1(void) __attribute__((ifunc("resolve_\1")));\nobsolete_lib(\1,$(notdir $(basename $<)));\n/p' <$< >$@
@@ -4422,6 +4467,7 @@ lib_LTLIBRARIES += \
 	libsystemd-daemon.la
 
 pkgconfiglib_DATA += \
+	src/compat-libs/libsystemd-journal.pc \
 	src/compat-libs/libsystemd-login.pc \
 	src/compat-libs/libsystemd-id128.pc \
 	src/compat-libs/libsystemd-daemon.pc
@@ -4443,6 +4489,7 @@ UNINSTALL_EXEC_HOOKS += compat-lib-uninstall-hook
 endif
 
 EXTRA_DIST += \
+	src/compat-libs/libsystemd-journal.pc.in \
 	src/compat-libs/libsystemd-login.pc.in \
 	src/compat-libs/libsystemd-id128.pc.in \
 	src/compat-libs/libsystemd-daemon.pc.in
@@ -4698,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
@@ -4756,7 +4804,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-pamconfdir=$$dc_install_base/$(pamconfdir) \
 	--with-rootprefix=$$dc_install_base \
 	--disable-split-usr \
-	--enable-kdbus
+	--enable-kdbus \
+	--enable-compat-libs
 
 if HAVE_SYSV_COMPAT
 DISTCHECK_CONFIGURE_FLAGS += \
@@ -4879,7 +4928,7 @@ define generate-sym-test
 endef
 
 test-libsystemd-sym.c: \
-		src/libsystemd/libsystemd.sym \
+		$(top_builddir)/src/libsystemd/libsystemd.sym \
 		src/systemd/sd-journal.h \
 		src/systemd/sd-daemon.h \
 		src/systemd/sd-login.h \