X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=9a3913b9c1ea212676abd9f65aa404c26f07ccfc;hb=0f05c387597a93fa74cdf7d351fd255aca56026d;hp=55ed54d941f356ed6f33f257cc0515773d5f6d90;hpb=2c12a402cb1e8277c271ced8dc9c06d20b8f6017;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 55ed54d94..9a3913b9c 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@
@@ -1286,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
@@ -1491,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)
@@ -1927,6 +1952,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 = \
@@ -1951,7 +1984,6 @@ EXTRA_DIST += \
 
 SYSINIT_TARGET_WANTS += \
 	systemd-firstboot.service
-
 endif
 
 # ------------------------------------------------------------------------------
@@ -4086,9 +4118,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
 
@@ -4710,6 +4739,12 @@ systemd_resolved_SOURCES = \
 	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 \
@@ -4718,10 +4753,12 @@ systemd_resolved_SOURCES = \
 	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