X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=abf8a2bb3e902b0b08e084010ee835362e4b04de;hp=6e01188410934dbbb44271dd1ea91ad50ce74bd5;hb=ecde7065f7b11a7a226d2f7b0e90e998a6347a59;hpb=4eaea66423ca58dfd7cfd1099ed902d7c81d8622 diff --git a/Makefile.am b/Makefile.am index 6e0118841..abf8a2bb3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,13 +36,19 @@ SUBDIRS = . po .PRECIOUS: $(TEST_SUITE_LOG) Makefile LIBUDEV_CURRENT=5 -LIBUDEV_REVISION=0 +LIBUDEV_REVISION=1 LIBUDEV_AGE=4 LIBGUDEV_CURRENT=2 LIBGUDEV_REVISION=0 LIBGUDEV_AGE=2 +LIBSYSTEMD_CURRENT=3 +LIBSYSTEMD_REVISION=0 +LIBSYSTEMD_AGE=3 + +# The following four libraries only exist for compatibility reasons, +# their version info should not be bumped anymore LIBSYSTEMD_LOGIN_CURRENT=9 LIBSYSTEMD_LOGIN_REVISION=3 LIBSYSTEMD_LOGIN_AGE=9 @@ -59,10 +65,6 @@ LIBSYSTEMD_JOURNAL_CURRENT=11 LIBSYSTEMD_JOURNAL_REVISION=5 LIBSYSTEMD_JOURNAL_AGE=11 -LIBSYSTEMD_CURRENT=1 -LIBSYSTEMD_REVISION=0 -LIBSYSTEMD_AGE=1 - # Dirs of external packages dbuspolicydir=@dbuspolicydir@ dbussessionservicedir=@dbussessionservicedir@ @@ -86,6 +88,7 @@ pkgsysconfdir=$(sysconfdir)/systemd userunitdir=$(prefix)/lib/systemd/user userpresetdir=$(prefix)/lib/systemd/user-preset tmpfilesdir=$(prefix)/lib/tmpfiles.d +sysusersdir=$(prefix)/lib/sysusers.d sysctldir=$(prefix)/lib/sysctl.d networkdir=$(rootprefix)/lib/systemd/network pkgincludedir=$(includedir)/systemd @@ -190,6 +193,7 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/journal \ -I $(top_srcdir)/src/timedate \ -I $(top_srcdir)/src/timesync \ + -I $(top_srcdir)/src/resolve \ -I $(top_srcdir)/src/systemd \ -I $(top_builddir)/src/core \ -I $(top_srcdir)/src/core \ @@ -357,7 +361,8 @@ rootlibexec_PROGRAMS = \ systemd-sysctl \ systemd-sleep \ systemd-bus-proxyd \ - systemd-socket-proxyd + systemd-socket-proxyd \ + systemd-update-done systemgenerator_PROGRAMS = \ systemd-getty-generator \ @@ -412,6 +417,7 @@ dist_systemunit_DATA = \ units/remote-fs.target \ units/remote-fs-pre.target \ units/network.target \ + units/network-pre.target \ units/network-online.target \ units/nss-lookup.target \ units/nss-user-lookup.target \ @@ -485,12 +491,14 @@ nodist_systemunit_DATA = \ units/systemd-udevd.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service \ + units/systemd-udev-hwdb-update.service \ units/debug-shell.service \ units/initrd-parse-etc.service \ units/initrd-cleanup.service \ units/initrd-udevadm-cleanup-db.service \ units/initrd-switch-root.service \ - units/systemd-nspawn@.service + units/systemd-nspawn@.service \ + units/systemd-update-done.service dist_userunit_DATA = \ units/user/basic.target \ @@ -533,7 +541,8 @@ EXTRA_DIST += \ units/initrd-cleanup.service.in \ units/initrd-udevadm-cleanup-db.service.in \ units/initrd-switch-root.service.in \ - units/systemd-nspawn@.service.in + units/systemd-nspawn@.service.in \ + units/systemd-update-done.service.in CLEANFILES += \ units/console-shell.service.m4 \ @@ -548,6 +557,7 @@ nodist_systemunit_DATA += \ units/halt-local.service systemgenerator_PROGRAMS += \ + systemd-sysv-generator \ systemd-rc-local-generator endif @@ -757,8 +767,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/replace-var.h \ src/shared/spawn-polkit-agent.c \ src/shared/spawn-polkit-agent.h \ - src/shared/hwclock.c \ - src/shared/hwclock.h \ + src/shared/clock-util.c \ + src/shared/clock-util.h \ src/shared/time-dst.c \ src/shared/time-dst.h \ src/shared/calendarspec.c \ @@ -804,7 +814,11 @@ libsystemd_shared_la_SOURCES = \ src/shared/ring.c \ src/shared/ring.h \ src/shared/async.c \ - src/shared/async.h + src/shared/async.h \ + src/shared/eventfd-util.c \ + src/shared/eventfd-util.h \ + src/shared/copy.c \ + src/shared/copy.h nodist_libsystemd_shared_la_SOURCES = \ src/shared/errno-from-name.h \ @@ -1630,6 +1644,14 @@ systemd_update_utmp_LDADD = \ libsystemd-shared.la \ $(AUDIT_LIBS) +# ------------------------------------------------------------------------------ +systemd_update_done_SOURCES = \ + src/update-done/update-done.c + +systemd_update_done_LDADD = \ + libsystemd-internal.la \ + libsystemd-shared.la + # ------------------------------------------------------------------------------ systemd_shutdownd_SOURCES = \ src/shutdownd/shutdownd.c @@ -1689,8 +1711,8 @@ endif endif EXTRA_DIST += \ - units/systemd-modules-load.service.in \ - units/kmod-static-nodes.service.in + units/systemd-modules-load.service.in \ + units/kmod-static-nodes.service.in # ------------------------------------------------------------------------------ if ENABLE_TMPFILES @@ -1719,7 +1741,8 @@ dist_tmpfiles_DATA = \ tmpfiles.d/systemd.conf \ tmpfiles.d/systemd-nologin.conf \ tmpfiles.d/tmp.conf \ - tmpfiles.d/x11.conf + tmpfiles.d/x11.conf \ + tmpfiles.d/var.conf if HAVE_SYSV_COMPAT dist_tmpfiles_DATA += \ @@ -1746,6 +1769,38 @@ EXTRA_DIST += \ units/systemd-tmpfiles-setup.service.in \ units/systemd-tmpfiles-clean.service.in +# ------------------------------------------------------------------------------ +if ENABLE_SYSUSERS +systemd_sysusers_SOURCES = \ + src/sysusers/sysusers.c + +systemd_sysusers_LDADD = \ + libsystemd-units.la \ + libsystemd-label.la \ + libsystemd-capability.la \ + libsystemd-internal.la \ + libsystemd-shared.la + +rootlibexec_PROGRAMS += \ + systemd-sysusers + +nodist_systemunit_DATA += \ + units/systemd-sysusers.service + +SYSINIT_TARGET_WANTS += \ + systemd-sysusers.service + +nodist_sysusers_DATA = \ + sysusers.d/systemd.conf + +EXTRA_DIST += \ + units/systemd-sysusers.service.in \ + sysusers.d/systemd.conf.in + +INSTALL_DIRS += \ + $(sysusersdir) +endif + # ------------------------------------------------------------------------------ systemd_machine_id_setup_SOURCES = \ src/machine-id-setup/machine-id-setup-main.c \ @@ -1795,9 +1850,6 @@ systemd_detect_virt_SOURCES = \ systemd_detect_virt_LDADD = \ libsystemd-shared.la -systemd-detect-virt-install-hook: - -$(SETCAP) cap_dac_override,cap_sys_ptrace=ep $(DESTDIR)$(bindir)/systemd-detect-virt - INSTALL_EXEC_HOOKS += \ systemd-detect-virt-install-hook @@ -1914,6 +1966,15 @@ INSTALL_EXEC_HOOKS += dbus1-generator-install-hook UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook endif +# ------------------------------------------------------------------------------ +systemd_sysv_generator_SOURCES = \ + src/sysv-generator/sysv-generator.c + +systemd_sysv_generator_LDADD = \ + libsystemd-core.la \ + libsystemd-label.la \ + libsystemd-shared.la + # ------------------------------------------------------------------------------ systemd_rc_local_generator_SOURCES = \ src/rc-local-generator/rc-local-generator.c @@ -2030,9 +2091,12 @@ systemd_run_LDADD = \ # ------------------------------------------------------------------------------ systemd_bus_proxyd_SOURCES = \ - src/bus-proxyd/bus-proxyd.c + src/bus-proxyd/bus-proxyd.c \ + src/bus-proxyd/bus-policy.c \ + src/bus-proxyd/bus-policy.h systemd_bus_proxyd_LDADD = \ + libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -2508,6 +2572,7 @@ libsystemd_network_la_SOURCES = \ src/libsystemd-network/network-internal.h libsystemd_network_la_LIBADD = \ + libudev-internal.la \ libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la \ @@ -2536,15 +2601,15 @@ test_dhcp_client_LDADD = \ libsystemd-shared.la test_ipv4ll_SOURCES = \ - src/systemd/sd-ipv4ll.h \ - src/libsystemd-network/ipv4ll-internal.h \ - src/libsystemd-network/test-ipv4ll.c + src/systemd/sd-ipv4ll.h \ + src/libsystemd-network/ipv4ll-internal.h \ + src/libsystemd-network/test-ipv4ll.c test_ipv4ll_LDADD = \ - libsystemd-network.la \ - libsystemd-label.la \ - libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-network.la \ + libsystemd-label.la \ + libsystemd-internal.la \ + libsystemd-shared.la tests += \ test-dhcp-option \ @@ -2696,19 +2761,23 @@ CLEANFILES += \ EXTRA_DIST += \ units/systemd-udevd.service.in \ units/systemd-udev-trigger.service.in \ - units/systemd-udev-settle.service.in + units/systemd-udev-settle.service.in \ + units/systemd-udev-hwdb-update.service.in CLEANFILES += \ units/systemd-udevd.service \ units/systemd-udev-trigger.service \ - units/systemd-udev-settle.service + units/systemd-udev-settle.service \ + units/systemd-udev-hwdb-update.service SOCKETS_TARGET_WANTS += \ systemd-udevd-control.socket \ systemd-udevd-kernel.socket + SYSINIT_TARGET_WANTS += \ systemd-udevd.service \ - systemd-udev-trigger.service + systemd-udev-trigger.service \ + systemd-udev-hwdb-update.service rootbin_PROGRAMS += \ udevadm @@ -3478,11 +3547,13 @@ bin_PROGRAMS += \ systemd-cat dist_systemunit_DATA += \ - units/systemd-journald.socket + units/systemd-journald.socket \ + units/systemd-journald-dev-log.socket nodist_systemunit_DATA += \ units/systemd-journald.service \ - units/systemd-journal-flush.service + units/systemd-journal-flush.service \ + units/systemd-journal-catalog-update.service dist_pkgsysconf_DATA += \ src/journal/journald.conf @@ -3494,14 +3565,18 @@ dist_catalog_DATA = \ catalog/systemd.catalog SOCKETS_TARGET_WANTS += \ - systemd-journald.socket + systemd-journald.socket \ + systemd-journald-dev-log.socket + SYSINIT_TARGET_WANTS += \ systemd-journald.service \ - systemd-journal-flush.service + systemd-journal-flush.service \ + systemd-journal-catalog-update.service EXTRA_DIST += \ units/systemd-journald.service.in \ units/systemd-journal-flush.service.in \ + units/systemd-journal-catalog-update.service.in \ src/journal/journald-gperf.gperf CLEANFILES += \ @@ -3562,7 +3637,8 @@ systemd_socket_proxyd_LDADD = \ libsystemd-logs.la \ libsystemd-internal.la \ libsystemd-journal-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-resolve.la # ------------------------------------------------------------------------------ if ENABLE_COREDUMP @@ -4062,12 +4138,12 @@ CLEANFILES += \ src/timesync/timesyncd-gperf.c systemd_timesyncd_LDADD = \ - libsystemd-label.la \ - libsystemd-internal.la \ - libsystemd-shared.la \ libsystemd-resolve.la \ libsystemd-network.la \ + libsystemd-label.la \ libsystemd-capability.la \ + libsystemd-internal.la \ + libsystemd-shared.la \ -lm rootlibexec_PROGRAMS += \ @@ -4193,6 +4269,56 @@ EXTRA_DIST += \ endif +# ------------------------------------------------------------------------------ +if ENABLE_RESOLVED +systemd_resolved_SOURCES = \ + src/resolve/resolved.h \ + src/resolve/resolved.c \ + src/resolve/resolved-manager.c + +systemd_resolved_CFLAGS = \ + $(AM_CFLAGS) \ + $(KMOD_CFLAGS) + +nodist_systemd_resolved_SOURCES = \ + src/resolve/resolved-gperf.c + +EXTRA_DIST += \ + src/resolve/resolved-gperf.gperf + +CLEANFILES += \ + src/resolve/resolved-gperf.c + +systemd_resolved_LDADD = \ + libsystemd-capability.la \ + libsystemd-network.la \ + libsystemd-label.la \ + libsystemd-internal.la \ + libsystemd-shared.la + +rootlibexec_PROGRAMS += \ + systemd-resolved + +nodist_systemunit_DATA += \ + units/systemd-resolved.service + +EXTRA_DIST += \ + units/systemd-resolved.service.in + +GENERAL_ALIASES += \ + $(systemunitdir)/systemd-resolved.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-resolved.service + +nodist_pkgsysconf_DATA += \ + src/resolve/resolved.conf + +EXTRA_DIST += \ + src/resolve/resolved.conf.in + +CLEANFILES += \ + src/resolve/resolved.conf + +endif + # ------------------------------------------------------------------------------ if ENABLE_NETWORKD rootlibexec_PROGRAMS += \ @@ -4203,14 +4329,13 @@ systemd_networkd_SOURCES = \ systemd_networkd_LDADD = \ libsystemd-networkd-core.la \ - $(KMOD_LIBS) + libsystemd-capability.la noinst_LTLIBRARIES += \ libsystemd-networkd-core.la libsystemd_networkd_core_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(KMOD_CFLAGS) + $(AM_CFLAGS) libsystemd_networkd_core_la_SOURCES = \ src/libsystemd-network/network-internal.h \ @@ -4218,6 +4343,7 @@ libsystemd_networkd_core_la_SOURCES = \ src/network/networkd-link.c \ src/network/networkd-netdev.c \ src/network/networkd-tunnel.c \ + src/network/networkd-veth.c \ src/network/networkd-network.c \ src/network/networkd-address.c \ src/network/networkd-route.c \ @@ -4225,8 +4351,7 @@ libsystemd_networkd_core_la_SOURCES = \ nodist_libsystemd_networkd_core_la_SOURCES = \ src/network/networkd-network-gperf.c \ - src/network/networkd-netdev-gperf.c \ - src/network/networkd-gperf.c + src/network/networkd-netdev-gperf.c libsystemd_networkd_core_la_LIBADD = \ libudev-internal.la \ @@ -4239,8 +4364,7 @@ rootlibexec_PROGRAMS += \ systemd-networkd-wait-online systemd_networkd_wait_online_CFLAGS = \ - $(AM_CFLAGS) \ - $(KMOD_CFLAGS) + $(AM_CFLAGS) systemd_networkd_wait_online_SOURCES = \ src/libsystemd-network/network-internal.h \ @@ -4251,15 +4375,16 @@ systemd_networkd_wait_online_LDADD = \ libsystemd-network.la \ libudev-internal.la \ libsystemd-internal.la \ - libsystemd-shared.la \ - libsystemd-network.la + libsystemd-shared.la test_network_SOURCES = \ src/network/test-network.c +test_network_CFLAGS = \ + $(AM_CFLAGS) + test_network_LDADD = \ libsystemd-networkd-core.la - $(KMOD_LIBS) tests += \ test-network @@ -4270,24 +4395,17 @@ nodist_systemunit_DATA += \ GENERAL_ALIASES += \ $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \ - $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service - -nodist_pkgsysconf_DATA += \ - src/network/networkd.conf + $(systemunitdir)/systemd-networkd-wait-online.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service EXTRA_DIST += \ src/network/networkd-network-gperf.gperf \ src/network/networkd-netdev-gperf.gperf \ - src/network/networkd-gperf.gperf \ units/systemd-networkd.service.in \ - units/systemd-networkd-wait-online.service.in \ - src/network/networkd.conf.in + units/systemd-networkd-wait-online.service.in CLEANFILES += \ src/network/networkd-network-gperf.c \ - src/network/networkd-netdev-gperf.c \ - src/network/networkd-gperf.c \ - src/network/networkd.conf + src/network/networkd-netdev-gperf.c endif # ------------------------------------------------------------------------------ @@ -4813,6 +4931,7 @@ substitutions = \ '|udevrulesdir=$(udevrulesdir)|' \ '|catalogdir=$(catalogdir)|' \ '|tmpfilesdir=$(tmpfilesdir)|' \ + '|sysusersdir=$(sysusersdir)|' \ '|sysctldir=$(sysctldir)|' \ '|systemgeneratordir=$(systemgeneratordir)|' \ '|usergeneratordir=$(usergeneratordir)|' \ @@ -4842,7 +4961,10 @@ substitutions = \ '|PYTHON=$(PYTHON)|' \ '|PYTHON_BINARY=$(PYTHON_BINARY)|' \ '|NTP_SERVERS=$(NTP_SERVERS)|' \ - '|DNS_SERVERS=$(DNS_SERVERS)|' + '|DNS_SERVERS=$(DNS_SERVERS)|' \ + '|systemuidmax=$(SYSTEM_UID_MAX)|' \ + '|systemgidmax=$(SYSTEM_GID_MAX)|' \ + '|TTY_GID=$(TTY_GID)|' SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ @@ -5004,14 +5126,19 @@ RUNLEVEL4_TARGET_WANTS += \ RUNLEVEL5_TARGET_WANTS += \ systemd-update-utmp-runlevel.service endif + SYSINIT_TARGET_WANTS += \ - systemd-update-utmp.service + systemd-update-utmp.service \ + systemd-update-done.service + LOCAL_FS_TARGET_WANTS += \ systemd-remount-fs.service \ tmp.mount + MULTI_USER_TARGET_WANTS += \ getty.target \ systemd-ask-password-wall.path + SYSINIT_TARGET_WANTS += \ dev-hugepages.mount \ dev-mqueue.mount \ @@ -5135,9 +5262,9 @@ linkcheck: hwdb-update: ( cd $(top_srcdir)/hwdb && \ wget -N http://www.linux-usb.org/usb.ids \ - http://pci-ids.ucw.cz/v2.2/pci.ids \ - http://standards.ieee.org/develop/regauth/oui/oui.txt \ - http://standards.ieee.org/develop/regauth/iab/iab.txt && \ + http://pci-ids.ucw.cz/v2.2/pci.ids \ + http://standards.ieee.org/develop/regauth/oui/oui.txt \ + http://standards.ieee.org/develop/regauth/iab/iab.txt && \ ./ids-update.pl ) .PHONY: kdbus-update @@ -5182,7 +5309,7 @@ valgrind-tests: $(TESTS) if file $$f | grep -q shell; then \ echo -e "$${x}Skipping non-binary $$f"; else \ echo -e "$${x}Running $$f"; \ - libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \ + libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \ x="\n\n"; \ done @@ -5274,60 +5401,6 @@ tests += \ test-libsystemd-sym \ test-libudev-sym -if ENABLE_COMPAT_LIBS -test-libsystemd-daemon-sym.c: \ - src/compat-libs/libsystemd-daemon.sym \ - src/systemd/sd-daemon.h - $(generate-sym-test) - -test-libsystemd-id128-sym.c: \ - src/compat-libs/libsystemd-id128.sym \ - src/systemd/sd-id128.h - $(generate-sym-test) - -test-libsystemd-journal-sym.c: \ - src/compat-libs/libsystemd-journal.sym \ - src/systemd/sd-journal.h - $(generate-sym-test) - -test-libsystemd-login-sym.c: \ - src/compat-libs/libsystemd-login.sym \ - src/systemd/sd-login.h - $(generate-sym-test) - -test_libsystemd_daemon_sym_SOURCES = \ - test-libsystemd-daemon-sym.c -test_libsystemd_daemon_sym_LDADD = \ - libsystemd-daemon.la - -test_libsystemd_id128_sym_SOURCES = \ - test-libsystemd-id128-sym.c -test_libsystemd_id128_sym_LDADD = \ - libsystemd-id128.la - -test_libsystemd_journal_sym_SOURCES = \ - test-libsystemd-journal-sym.c -test_libsystemd_journal_sym_LDADD = \ - libsystemd-journal.la - -test_libsystemd_login_sym_SOURCES = \ - test-libsystemd-login-sym.c -test_libsystemd_login_sym_LDADD = \ - libsystemd-login.la - -BUILT_SOURCES += \ - $(test_libsystemd_journal_sym_SOURCES) \ - $(test_libsystemd_login_sym_SOURCES) \ - $(test_libsystemd_id128_sym_SOURCES) \ - $(test_libsystemd_daemon_sym_SOURCES) - -tests += \ - test-libsystemd-journal-sym \ - test-libsystemd-login-sym \ - test-libsystemd-id128-sym \ - test-libsystemd-daemon-sym -endif - .PHONY: cppcheck cppcheck: cppcheck --enable=all -q $(top_srcdir)