X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=e4525a4f1c90c0fc95620540d1fbe54b93b5f5bf;hp=88371a2df43837c057dcbb3f70111cc4c58face0;hb=59bc1fd776b5270bcabe3c536852afd0c892fbe1;hpb=e57e4e2be345f346bb49547ecad71dc000c406b2

diff --git a/Makefile.am b/Makefile.am
index 88371a2df..e4525a4f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -187,6 +187,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 +798,9 @@ 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/async.c \
+	src/shared/async.h
 
 nodist_libsystemd_shared_la_SOURCES = \
 	src/shared/errno-from-name.h \
@@ -1027,8 +1030,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
 
@@ -1095,7 +1096,7 @@ BUILT_SOURCES += \
 
 src/shared/errno-list.txt:
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - < /dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+[0-9]/ { print $$2; }'  > $@
+	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - < /dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }'  > $@
 
 src/shared/errno-from-name.gperf: src/shared/errno-list.txt
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -1107,7 +1108,7 @@ src/shared/errno-from-name.h: src/shared/errno-from-name.gperf
 
 src/shared/errno-to-name.h: src/shared/errno-list.txt
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
+	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
 
 src/shared/af-list.txt:
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -1176,8 +1177,12 @@ manual_tests += \
 	test-install \
 	test-watchdog \
 	test-log \
-	test-ipcrm \
+	test-ipcrm
+
+if HAVE_KMOD
+manual_tests += \
 	test-rtnl-manual
+endif
 
 tests += \
 	test-job-type \
@@ -1402,10 +1407,14 @@ test_ipcrm_LDADD = \
 test_rtnl_manual_SOURCES = \
 	src/test/test-rtnl-manual.c
 
+test_rtnl_manual_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(KMOD_CFLAGS)
+
 test_rtnl_manual_LDADD = \
 	libsystemd-internal.la \
 	libsystemd-shared.la \
-	-lkmod
+	$(KMOD_LIBS)
 
 test_ellipsize_SOURCES = \
 	src/test/test-ellipsize.c
@@ -1961,6 +1970,7 @@ systemd_cgls_SOURCES = \
 	src/cgls/cgls.c
 
 systemd_cgls_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -2107,6 +2117,8 @@ libsystemd_internal_la_SOURCES = \
 	src/libsystemd/sd-rtnl/sd-rtnl.c \
 	src/libsystemd/sd-rtnl/rtnl-internal.h \
 	src/libsystemd/sd-rtnl/rtnl-message.c \
+	src/libsystemd/sd-rtnl/rtnl-types.h \
+	src/libsystemd/sd-rtnl/rtnl-types.c \
 	src/libsystemd/sd-rtnl/rtnl-util.h \
 	src/libsystemd/sd-rtnl/rtnl-util.c \
 	src/libsystemd/sd-id128/sd-id128.c \
@@ -2132,6 +2144,9 @@ libsystemd_resolve_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	-pthread
 
+libsystemd_resolve_la_LIBADD = \
+	-lresolv
+
 noinst_LTLIBRARIES += \
 	libsystemd-internal.la \
 	libsystemd-resolve.la
@@ -2171,6 +2186,7 @@ nodist_libsystemd_la_SOURCES = \
 
 libsystemd_la_CFLAGS = \
 	$(libsystemd_internal_la_CFLAGS) \
+	$(libsystemd_resolve_la_CFLAGS) \
 	$(libsystemd_journal_internal_la_CFLAGS)
 
 libsystemd_la_LDFLAGS = \
@@ -2180,9 +2196,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)
@@ -2423,14 +2439,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) \
@@ -2503,9 +2517,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
@@ -2584,8 +2610,7 @@ noinst_LTLIBRARIES += \
 
 libudev_internal_la_SOURCES =\
 	$(libudev_la_SOURCES) \
-	src/libudev/libudev-device-private.c \
-	src/libudev/libudev-queue-private.c
+	src/libudev/libudev-device-private.c
 
 libudev_internal_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -3852,43 +3877,13 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 if ENABLE_KDBUS
