X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=fb43b41282f2ac1444f648720af7143134a9c483;hp=1cb771238692b272f787451d24bb017a38c506c9;hb=4e945a6f7971fd7d1f6b2c62ee3afdaff3c95ce4;hpb=7dbb1d08f66cd44b1296be3ee8e3629b989e19a8 diff --git a/Makefile.am b/Makefile.am index 1cb771238..fb43b4128 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,6 +106,8 @@ udevrulesdir=$(udevlibexecdir)/rules.d udevhwdbdir=$(udevlibexecdir)/hwdb.d catalogdir=$(prefix)/lib/systemd/catalog kernelinstalldir = $(prefix)/lib/kernel/install.d +factory_etcdir = $(prefix)/share/factory/etc +factory_pamdir = $(prefix)/share/factory/etc/pam.d # And these are the special ones for / rootprefix=@rootprefix@ @@ -350,8 +352,7 @@ bin_PROGRAMS = \ systemd-delta \ systemd-analyze \ systemd-run \ - systemd-path \ - systemd-verify + systemd-path dist_bin_SCRIPTS = \ src/kernel-install/kernel-install @@ -408,6 +409,8 @@ dist_zshcompletion_DATA = \ shell-completion/zsh/_systemd-analyze \ shell-completion/zsh/_systemd-run \ shell-completion/zsh/_sd_hosts_or_user_at_host \ + shell-completion/zsh/_sd_outputmodes \ + shell-completion/zsh/_sd_unit_files \ shell-completion/zsh/_systemd-delta \ shell-completion/zsh/_systemd @@ -1226,19 +1229,6 @@ CLEANFILES += \ # ------------------------------------------------------------------------------ -systemd_verify_SOURCES = \ - src/verify/verify.c - -systemd_verify_CFLAGS = \ - $(AM_CFLAGS) \ - $(SECCOMP_CFLAGS) - -systemd_verify_LDADD = \ - libsystemd-core.la \ - $(RT_LIBS) - -# ------------------------------------------------------------------------------ - manual_tests += \ test-ns \ test-loopback \ @@ -1298,14 +1288,36 @@ tests += \ test-ratelimit EXTRA_DIST += \ + test/a.service \ + test/basic.target \ + test/b.service \ + test/c.service \ + test/daughter.service \ + test/d.service \ + test/end.service \ + test/e.service \ + test/f.service \ + test/grandchild.service \ + test/g.service \ + test/hello-after-sleep.target \ + test/hello.service \ + test/h.service \ + test/parent-deep.slice \ + test/parent.slice \ + test/paths.target \ test/sched_idle_bad.service \ test/sched_idle_ok.service \ test/sched_rr_bad.service \ - test/sched_rr_ok.service \ test/sched_rr_change.service \ + test/sched_rr_ok.service \ + test/shutdown.target \ + test/sleep.service \ + test/sockets.target \ test/son.service \ - test/daughter.service \ - test/parent.slice + test/sysinit.target \ + test/testsuite.target \ + test/timers.target \ + test/unstoppable.service EXTRA_DIST += \ src/test/test-helper.h @@ -1503,6 +1515,7 @@ test_tables_CFLAGS = \ test_tables_LDADD = \ libsystemd-logs.la \ libsystemd-journal-internal.la \ + libsystemd-journal-core.la \ libsystemd-core.la \ libudev-core.la \ $(RT_LIBS) @@ -1738,11 +1751,19 @@ endif # ------------------------------------------------------------------------------ systemd_analyze_SOURCES = \ - src/analyze/analyze.c + src/analyze/analyze.c \ + src/analyze/analyze-verify.c \ + src/analyze/analyze-verify.h + +systemd_verify_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) systemd_analyze_LDADD = \ + libsystemd-core.la \ libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + $(RT_LIBS) # ------------------------------------------------------------------------------ systemd_initctl_SOURCES = \ @@ -1915,7 +1936,8 @@ SYSINIT_TARGET_WANTS += \ systemd-sysusers.service dist_sysusers_DATA = \ - sysusers.d/systemd.conf + sysusers.d/systemd.conf \ + sysusers.d/systemd-remote.conf nodist_sysusers_DATA = \ sysusers.d/basic.conf @@ -1931,6 +1953,14 @@ INSTALL_DIRS += \ $(sysusersdir) endif +# ------------------------------------------------------------------------------ +dist_factory_etc_DATA = \ + factory/etc/nsswitch.conf + +dist_factory_pam_DATA = \ + factory/etc/pam.d/system-auth \ + factory/etc/pam.d/other + # ------------------------------------------------------------------------------ if ENABLE_FIRSTBOOT systemd_firstboot_SOURCES = \ @@ -1955,7 +1985,6 @@ EXTRA_DIST += \ SYSINIT_TARGET_WANTS += \ systemd-firstboot.service - endif # ------------------------------------------------------------------------------ @@ -4090,9 +4119,6 @@ dist_bashcompletion_DATA += \ dist_zshcompletion_DATA += \ shell-completion/zsh/_coredumpctl -GENERAL_ALIASES += \ - $(bindir)/coredumpctl $(bindir)/systemd-coredumpctl - sysctl_DATA = \ sysctl.d/50-coredump.conf @@ -4709,23 +4735,35 @@ systemd_resolved_SOURCES = \ src/resolve/resolved.h \ src/resolve/resolved.c \ src/resolve/resolved-manager.c \ + src/resolve/resolved-conf.c \ + src/resolve/resolved-conf.h \ src/resolve/resolved-bus.c \ src/resolve/resolved-link.h \ src/resolve/resolved-link.c \ src/resolve/resolved-dns-domain.h \ src/resolve/resolved-dns-domain.c \ + src/resolve/resolved-dns-rr.h \ + src/resolve/resolved-dns-rr.c \ + src/resolve/resolved-dns-question.h \ + src/resolve/resolved-dns-question.c \ + src/resolve/resolved-dns-answer.h \ + src/resolve/resolved-dns-answer.c \ src/resolve/resolved-dns-packet.h \ src/resolve/resolved-dns-packet.c \ src/resolve/resolved-dns-query.h \ src/resolve/resolved-dns-query.c \ + src/resolve/resolved-dns-transaction.h \ + src/resolve/resolved-dns-transaction.c \ src/resolve/resolved-dns-scope.h \ src/resolve/resolved-dns-scope.c \ src/resolve/resolved-dns-server.h \ src/resolve/resolved-dns-server.c \ - src/resolve/resolved-dns-rr.h \ - src/resolve/resolved-dns-rr.c \ src/resolve/resolved-dns-cache.h \ - src/resolve/resolved-dns-cache.c + src/resolve/resolved-dns-cache.c \ + src/resolve/resolved-dns-zone.h \ + src/resolve/resolved-dns-zone.c \ + src/resolve/resolved-dns-stream.h \ + src/resolve/resolved-dns-stream.c nodist_systemd_resolved_SOURCES = \ src/resolve/resolved-gperf.c @@ -4741,7 +4779,9 @@ systemd_resolved_LDADD = \ libsystemd-network.la \ libsystemd-label.la \ libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + -lm \ + $(LIBIDN_LIBS) rootlibexec_PROGRAMS += \ systemd-resolved @@ -4792,7 +4832,8 @@ test_dns_domain_LDADD = \ libsystemd-network.la \ libsystemd-label.la \ libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + $(LIBIDN_LIBS) libnss_resolve_la_SOURCES = \ src/nss-resolve/nss-resolve.sym \ @@ -4814,6 +4855,28 @@ libnss_resolve_la_LIBADD = \ lib_LTLIBRARIES += \ libnss_resolve.la +systemd_resolve_host_SOURCES = \ + src/resolve-host/resolve-host.c \ + src/resolve/resolved-dns-packet.c \ + src/resolve/resolved-dns-packet.h \ + src/resolve/resolved-dns-rr.c \ + src/resolve/resolved-dns-rr.h \ + src/resolve/resolved-dns-answer.c \ + src/resolve/resolved-dns-answer.h \ + src/resolve/resolved-dns-question.c \ + src/resolve/resolved-dns-question.h \ + src/resolve/resolved-dns-domain.c \ + src/resolve/resolved-dns-domain.h + +systemd_resolve_host_LDADD = \ + libsystemd-internal.la \ + libsystemd-shared.la \ + -lm \ + $(LIBIDN_LIBS) + +rootlibexec_PROGRAMS += \ + systemd-resolve-host + endif # ------------------------------------------------------------------------------