X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=f6c195b26306bf90c9f42830a86dda26ed8ca696;hp=5a02d1ef323c321b19398331c057c1299552777b;hb=2dcf7ec6ec0c28297311108acba119cd6e055e64;hpb=4d7213b2747ddd87002f970ccc60b1a9ab637136 diff --git a/Makefile.am b/Makefile.am index 5a02d1ef3..f6c195b26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,9 +59,9 @@ LIBSYSTEMD_JOURNAL_CURRENT=11 LIBSYSTEMD_JOURNAL_REVISION=5 LIBSYSTEMD_JOURNAL_AGE=11 -LIBSYSTEMD_CURRENT=0 -LIBSYSTEMD_REVISION=1 -LIBSYSTEMD_AGE=0 +LIBSYSTEMD_CURRENT=1 +LIBSYSTEMD_REVISION=0 +LIBSYSTEMD_AGE=1 # Dirs of external packages dbuspolicydir=@dbuspolicydir@ @@ -101,6 +101,7 @@ udevrulesdir=$(udevlibexecdir)/rules.d udevhwdbdir=$(udevlibexecdir)/hwdb.d catalogdir=$(prefix)/lib/systemd/catalog kernelinstalldir = $(prefix)/lib/kernel/install.d +ntpunitsdir=$(prefix)/lib/systemd/ntp-units.d # And these are the special ones for / rootprefix=@rootprefix@ @@ -128,6 +129,7 @@ polkitpolicy_in_files = polkitpolicy_files = dist_udevrules_DATA = nodist_udevrules_DATA = +nodist_pkgsysconf_DATA = dist_pkgsysconf_DATA = dist_pkgdata_DATA = dist_dbuspolicy_DATA = @@ -186,6 +188,8 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/network \ -I $(top_srcdir)/src/login \ -I $(top_srcdir)/src/journal \ + -I $(top_srcdir)/src/timedate \ + -I $(top_srcdir)/src/timesync \ -I $(top_srcdir)/src/systemd \ -I $(top_builddir)/src/core \ -I $(top_srcdir)/src/core \ @@ -207,8 +211,8 @@ define move-to-rootlibdir if test "$(libdir)" != "$(rootlibdir)"; then \ $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \ so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \ - so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \ - $(LN_S) --relative -f $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \ + rm -f $(DESTDIR)$(libdir)/$$libname && \ + $(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \ mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \ fi endef @@ -311,6 +315,10 @@ AM_V_LN = $(AM_V_LN_$(V)) AM_V_LN_ = $(AM_V_LN_$(AM_DEFAULT_VERBOSITY)) AM_V_LN_0 = @echo " LN " $@; +AM_V_RM = $(AM_V_RM_$(V)) +AM_V_RM_ = $(AM_V_RM_$(AM_DEFAULT_VERBOSITY)) +AM_V_RM_0 = @echo " RM " $@; + # ------------------------------------------------------------------------------ rootbin_PROGRAMS = \ systemctl \ @@ -361,9 +369,11 @@ dist_bashcompletion_DATA = \ shell-completion/bash/journalctl \ shell-completion/bash/systemctl \ shell-completion/bash/systemd-analyze \ + shell-completion/bash/systemd-cat \ shell-completion/bash/systemd-cgls \ shell-completion/bash/systemd-cgtop \ shell-completion/bash/systemd-delta \ + shell-completion/bash/systemd-detect-virt \ shell-completion/bash/systemd-nspawn \ shell-completion/bash/systemd-run \ shell-completion/bash/udevadm \ @@ -772,8 +782,6 @@ libsystemd_shared_la_SOURCES = \ src/shared/ima-util.h \ src/shared/ptyfwd.c \ src/shared/ptyfwd.h \ - src/shared/net-util.c \ - src/shared/net-util.h \ src/shared/errno-list.c \ src/shared/errno-list.h \ src/shared/af-list.c \ @@ -785,7 +793,18 @@ libsystemd_shared_la_SOURCES = \ src/shared/condition-util.c \ src/shared/condition-util.h \ src/shared/bus-label.c \ - src/shared/bus-label.h + src/shared/bus-label.h \ + src/shared/gpt.h \ + src/shared/generator.h \ + src/shared/generator.c \ + src/shared/clean-ipc.h \ + src/shared/clean-ipc.c \ + src/shared/login-shared.c \ + src/shared/login-shared.h \ + src/shared/ring.c \ + src/shared/ring.h \ + src/shared/async.c \ + src/shared/async.h nodist_libsystemd_shared_la_SOURCES = \ src/shared/errno-from-name.h \ @@ -1007,8 +1026,6 @@ libsystemd_core_la_SOURCES = \ src/core/condition.h \ src/core/namespace.c \ src/core/namespace.h \ - src/core/tcpwrap.c \ - src/core/tcpwrap.h \ src/core/build.h \ src/core/sysfs-show.h \ src/core/switch-root.h \ @@ -1017,8 +1034,6 @@ libsystemd_core_la_SOURCES = \ src/core/killall.c \ src/core/audit-fd.c \ src/core/audit-fd.h \ - src/core/async.c \ - src/core/async.h \ src/core/show-status.c \ src/core/show-status.h @@ -1034,7 +1049,6 @@ nodist_libsystemd_core_la_SOURCES = \ libsystemd_core_la_CFLAGS = \ $(AM_CFLAGS) \ - $(LIBWRAP_CFLAGS) \ $(PAM_CFLAGS) \ $(AUDIT_CFLAGS) \ $(CAP_CFLAGS) \ @@ -1050,7 +1064,6 @@ libsystemd_core_la_LIBADD = \ libudev-internal.la \ libsystemd-shared.la \ libsystemd-internal.la \ - $(LIBWRAP_LIBS) \ $(PAM_LIBS) \ $(AUDIT_LIBS) \ $(CAP_LIBS) \ @@ -1087,7 +1100,7 @@ BUILT_SOURCES += \ src/shared/errno-list.txt: $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - < /dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+[0-9]/ { print $$2; }' > $@ + $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - < /dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' > $@ src/shared/errno-from-name.gperf: src/shared/errno-list.txt $(AM_V_at)$(MKDIR_P) $(dir $@) @@ -1099,7 +1112,7 @@ src/shared/errno-from-name.h: src/shared/errno-from-name.gperf src/shared/errno-to-name.h: src/shared/errno-list.txt $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@ + $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@ src/shared/af-list.txt: $(AM_V_at)$(MKDIR_P) $(dir $@) @@ -1164,9 +1177,16 @@ manual_tests += \ test-hostname \ test-daemon \ test-cgroup \ + test-cgroup-mask \ test-install \ test-watchdog \ - test-log + test-log \ + test-ipcrm + +if HAVE_KMOD +manual_tests += \ + test-rtnl-manual +endif tests += \ test-job-type \ @@ -1180,6 +1200,7 @@ tests += \ test-utf8 \ test-ellipsize \ test-util \ + test-ring \ test-tmpfiles \ test-namespace \ test-date \ @@ -1189,7 +1210,6 @@ tests += \ test-calendarspec \ test-strip-tab-ansi \ test-cgroup-util \ - test-cgroup-mask \ test-prioq \ test-fileio \ test-time \ @@ -1308,6 +1328,12 @@ test_util_SOURCES = \ test_util_LDADD = \ libsystemd-core.la +test_ring_SOURCES = \ + src/test/test-ring.c + +test_ring_LDADD = \ + libsystemd-core.la + test_tmpfiles_SOURCES = \ src/test/test-tmpfiles.c @@ -1382,6 +1408,25 @@ test_log_SOURCES = \ test_log_LDADD = \ libsystemd-core.la +test_ipcrm_SOURCES = \ + src/test/test-ipcrm.c + +test_ipcrm_LDADD = \ + libsystemd-shared.la \ + -lrt + +test_rtnl_manual_SOURCES = \ + src/test/test-rtnl-manual.c + +test_rtnl_manual_CFLAGS = \ + $(AM_CFLAGS) \ + $(KMOD_CFLAGS) + +test_rtnl_manual_LDADD = \ + libsystemd-internal.la \ + libsystemd-shared.la \ + $(KMOD_LIBS) + test_ellipsize_SOURCES = \ src/test/test-ellipsize.c @@ -1829,7 +1874,8 @@ systemgenerator_PROGRAMS += \ systemd-gpt-auto-generator systemd_gpt_auto_generator_SOURCES = \ - src/gpt-auto-generator/gpt-auto-generator.c + src/gpt-auto-generator/gpt-auto-generator.c \ + src/shared/blkid-util.h systemd_gpt_auto_generator_LDADD = \ libsystemd-label.la \ @@ -1858,6 +1904,7 @@ systemd_dbus1_generator_LDADD = \ dbus1-generator-install-hook: $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir) + $(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator dbus1-generator-uninstall-hook: @@ -1934,6 +1981,7 @@ systemd_cgls_SOURCES = \ src/cgls/cgls.c systemd_cgls_LDADD = \ + libsystemd-internal.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -1953,14 +2001,16 @@ systemd_nspawn_SOURCES = \ systemd_nspawn_CFLAGS = \ $(AM_CFLAGS) \ - $(SECCOMP_CFLAGS) + $(SECCOMP_CFLAGS) \ + $(BLKID_CFLAGS) systemd_nspawn_LDADD = \ libsystemd-label.la \ libsystemd-capability.la \ libsystemd-internal.la \ libudev-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + $(BLKID_LIBS) if HAVE_SECCOMP systemd_nspawn_LDADD += \ @@ -1988,6 +2038,7 @@ systemd_bus_proxyd_LDADD = \ bus-proxyd-install-hook: $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir) + $(AM_V_RM)rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge bus-proxyd-uninstall-hook: @@ -2068,6 +2119,8 @@ libsystemd_internal_la_SOURCES = \ src/libsystemd/sd-bus/bus-track.h \ src/libsystemd/sd-bus/bus-util.c \ src/libsystemd/sd-bus/bus-util.h \ + src/libsystemd/sd-bus/bus-slot.c \ + src/libsystemd/sd-bus/bus-slot.h \ src/libsystemd/sd-bus/bus-protocol.h \ src/libsystemd/sd-bus/kdbus.h \ src/libsystemd/sd-bus/sd-memfd.c \ @@ -2077,15 +2130,13 @@ libsystemd_internal_la_SOURCES = \ src/libsystemd/sd-rtnl/sd-rtnl.c \ src/libsystemd/sd-rtnl/rtnl-internal.h \ src/libsystemd/sd-rtnl/rtnl-message.c \ + src/libsystemd/sd-rtnl/rtnl-types.h \ + src/libsystemd/sd-rtnl/rtnl-types.c \ src/libsystemd/sd-rtnl/rtnl-util.h \ src/libsystemd/sd-rtnl/rtnl-util.c \ - src/libsystemd/sd-resolve/sd-resolve.c \ - src/libsystemd/sd-resolve/resolve-util.h \ src/libsystemd/sd-id128/sd-id128.c \ src/libsystemd/sd-daemon/sd-daemon.c \ - src/login/sd-login.c \ - src/login/login-shared.c \ - src/login/login-shared.h + src/libsystemd/sd-login/sd-login.c nodist_libsystemd_internal_la_SOURCES = \ src/libsystemd/libsystemd.sym \ @@ -2098,8 +2149,20 @@ libsystemd_internal_la_CFLAGS = \ libsystemd_internal_la_LIBADD = \ $(RT_LIBS) +libsystemd_resolve_la_SOURCES = \ + src/libsystemd/sd-resolve/sd-resolve.c \ + src/libsystemd/sd-resolve/resolve-util.h + +libsystemd_resolve_la_CFLAGS = \ + $(AM_CFLAGS) \ + -pthread + +libsystemd_resolve_la_LIBADD = \ + -lresolv + noinst_LTLIBRARIES += \ - libsystemd-internal.la + libsystemd-internal.la \ + libsystemd-resolve.la libsystemd_dump_la_SOURCES = \ src/libsystemd/sd-bus/bus-dump.c \ @@ -2128,6 +2191,7 @@ BUILT_SOURCES += \ libsystemd_la_SOURCES = \ $(libsystemd_internal_la_SOURCES) \ + $(libsystemd_resolve_la_SOURCES) \ $(libsystemd_journal_internal_la_SOURCES) nodist_libsystemd_la_SOURCES = \ @@ -2135,6 +2199,7 @@ nodist_libsystemd_la_SOURCES = \ libsystemd_la_CFLAGS = \ $(libsystemd_internal_la_CFLAGS) \ + $(libsystemd_resolve_la_CFLAGS) \ $(libsystemd_journal_internal_la_CFLAGS) libsystemd_la_LDFLAGS = \ @@ -2144,9 +2209,9 @@ libsystemd_la_LDFLAGS = \ libsystemd_la_LIBADD = \ libsystemd-shared.la \ + $(libsystemd_internal_la_LIBADD) \ $(libsystemd_journal_internal_la_LIBADD) \ - $(RT_LIBS) \ - -lresolv + $(libsystemd_resolve_la_LIBADD) libsystemd-install-hook: libname=libsystemd.so && $(move-to-rootlibdir) @@ -2387,13 +2452,12 @@ test_rtnl_LDADD = \ libsystemd-shared.la test_resolve_SOURCES = \ - src/systemd/sd-resolve.h \ src/libsystemd/sd-resolve/test-resolve.c test_resolve_LDADD = \ + libsystemd-resolve.la \ libsystemd-internal.la \ - libsystemd-shared.la \ - -lresolv + libsystemd-shared.la test_resolve_CFLAGS = \ $(AM_CFLAGS) \ @@ -2417,10 +2481,15 @@ busctl_CFLAGS = \ noinst_LTLIBRARIES += \ libsystemd-network.la +libsystemd_network_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(KMOD_CFLAGS) + libsystemd_network_la_SOURCES = \ src/systemd/sd-network.h \ src/systemd/sd-dhcp-client.h \ src/systemd/sd-dhcp-lease.h \ + src/systemd/sd-ipv4ll.h \ src/network/sd-network.c \ src/network/network-util.h \ src/libsystemd-network/sd-dhcp-client.c \ @@ -2430,11 +2499,19 @@ libsystemd_network_la_SOURCES = \ src/libsystemd-network/dhcp-internal.h \ src/libsystemd-network/dhcp-protocol.h \ src/libsystemd-network/dhcp-lease-internal.h \ - src/libsystemd-network/sd-dhcp-lease.c + src/libsystemd-network/sd-dhcp-lease.c \ + src/libsystemd-network/sd-ipv4ll.c \ + src/libsystemd-network/ipv4ll-network.c \ + src/libsystemd-network/ipv4ll-packet.c \ + src/libsystemd-network/ipv4ll-internal.h \ + src/libsystemd-network/network-internal.c \ + src/libsystemd-network/network-internal.h libsystemd_network_la_LIBADD = \ + libsystemd-label.la \ libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + $(KMOD_LIBS) test_dhcp_option_SOURCES = \ src/libsystemd-network/dhcp-protocol.h \ @@ -2454,12 +2531,25 @@ test_dhcp_client_SOURCES = \ test_dhcp_client_LDADD = \ libsystemd-network.la \ + libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la +test_ipv4ll_SOURCES = \ + 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 + tests += \ test-dhcp-option \ - test-dhcp-client + test-dhcp-client \ + test-ipv4ll # ------------------------------------------------------------------------------ if ENABLE_GTK_DOC @@ -2538,8 +2628,7 @@ noinst_LTLIBRARIES += \ libudev_internal_la_SOURCES =\ $(libudev_la_SOURCES) \ - src/libudev/libudev-device-private.c \ - src/libudev/libudev-queue-private.c + src/libudev/libudev-device-private.c libudev_internal_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -2555,7 +2644,6 @@ dist_network_DATA = \ network/80-container-host0.network dist_udevrules_DATA += \ - rules/99-systemd.rules \ rules/42-usb-hid-pm.rules \ rules/50-udev-default.rules \ rules/60-drm.rules \ @@ -2572,6 +2660,9 @@ dist_udevrules_DATA += \ rules/80-net-setup-link.rules \ rules/95-udev-late.rules +nodist_udevrules_DATA += \ + rules/99-systemd.rules + dist_udevhwdb_DATA = \ hwdb/20-pci-vendor-model.hwdb \ hwdb/20-pci-classes.hwdb \ @@ -2686,6 +2777,7 @@ libudev_core_la_LIBADD = \ libudev-internal.la \ libsystemd-label.la \ libsystemd-internal.la \ + libsystemd-network.la \ libsystemd-shared.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) @@ -2719,10 +2811,8 @@ if HAVE_ACL libudev_core_la_SOURCES += \ src/udev/udev-builtin-uaccess.c \ src/login/logind-acl.c \ - src/login/sd-login.c \ - src/systemd/sd-login.h \ - src/login/login-shared.c \ - src/login/login-shared.h + src/libsystemd/sd-login/sd-login.c \ + src/systemd/sd-login.h libudev_core_la_LIBADD += \ libsystemd-acl.la @@ -3096,6 +3186,38 @@ systemd_cat_SOURCES = \ systemd_cat_LDADD = \ libsystemd-journal-core.la +if HAVE_MICROHTTPD +rootlibexec_PROGRAMS += \ + systemd-journal-remote + +systemd_journal_remote_SOURCES = \ + src/journal/journal-remote-parse.h \ + src/journal/journal-remote-parse.c \ + src/journal/journal-remote-write.h \ + src/journal/journal-remote-write.c \ + src/journal/journal-remote.c + +systemd_journal_remote_LDADD = \ + libsystemd-internal.la \ + libsystemd-journal-core.la + +systemd_journal_remote_SOURCES += \ + src/journal/microhttpd-util.h \ + src/journal/microhttpd-util.c + +systemd_journal_remote_CFLAGS = \ + $(AM_CFLAGS) \ + $(MICROHTTPD_CFLAGS) + +systemd_journal_remote_LDADD += \ + $(MICROHTTPD_LIBS) + +if HAVE_GNUTLS +systemd_journal_remote_LDADD += \ + $(GNUTLS_LIBS) +endif +endif + # using _CFLAGS = in the conditional below would suppress AM_CFLAGS journalctl_CFLAGS = \ $(AM_CFLAGS) @@ -3213,6 +3335,8 @@ libsystemd_journal_core_la_SOURCES = \ src/journal/journald-server.h \ src/journal/journald-console.c \ src/journal/journald-console.h \ + src/journal/journald-wall.c \ + src/journal/journald-wall.h \ src/journal/journald-native.c \ src/journal/journald-native.h \ src/journal/journald-rate-limit.c \ @@ -3401,6 +3525,11 @@ systemd_journal_gatewayd_LDADD = \ libsystemd-shared.la \ $(MICROHTTPD_LIBS) +if HAVE_GNUTLS +systemd_journal_gatewayd_LDADD += \ + $(GNUTLS_LIBS) +endif + systemd_journal_gatewayd_CFLAGS = \ $(AM_CFLAGS) \ $(MICROHTTPD_CFLAGS) @@ -3442,8 +3571,8 @@ systemd_coredump_SOURCES = \ systemd_coredump_LDADD = \ libsystemd-journal-internal.la \ libsystemd-label.la \ - libsystemd-shared.la \ - libsystemd-internal.la + libsystemd-internal.la \ + libsystemd-shared.la rootlibexec_PROGRAMS += \ systemd-coredump @@ -3558,6 +3687,19 @@ nodist_systemunit_DATA += \ units/systemd-readahead-replay.service \ units/systemd-readahead-done.service +manual_tests += \ + test-ssd + +test_ssd_SOURCES = \ + src/readahead/test-ssd.c \ + src/readahead/readahead-common.c \ + src/readahead/readahead-common.h + +test_ssd_LDADD = \ + libsystemd-internal.la \ + libudev-internal.la \ + libsystemd-shared.la + endif EXTRA_DIST += \ @@ -3766,39 +3908,13 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ if ENABLE_KDBUS -systemd_bus_driverd_SOURCES = \ - src/bus-driverd/bus-driverd.c - -systemd_bus_driverd_LDADD = \ - libsystemd-internal.la \ - libsystemd-shared.la - -rootlibexec_PROGRAMS += \ - systemd-bus-driverd - -nodist_systemunit_DATA += \ - units/systemd-bus-driverd.service - dist_systemunit_DATA += \ - units/org.freedesktop.DBus.busname + units/org.freedesktop.systemd1.busname BUSNAMES_TARGET_WANTS += \ - org.freedesktop.DBus.busname - -nodist_userunit_DATA += \ - units/user/systemd-bus-driverd.service - -USER_BUSNAMES_TARGET_WANTS += \ - org.freedesktop.DBus.busname - -USER_UNIT_ALIASES += \ - $(systemunitdir)/org.freedesktop.DBus.busname org.freedesktop.DBus.busname + org.freedesktop.systemd1.busname endif -EXTRA_DIST += \ - units/systemd-bus-driverd.service.in \ - units/user/systemd-bus-driverd.service.in - # ------------------------------------------------------------------------------ if ENABLE_LOCALED systemd_localed_SOURCES = \ @@ -3929,6 +4045,52 @@ polkitpolicy_in_files += \ EXTRA_DIST += \ units/systemd-timedated.service.in +# ------------------------------------------------------------------------------ +if ENABLE_TIMESYNCD +systemd_timesyncd_SOURCES = \ + src/timesync/timesyncd.c \ + src/timesync/timesyncd.h + +nodist_systemd_timesyncd_SOURCES = \ + src/timesync/timesyncd-gperf.c + +EXTRA_DIST += \ + src/timesync/timesyncd-gperf.gperf + +CLEANFILES += \ + src/timesync/timesyncd-gperf.c + +systemd_timesyncd_LDADD = \ + libsystemd-label.la \ + libsystemd-internal.la \ + libsystemd-shared.la \ + libsystemd-resolve.la \ + libsystemd-network.la \ + -lm + +rootlibexec_PROGRAMS += \ + systemd-timesyncd + +nodist_systemunit_DATA += \ + units/systemd-timesyncd.service + +EXTRA_DIST += \ + units/systemd-timesyncd.service.in + +nodist_pkgsysconf_DATA += \ + src/timesync/timesyncd.conf + +EXTRA_DIST += \ + src/timesync/timesyncd.conf.in + +CLEANFILES += \ + src/timesync/timesyncd.conf + +dist_ntpunits_DATA = \ + src/timesync/90-systemd.list + +endif + # ------------------------------------------------------------------------------ if HAVE_MYHOSTNAME libnss_myhostname_la_SOURCES = \ @@ -3944,6 +4106,10 @@ libnss_myhostname_la_LDFLAGS = \ -shared \ -shrext .so.2 +libnss_myhostname_la_LIBADD = \ + libsystemd-shared.la \ + libsystemd-internal.la + lib_LTLIBRARIES += \ libnss_myhostname.la endif @@ -4011,7 +4177,8 @@ dist_dbuspolicy_DATA += \ src/machine/org.freedesktop.machine1.conf dist_zshcompletion_DATA += \ - shell-completion/zsh/_machinectl + shell-completion/zsh/_machinectl \ + shell-completion/zsh/_sd_machines SYSTEM_UNIT_ALIASES += \ systemd-machined.service dbus-org.freedesktop.machine1.service @@ -4033,15 +4200,22 @@ systemd_networkd_SOURCES = \ src/network/networkd.c systemd_networkd_LDADD = \ - libsystemd-networkd-core.la + libsystemd-networkd-core.la \ + $(KMOD_LIBS) noinst_LTLIBRARIES += \ libsystemd-networkd-core.la +libsystemd_networkd_core_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(KMOD_CFLAGS) + libsystemd_networkd_core_la_SOURCES = \ + src/libsystemd-network/network-internal.h \ src/network/networkd.h \ src/network/networkd-link.c \ src/network/networkd-netdev.c \ + src/network/networkd-tunnel.c \ src/network/networkd-network.c \ src/network/networkd-address.c \ src/network/networkd-route.c \ @@ -4049,7 +4223,8 @@ 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-netdev-gperf.c \ + src/network/networkd-gperf.c libsystemd_networkd_core_la_LIBADD = \ libudev-internal.la \ @@ -4058,20 +4233,23 @@ libsystemd_networkd_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-shared.la -nodist_systemunit_DATA += \ - units/systemd-networkd.service - -GENERAL_ALIASES += \ - $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service - rootlibexec_PROGRAMS += \ systemd-networkd-wait-online +systemd_networkd_wait_online_CFLAGS = \ + $(AM_CFLAGS) \ + $(KMOD_CFLAGS) + systemd_networkd_wait_online_SOURCES = \ - src/network/networkd-wait-online.c + src/libsystemd-network/network-internal.h \ + src/network/networkd-wait-online.c \ + src/network/networkd-wait-online.h systemd_networkd_wait_online_LDADD = \ + libsystemd-network.la \ + libudev-internal.la \ libsystemd-internal.la \ + libsystemd-shared.la \ libsystemd-network.la test_network_SOURCES = \ @@ -4079,18 +4257,35 @@ test_network_SOURCES = \ 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.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service + +nodist_pkgsysconf_DATA += \ + src/network/networkd.conf + EXTRA_DIST += \ src/network/networkd-network-gperf.gperf \ src/network/networkd-netdev-gperf.gperf \ - units/systemd-networkd.service.in + src/network/networkd-gperf.gperf \ + units/systemd-networkd.service.in \ + units/systemd-networkd-wait-online.service.in \ + src/network/networkd.conf.in CLEANFILES += \ src/network/networkd-network-gperf.c \ - src/network/networkd-netdev-gperf.c + src/network/networkd-netdev-gperf.c \ + src/network/networkd-gperf.c \ + src/network/networkd.conf endif # ------------------------------------------------------------------------------ @@ -4127,9 +4322,7 @@ libsystemd_logind_core_la_SOURCES = \ src/login/logind-session-dbus.c \ src/login/logind-seat-dbus.c \ src/login/logind-user-dbus.c \ - src/login/logind-acl.h \ - src/login/login-shared.c \ - src/login/login-shared.h + src/login/logind-acl.h libsystemd_logind_core_la_LIBADD = \ libsystemd-label.la \ @@ -4189,7 +4382,7 @@ rootbin_PROGRAMS += \ systemd-inhibit test_login_SOURCES = \ - src/login/test-login.c + src/libsystemd/sd-login/test-login.c test_login_LDADD = \ libsystemd-internal.la \ @@ -4645,7 +4838,9 @@ substitutions = \ '|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \ '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \ '|PYTHON=$(PYTHON)|' \ - '|PYTHON_BINARY=$(PYTHON_BINARY)|' + '|PYTHON_BINARY=$(PYTHON_BINARY)|' \ + '|NTP_SERVERS=$(NTP_SERVERS)|' \ + '|DNS_SERVERS=$(DNS_SERVERS)|' SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ @@ -4673,6 +4868,9 @@ src/%.policy.in: src/%.policy.in.in %.rules: %.rules.in $(SED_PROCESS) +%.conf: %.conf.in + $(SED_PROCESS) + %.sh: %.sh.in $(SED_PROCESS) $(AM_V_GEN)chmod +x $@ @@ -4712,7 +4910,7 @@ CLEANFILES += \ # ------------------------------------------------------------------------------ if ENABLE_MANPAGES -man/custom-entities.ent: +man/custom-entities.ent: configure.ac $(AM_V_GEN)$(MKDIR_P) $(dir $@) $(AM_V_GEN)(echo '' && \ printf '$(subst '|,\n,$(substitutions))))') \ @@ -4926,6 +5124,11 @@ DISTCHECK_CONFIGURE_FLAGS += \ --enable-gtk-doc endif +# check "broken" platforms limited toolchains for link breakage before we release +.PHONY: linkcheck +linkcheck: + $(MAKE) CFLAGS='-fno-lto' LDFLAGS='-Wl,-fuse-ld=gold -Wl,--as-needed -Wl,--no-gc-sections' distcheck + .PHONY: hwdb-update hwdb-update: ( cd $(top_srcdir)/hwdb && \ @@ -4937,16 +5140,18 @@ hwdb-update: .PHONY: kdbus-update kdbus-update: - ( cd $(top_srcdir)/src/libsystemd/ && \ + ( cd $(top_srcdir)/src/libsystemd/sd-bus/ && \ wget -N https://d-bus.googlecode.com/git/kdbus.h ) -.PHONY: upload -upload: all distcheck - cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/ - scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/ - scp man/*.html tango:public/systemd-man/ +.PHONY: git-tag +git-tag: + git tag -s "v$(VERSION)" -m "systemd $(VERSION)" www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd +.PHONY: upload +upload: all check dist + scp systemd-$(VERSION).tar.xz $(www_target) + .PHONY: doc-sync doc-sync: all destdir-sphinx gtkdoc-rebase --html-dir=docs/libudev/html --online @@ -4956,9 +5161,10 @@ doc-sync: all destdir-sphinx rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/ rsync -rlv --delete --omit-dir-times docs/html/python-systemd/ $(www_target)/python-systemd/ -.PHONY: git-tag -git-tag: - git tag "v$(VERSION)" -m "systemd $(VERSION)" +.PHONY: tango +tango: upload + cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/ + scp man/*.html tango:public/systemd-man/ .PHONY: install-tree install-tree: all @@ -5036,7 +5242,8 @@ test-libsystemd-sym.c: \ src/systemd/sd-daemon.h \ src/systemd/sd-login.h \ src/systemd/sd-bus.h \ - src/systemd/sd-utf8.h + src/systemd/sd-utf8.h \ + src/systemd/sd-resolve.h $(generate-sym-test) test-libudev-sym.c: \ @@ -5051,6 +5258,9 @@ test_libsystemd_sym_LDADD = \ test_libudev_sym_SOURCES = \ test-libudev-sym.c +test_libudev_sym_CFLAGS = \ + $(AM_CFLAGS) \ + -Wno-deprecated-declarations test_libudev_sym_LDADD = \ libudev.la