X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=f6c195b26306bf90c9f42830a86dda26ed8ca696;hp=7f3924ff5558109a65b7d9fa8431d835aae3ac96;hb=2dcf7ec6ec0c28297311108acba119cd6e055e64;hpb=cef8b0735831b2bfeaf21d8a245d8024c3de816a diff --git a/Makefile.am b/Makefile.am index 7f3924ff5..f6c195b26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 = @@ -187,6 +189,7 @@ AM_CPPFLAGS = \ -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 \ @@ -797,7 +800,11 @@ libsystemd_shared_la_SOURCES = \ src/shared/clean-ipc.h \ src/shared/clean-ipc.c \ src/shared/login-shared.c \ - src/shared/login-shared.h + 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 \ @@ -1027,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 @@ -1195,6 +1200,7 @@ tests += \ test-utf8 \ test-ellipsize \ test-util \ + test-ring \ test-tmpfiles \ test-namespace \ test-date \ @@ -1322,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 @@ -2107,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 \ @@ -2143,6 +2157,9 @@ libsystemd_resolve_la_CFLAGS = \ $(AM_CFLAGS) \ -pthread +libsystemd_resolve_la_LIBADD = \ + -lresolv + noinst_LTLIBRARIES += \ libsystemd-internal.la \ libsystemd-resolve.la @@ -2182,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 = \ @@ -2191,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) @@ -2434,14 +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-internal.la \ libsystemd-resolve.la \ - libsystemd-shared.la \ - -lresolv + libsystemd-internal.la \ + libsystemd-shared.la test_resolve_CFLAGS = \ $(AM_CFLAGS) \ @@ -2465,6 +2481,10 @@ 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 \ @@ -2490,7 +2510,8 @@ libsystemd_network_la_SOURCES = \ 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 \ @@ -2514,9 +2535,21 @@ test_dhcp_client_LDADD = \ 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 @@ -3654,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 += \ @@ -3940,24 +3986,13 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ if ENABLE_TIMEDATED -libsystemd_timedated_core_la_SOURCES = \ - src/timedate/timedate-sntp.c \ - src/timedate/timedate-sntp.h - -libsystemd_timedated_core_la_LIBADD = \ - libsystemd-label.la \ - libsystemd-internal.la \ - libsystemd-shared.la \ - -lm - -noinst_LTLIBRARIES += \ - libsystemd-timedated-core.la - systemd_timedated_SOURCES = \ src/timedate/timedated.c systemd_timedated_LDADD = \ - libsystemd-timedated-core.la + libsystemd-label.la \ + libsystemd-internal.la \ + libsystemd-shared.la rootlibexec_PROGRAMS += \ systemd-timedated @@ -4002,15 +4037,6 @@ dist_bashcompletion_DATA += \ dist_zshcompletion_DATA += \ shell-completion/zsh/_timedatectl - -test_timedate_sntp_SOURCES = \ - src/timedate/test-timedate-sntp.c - -test_timedate_sntp_LDADD = \ - libsystemd-timedated-core.la - -manual_tests += \ - test-timedate-sntp endif polkitpolicy_in_files += \ @@ -4019,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 = \ @@ -4128,16 +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 \ @@ -4145,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 \ @@ -4154,24 +4233,23 @@ 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) + systemd_networkd_wait_online_SOURCES = \ 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 = \ @@ -4179,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 # ------------------------------------------------------------------------------ @@ -4743,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 $@) && \ @@ -4771,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 $@ @@ -5142,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: \