-systemd_bus_driverd_SOURCES = \
-	src/bus-driverd/bus-driverd.c
-
-systemd_bus_driverd_LDADD = \
-	libsystemd-internal.la \
-	libsystemd-shared.la
-
-rootlibexec_PROGRAMS += \
-	systemd-bus-driverd
-
-nodist_systemunit_DATA += \
-	units/systemd-bus-driverd.service
-
 dist_systemunit_DATA += \
-	units/org.freedesktop.DBus.busname \
 	units/org.freedesktop.systemd1.busname
 
 BUSNAMES_TARGET_WANTS += \
-	org.freedesktop.DBus.busname \
 	org.freedesktop.systemd1.busname
-
-nodist_userunit_DATA += \
-	units/user/systemd-bus-driverd.service
-
-USER_BUSNAMES_TARGET_WANTS += \
-	org.freedesktop.DBus.busname \
-	org.freedesktop.systemd1.busname
-
-USER_UNIT_ALIASES += \
-	$(systemunitdir)/org.freedesktop.DBus.busname org.freedesktop.DBus.busname \
-	$(systemunitdir)/org.freedesktop.systemd1.busname org.freedesktop.systemd1.busname
 endif
 
-EXTRA_DIST += \
-	units/systemd-bus-driverd.service.in \
-	units/user/systemd-bus-driverd.service.in
-
 # ------------------------------------------------------------------------------
 if ENABLE_LOCALED
 systemd_localed_SOURCES = \
@@ -3960,24 +3955,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
@@ -4022,15 +4006,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 += \
@@ -4039,6 +4014,27 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-timedated.service.in
 
+# ------------------------------------------------------------------------------
+if ENABLE_TIMESYNCD
+systemd_timesyncd_SOURCES = \
+	src/timesync/timesyncd.c
+
+systemd_timesyncd_LDADD = \
+	libsystemd-label.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la \
+	-lm
+
+rootlibexec_PROGRAMS += \
+	systemd-timesyncd
+
+nodist_systemunit_DATA += \
+	units/systemd-timesyncd.service
+
+EXTRA_DIST += \
+	units/systemd-timesyncd.service.in
+endif
+
 # ------------------------------------------------------------------------------
 if HAVE_MYHOSTNAME
 libnss_myhostname_la_SOURCES = \
@@ -4054,6 +4050,10 @@ libnss_myhostname_la_LDFLAGS = \
 	-shared \
 	-shrext .so.2
 
+libnss_myhostname_la_LIBADD = \
+	libsystemd-shared.la \
+	libsystemd-internal.la
+
 lib_LTLIBRARIES += \
 	libnss_myhostname.la
 endif
@@ -4150,6 +4150,7 @@ noinst_LTLIBRARIES += \
 	libsystemd-networkd-core.la
 
 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 \
@@ -4170,20 +4171,26 @@ libsystemd_networkd_core_la_LIBADD = \
 	libsystemd-shared.la
 
 nodist_systemunit_DATA += \
-	units/systemd-networkd.service
+	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/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_SOURCES = \
-	src/network/networkd-wait-online.c
+	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-network.la
+	libsystemd-shared.la
 
 test_network_SOURCES = \
 	src/network/test-network.c
@@ -4197,7 +4204,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 \
@@ -5051,7 +5059,7 @@ hwdb-update:
 
 .PHONY: kdbus-update
 kdbus-update:
-	( cd $(top_srcdir)/src/libsystemd/ && \
+	( cd $(top_srcdir)/src/libsystemd/sd-bus/ && \
 	wget -N https://d-bus.googlecode.com/git/kdbus.h )
 
 .PHONY: git-tag
@@ -5153,7 +5161,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: \
@@ -5168,6 +5177,9 @@ test_libsystemd_sym_LDADD = \
 
 test_libudev_sym_SOURCES = \
 	test-libudev-sym.c
+test_libudev_sym_CFLAGS = \
+	$(AM_CFLAGS) \
+	-Wno-deprecated-declarations
 test_libudev_sym_LDADD = \
 	libudev.la