chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
rename timedate-sntp to timesync
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 5d846052d80088bee77a0d97900aab4e4ab4fd43..7783882d122a78e3b7c37751dcb139901628627c 100644 (file)
--- 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 \
@@ -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
@@ -2506,9 +2515,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
@@ -2587,8 +2608,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) \
@@ -3855,41 +3875,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
-
-USER_UNIT_ALIASES += \
-       $(systemunitdir)/org.freedesktop.DBus.busname org.freedesktop.DBus.busname
 endif
 
-EXTRA_DIST += \
-       units/systemd-bus-driverd.service.in \
-       units/user/systemd-bus-driverd.service.in
-
 # ------------------------------------------------------------------------------
 if ENABLE_LOCALED
 systemd_localed_SOURCES = \
@@ -3961,24 +3953,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
@@ -4023,15 +4004,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 += \
@@ -4040,6 +4012,21 @@ 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
+
+noinst_PROGRAMS += \
+       systemd-timesyncd
+endif
+
 # ------------------------------------------------------------------------------
 if HAVE_MYHOSTNAME
 libnss_myhostname_la_SOURCES = \
@@ -4055,6 +4042,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
@@ -4151,6 +4142,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 \
@@ -4171,16 +4163,20 @@ 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-internal.la \
@@ -5169,6 +5165,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
 
Unnamed repository; edit this file 'description' to name the repository.