X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=47b864cbf9b0f2f6a4b393b7e9e9e21a9a9c1580;hb=d3822b3b074383babdbde92862abc0776bc4d97a;hp=06d4fcf233951bc12013e592c101d11cd87bd321;hpb=780896a4f1ec7e36c8f72c866ba9693d790f9741;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 06d4fcf23..47b864cbf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -665,6 +665,9 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/linux/seccomp-bpf.h \
 	src/shared/ioprio.h \
 	src/shared/missing.h \
+	src/shared/initreq.h \
+	src/shared/securebits.h \
+	src/shared/special.h \
 	src/shared/list.h \
 	src/shared/macro.h \
 	src/shared/def.h \
@@ -764,11 +767,15 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/net-util.c \
 	src/shared/net-util.h \
 	src/shared/errno-list.c \
-	src/shared/errno-list.h
+	src/shared/errno-list.h \
+	src/shared/syscall-list.c \
+	src/shared/syscall-list.h
 
 nodist_libsystemd_shared_la_SOURCES = \
 	src/shared/errno-from-name.h \
-	src/shared/errno-to-name.h
+	src/shared/errno-to-name.h \
+	src/shared/syscall-from-name.h \
+	src/shared/syscall-to-name.h
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -973,17 +980,12 @@ libsystemd_core_la_SOURCES = \
 	src/core/namespace.h \
 	src/core/tcpwrap.c \
 	src/core/tcpwrap.h \
-	src/core/securebits.h \
-	src/core/initreq.h \
-	src/core/special.h \
 	src/core/build.h \
 	src/core/sysfs-show.h \
 	src/core/switch-root.h \
 	src/core/switch-root.c \
 	src/core/killall.h \
 	src/core/killall.c \
-	src/core/syscall-list.c \
-	src/core/syscall-list.h \
 	src/core/audit-fd.c \
 	src/core/audit-fd.h \
 	src/core/async.c \
@@ -997,9 +999,7 @@ endif
 
 nodist_libsystemd_core_la_SOURCES = \
 	src/core/load-fragment-gperf.c \
-	src/core/load-fragment-gperf-nulstr.c \
-	src/core/syscall-from-name.h \
-	src/core/syscall-to-name.h
+	src/core/load-fragment-gperf-nulstr.c
 
 libsystemd_core_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -1037,30 +1037,30 @@ CLEANFILES += \
 	src/core/load-fragment-gperf.gperf \
 	src/core/load-fragment-gperf.c \
 	src/core/load-fragment-gperf-nulstr.c \
-	src/core/syscall-list.txt \
-	src/core/syscall-from-name.gperf \
+	src/shared/syscall-list.txt \
+	src/shared/syscall-from-name.gperf \
 	src/shared/errno-list.txt \
 	src/shared/errno-from-name.gperf
 
 BUILT_SOURCES += \
-	src/core/syscall-from-name.h \
-	src/core/syscall-to-name.h \
+	src/shared/syscall-from-name.h \
+	src/shared/syscall-to-name.h \
 	src/shared/errno-from-name.h \
 	src/shared/errno-to-name.h
 
-src/core/syscall-list.txt: Makefile
+src/shared/syscall-list.txt: Makefile
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9(]/ { sub(/__NR_/, "", $$2); if ($$2 !~ /SYSCALL_BASE/) print $$2; }' > $@
 
-src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile
+src/shared/syscall-from-name.gperf: src/shared/syscall-list.txt Makefile
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@
 
-src/core/syscall-from-name.h: src/core/syscall-from-name.gperf Makefile
+src/shared/syscall-from-name.h: src/shared/syscall-from-name.gperf Makefile
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_syscall -H hash_syscall_name -p -C < $< > $@
 
-src/core/syscall-to-name.h: src/core/syscall-list.txt Makefile
+src/shared/syscall-to-name.h: src/shared/syscall-list.txt Makefile
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const syscall_names[] = { "} { printf "[SYSCALL_TO_INDEX(__NR_%s)] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
 
@@ -1161,7 +1161,10 @@ EXTRA_DIST += \
 	test/sched_idle_ok.service \
 	test/sched_rr_bad.service \
 	test/sched_rr_ok.service \
-	test/sched_rr_change.service
+	test/sched_rr_change.service \
+	test/son.service \
+	test/daughter.service \
+	test/parent.slice
 
 EXTRA_DIST += \
 	src/test/test-helper.h
@@ -2958,6 +2961,12 @@ test_journal_stream_SOURCES = \
 test_journal_stream_LDADD = \
 	libsystemd-journal-core.la
 
+test_journal_flush_SOURCES = \
+	src/journal/test-journal-flush.c
+
+test_journal_flush_LDADD = \
+	libsystemd-journal-core.la
+
 test_journal_init_SOURCES = \
 	src/journal/test-journal-init.c
 
@@ -3164,6 +3173,7 @@ tests += \
 	test-journal-init \
 	test-journal-verify \
 	test-journal-interleaving \
+	test-journal-flush \
 	test-mmap-cache \
 	test-catalog
 
@@ -3202,6 +3212,7 @@ pkgconfiglib_DATA += \
 
 dist_catalog_DATA = \
 	catalog/systemd-fr.catalog \
+	catalog/systemd-ru.catalog \
 	catalog/systemd.catalog
 
 SOCKETS_TARGET_WANTS += \
@@ -3830,6 +3841,7 @@ systemd_networkd_SOURCES = \
 	src/network/networkd.h \
 	src/network/networkd.c \
 	src/network/networkd-link.c \
+	src/network/networkd-bridge.c \
 	src/network/networkd-network.c \
 	src/network/networkd-address.c \
 	src/network/networkd-route.c \
@@ -3840,6 +3852,7 @@ nodist_systemd_networkd_SOURCES = \
 
 systemd_networkd_LDADD = \
 	libudev-internal.la \
+	libsystemd-daemon-internal.la \
 	libsystemd-bus-internal.la \
 	libsystemd-id128-internal.la \
 	libsystemd-rtnl.la \
@@ -3855,6 +3868,7 @@ test_network_SOURCES = \
 	src/network/test-network.c \
 	src/network/networkd.h \
 	src/network/networkd-link.c \
+	src/network/networkd-bridge.c \
 	src/network/networkd-network.c \
 	src/network/networkd-address.c \
 	src/network/networkd-route.c \