X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=86a8f0b7bc45757b9ed21b178c52f349dbd96306;hp=ac650044ba2e2f15dbb411e7667201e3be6188ce;hb=2f14583f4757b934639da164a9fc20ab5da72f00;hpb=5590bbe52985f9f01dbafa740df9c74f2ea95ffa

diff --git a/Makefile.am b/Makefile.am
index ac650044b..86a8f0b7b 100644
--- 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 \
@@ -2531,6 +2532,7 @@ test_dhcp_client_SOURCES = \
 
 test_dhcp_client_LDADD = \
 	libsystemd-network.la \
+	libudev-internal.la \
 	libsystemd-label.la \
 	libsystemd-internal.la \
 	libsystemd-shared.la
@@ -4062,12 +4064,13 @@ CLEANFILES += \
 	src/timesync/timesyncd-gperf.c
 
 systemd_timesyncd_LDADD = \
-	libsystemd-label.la \
-	libsystemd-internal.la \
-	libsystemd-shared.la \
 	libsystemd-resolve.la \
 	libsystemd-network.la \
+	libudev-internal.la \
+	libsystemd-label.la \
 	libsystemd-capability.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la \
 	-lm
 
 rootlibexec_PROGRAMS += \
@@ -4214,10 +4217,11 @@ CLEANFILES += \
 	src/resolve/resolved-gperf.c
 
 systemd_resolved_LDADD = \
+	libsystemd-network.la \
+	libudev-internal.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)