X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=c67f0634b19ef6c37734b8e641f197859630cb22;hp=ddfec1bdeff35bb3531572ad86f82f52ec791397;hb=849958d1ba3533c953fad46d4d41c0ec6e48316d;hpb=679be2a74241a70028438217bace423a1a45faa6 diff --git a/Makefile.am b/Makefile.am index ddfec1bde..c67f0634b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,7 +36,7 @@ SUBDIRS = . po .PRECIOUS: $(TEST_SUITE_LOG) Makefile LIBUDEV_CURRENT=5 -LIBUDEV_REVISION=0 +LIBUDEV_REVISION=1 LIBUDEV_AGE=4 LIBGUDEV_CURRENT=2 @@ -59,9 +59,9 @@ LIBSYSTEMD_JOURNAL_CURRENT=11 LIBSYSTEMD_JOURNAL_REVISION=5 LIBSYSTEMD_JOURNAL_AGE=11 -LIBSYSTEMD_CURRENT=1 +LIBSYSTEMD_CURRENT=2 LIBSYSTEMD_REVISION=0 -LIBSYSTEMD_AGE=1 +LIBSYSTEMD_AGE=2 # Dirs of external packages dbuspolicydir=@dbuspolicydir@ @@ -190,6 +190,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 \ @@ -548,6 +549,7 @@ nodist_systemunit_DATA += \ units/halt-local.service systemgenerator_PROGRAMS += \ + systemd-sysv-generator \ systemd-rc-local-generator endif @@ -757,8 +759,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 +806,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 \ @@ -1689,8 +1695,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 @@ -1795,9 +1801,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 +1917,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 +2042,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 +2523,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 +2552,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 \ @@ -2641,7 +2657,8 @@ INSTALL_DIRS += \ dist_network_DATA = \ network/99-default.link \ - network/80-container-host0.network + network/80-container-host0.network \ + network/80-container-ve.network dist_udevrules_DATA += \ rules/42-usb-hid-pm.rules \ @@ -3477,7 +3494,8 @@ 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 \ @@ -3493,7 +3511,9 @@ 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 @@ -3561,7 +3581,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 @@ -4061,11 +4082,12 @@ CLEANFILES += \ src/timesync/timesyncd-gperf.c systemd_timesyncd_LDADD = \ + libsystemd-resolve.la \ + libsystemd-network.la \ libsystemd-label.la \ + libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la \ - libsystemd-resolve.la \ - libsystemd-network.la \ -lm rootlibexec_PROGRAMS += \ @@ -4191,6 +4213,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 += \ @@ -4201,14 +4273,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 \ @@ -4216,6 +4287,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 \ @@ -4232,20 +4304,11 @@ libsystemd_networkd_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-shared.la -nodist_systemunit_DATA += \ - units/systemd-networkd.service \ - units/systemd-networkd-wait-online.service - -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 - 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 \ @@ -4256,19 +4319,28 @@ 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 +nodist_systemunit_DATA += \ + units/systemd-networkd.service \ + units/systemd-networkd-wait-online.service + +GENERAL_ALIASES += \ + $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \ + $(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 \ @@ -4831,7 +4903,10 @@ substitutions = \ '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \ '|PYTHON=$(PYTHON)|' \ '|PYTHON_BINARY=$(PYTHON_BINARY)|' \ - '|NTP_SERVERS=$(NTP_SERVERS)|' + '|NTP_SERVERS=$(NTP_SERVERS)|' \ + '|DNS_SERVERS=$(DNS_SERVERS)|' \ + '|systemuidmax=$(SYSTEM_UID_MAX)|' \ + '|systemgidmax=$(SYSTEM_GID_MAX)|' SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ @@ -5124,9 +5199,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 @@ -5171,7 +5246,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 @@ -5263,60 +5338,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)