nspawn: make nspawn robust to container failure

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ac650044ba2e2f15dbb411e7667201e3be6188ce..4b60735515dacaaf1b45b6c68fbbd520b794fe03 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -190,6 +190,7 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/journal \
        -I $(top_srcdir)/src/timedate \
        -I $(top_srcdir)/src/timesync \
+       -I $(top_srcdir)/src/resolve \
        -I $(top_srcdir)/src/systemd \
        -I $(top_builddir)/src/core \
        -I $(top_srcdir)/src/core \
@@ -757,8 +758,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/replace-var.h \
        src/shared/spawn-polkit-agent.c \
        src/shared/spawn-polkit-agent.h \
-       src/shared/hwclock.c \
-       src/shared/hwclock.h \
+       src/shared/clock-util.c \
+       src/shared/clock-util.h \
        src/shared/time-dst.c \
        src/shared/time-dst.h \
        src/shared/calendarspec.c \
@@ -804,7 +805,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/ring.c \
        src/shared/ring.h \
        src/shared/async.c \
-       src/shared/async.h
+       src/shared/async.h \
+       src/shared/eventfd-util.c \
+       src/shared/eventfd-util.h
 
 nodist_libsystemd_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
@@ -2508,6 +2511,7 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/network-internal.h
 
 libsystemd_network_la_LIBADD = \
+       libudev-internal.la \
        libsystemd-label.la \
        libsystemd-internal.la \
        libsystemd-shared.la \
@@ -4062,12 +4066,12 @@ CLEANFILES += \
        src/timesync/timesyncd-gperf.c
 
 systemd_timesyncd_LDADD = \
-       libsystemd-label.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
        libsystemd-resolve.la \
        libsystemd-network.la \
+       libsystemd-label.la \
        libsystemd-capability.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la \
        -lm
 
 rootlibexec_PROGRAMS += \
@@ -4214,10 +4218,10 @@ CLEANFILES += \
        src/resolve/resolved-gperf.c
 
 systemd_resolved_LDADD = \
+       libsystemd-network.la \
        libsystemd-label.la \
        libsystemd-internal.la \
-       libsystemd-shared.la \
-       libsystemd-network.la
+       libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
        systemd-resolved
@@ -4299,8 +4303,7 @@ systemd_networkd_wait_online_LDADD = \
        libsystemd-network.la \
        libudev-internal.la \
        libsystemd-internal.la \
-       libsystemd-shared.la \
-       libsystemd-network.la
+       libsystemd-shared.la
 
 test_network_SOURCES = \
        src/network/test-network.c
@@ -5321,60 +5324,6 @@ tests += \
        test-libsystemd-sym \
        test-libudev-sym
 
-if ENABLE_COMPAT_LIBS
-test-libsystemd-daemon-sym.c: \
-               src/compat-libs/libsystemd-daemon.sym \
-               src/systemd/sd-daemon.h
-       $(generate-sym-test)
-
-test-libsystemd-id128-sym.c: \
-               src/compat-libs/libsystemd-id128.sym \
-               src/systemd/sd-id128.h
-       $(generate-sym-test)
-
-test-libsystemd-journal-sym.c: \
-               src/compat-libs/libsystemd-journal.sym \
-               src/systemd/sd-journal.h
-       $(generate-sym-test)
-
-test-libsystemd-login-sym.c: \
-               src/compat-libs/libsystemd-login.sym \
-               src/systemd/sd-login.h
-       $(generate-sym-test)
-
-test_libsystemd_daemon_sym_SOURCES = \
-       test-libsystemd-daemon-sym.c
-test_libsystemd_daemon_sym_LDADD = \
-       libsystemd-daemon.la
-
-test_libsystemd_id128_sym_SOURCES = \
-       test-libsystemd-id128-sym.c
-test_libsystemd_id128_sym_LDADD = \
-       libsystemd-id128.la
-
-test_libsystemd_journal_sym_SOURCES = \
-       test-libsystemd-journal-sym.c
-test_libsystemd_journal_sym_LDADD = \
-       libsystemd-journal.la
-
-test_libsystemd_login_sym_SOURCES = \
-       test-libsystemd-login-sym.c
-test_libsystemd_login_sym_LDADD = \
-       libsystemd-login.la
-
-BUILT_SOURCES += \
-       $(test_libsystemd_journal_sym_SOURCES) \
-       $(test_libsystemd_login_sym_SOURCES) \
-       $(test_libsystemd_id128_sym_SOURCES) \
-       $(test_libsystemd_daemon_sym_SOURCES)
-
-tests += \
-       test-libsystemd-journal-sym \
-       test-libsystemd-login-sym \
-       test-libsystemd-id128-sym \
-       test-libsystemd-daemon-sym
-endif
-
 .PHONY: cppcheck
 cppcheck:
        cppcheck --enable=all -q $(top_srcdir)