X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=6379262ca3ca58b843098408318f11d8b61f46af;hb=f27e2d8c0c0c18d5a1be62c87ea89fcd4894fffa;hp=7783882d122a78e3b7c37751dcb139901628627c;hpb=687ed1237b20a6db174fd0b372df20fa9a3a23c2;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 7783882d1..6379262ca 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 = @@ -798,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 \ @@ -1028,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 @@ -1196,6 +1200,7 @@ tests += \ test-utf8 \ test-ellipsize \ test-util \ + test-ring \ test-tmpfiles \ test-namespace \ test-date \ @@ -1323,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 @@ -2108,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 \ @@ -2144,6 +2157,9 @@ libsystemd_resolve_la_CFLAGS = \ $(AM_CFLAGS) \ -pthread +libsystemd_resolve_la_LIBADD = \ + -lresolv + noinst_LTLIBRARIES += \ libsystemd-internal.la \ libsystemd-resolve.la @@ -2183,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 = \ @@ -2192,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) @@ -2435,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) \ @@ -3667,6 +3682,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 += \ @@ -4015,16 +4043,47 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ if ENABLE_TIMESYNCD systemd_timesyncd_SOURCES = \ - src/timesync/timesyncd.c + 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 -noinst_PROGRAMS += \ +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 # ------------------------------------------------------------------------------ @@ -4136,7 +4195,8 @@ systemd_networkd_SOURCES = \ src/network/networkd.c systemd_networkd_LDADD = \ - libsystemd-networkd-core.la + libsystemd-networkd-core.la \ + -lkmod noinst_LTLIBRARIES += \ libsystemd-networkd-core.la @@ -4146,6 +4206,7 @@ libsystemd_networkd_core_la_SOURCES = \ 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 \ @@ -4179,14 +4240,18 @@ systemd_networkd_wait_online_SOURCES = \ 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 = \ src/network/test-network.c test_network_LDADD = \ - libsystemd-networkd-core.la + libsystemd-networkd-core.la \ + -lkmod tests += \ test-network @@ -4194,7 +4259,8 @@ tests += \ EXTRA_DIST += \ src/network/networkd-network-gperf.gperf \ src/network/networkd-netdev-gperf.gperf \ - units/systemd-networkd.service.in + units/systemd-networkd.service.in \ + units/systemd-networkd-wait-online.service.in CLEANFILES += \ src/network/networkd-network-gperf.c \ @@ -4751,7 +4817,8 @@ 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)|' SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ @@ -4779,6 +4846,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 $@ @@ -5150,7 +5220,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: \