X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=72da6677164d9edc92d8bc762eeb593379d3b4b6;hb=c4e6e24255de376965c7f8ae53e16594c2581200;hp=0d7ffc667a13defa93df714ea6bee16464bcd7d2;hpb=c813ca40c859ff8abc8bc6aabc3f1e896623eb67;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 0d7ffc667..72da66771 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -190,7 +190,6 @@ AM_CPPFLAGS = \
 	-I $(top_srcdir)/src/udev/net \
 	-I $(top_builddir)/src/udev \
 	-I $(top_srcdir)/src/libsystemd \
-	-I $(top_srcdir)/src/libsystemd-rtnl \
 	$(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
@@ -640,60 +639,6 @@ EXTRA_DIST += \
 	make-directive-index.py \
 	xml_helper.py
 
-# ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
-	libsystemd-rtnl.la
-
-libsystemd_rtnl_la_SOURCES = \
-	src/systemd/sd-rtnl.h \
-	src/libsystemd-rtnl/sd-rtnl.c \
-	src/libsystemd-rtnl/rtnl-internal.h \
-	src/libsystemd-rtnl/rtnl-message.c \
-	src/libsystemd-rtnl/rtnl-util.h \
-	src/libsystemd-rtnl/rtnl-util.c
-
-test_rtnl_SOURCES = \
-	src/libsystemd-rtnl/test-rtnl.c
-
-test_rtnl_LDADD = \
-	libsystemd-rtnl.la \
-	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
-	libsystemd-id128-internal.la \
-	libsystemd-shared.la
-
-tests += \
-	test-rtnl
-
-# ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
-	libsystemd-dns.la
-
-libsystemd_dns_la_SOURCES = \
-	src/systemd/sd-dns.h \
-	src/libsystemd/sd-dns.c \
-	src/libsystemd/dns-util.h
-
-libsystemd_dns_la_LIBADD = \
-	libsystemd-shared.la
-
-libsystemd_dns_la_CFLAGS = \
-	-pthread
-
-test_dns_SOURCES = \
-	src/libsystemd/test-dns.c \
-	src/systemd/sd-dns.h
-
-test_dns_LDADD = \
-	libsystemd-dns.la
-
-test_dns_LDFLAGS = \
-	-lresolv \
-	-pthread
-
-tests += \
-	 test-dns
-
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
 	libsystemd-shared.la
@@ -1056,7 +1001,6 @@ libsystemd_core_la_LIBADD = \
 	libsystemd-daemon-internal.la \
 	libudev-internal.la \
 	libsystemd-shared.la \
-	libsystemd-rtnl.la \
 	libsystemd-internal.la \
 	$(LIBWRAP_LIBS) \
 	$(PAM_LIBS) \
@@ -1921,8 +1865,7 @@ systemd_nspawn_LDADD = \
 	libsystemd-internal.la \
 	libsystemd-id128-internal.la \
 	libsystemd-daemon-internal.la \
-	libsystemd-shared.la \
-	libsystemd-rtnl.la
+	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_run_SOURCES = \
@@ -2038,6 +1981,8 @@ libsystemd_la_SOURCES = \
 	src/systemd/sd-utf8.h \
 	src/systemd/sd-event.h \
 	src/systemd/sd-dhcp-client.h \
+	src/systemd/sd-rtnl.h \
+	src/systemd/sd-resolve.h \
 	src/libsystemd/sd-bus.c \
 	src/libsystemd/bus-control.c \
 	src/libsystemd/bus-control.h \
@@ -2082,7 +2027,14 @@ libsystemd_la_SOURCES = \
 	src/libsystemd/dhcp-network.c \
 	src/libsystemd/dhcp-option.c \
 	src/libsystemd/dhcp-internal.h \
-	src/libsystemd/dhcp-protocol.h
+	src/libsystemd/dhcp-protocol.h \
+	src/libsystemd/sd-rtnl.c \
+	src/libsystemd/rtnl-internal.h \
+	src/libsystemd/rtnl-message.c \
+	src/libsystemd/rtnl-util.h \
+	src/libsystemd/rtnl-util.c \
+	src/libsystemd/sd-resolve.c \
+	src/libsystemd/resolve-util.h
 
 nodist_libsystemd_la_SOURCES = \
 	src/libsystemd/bus-error-mapping.c
@@ -2094,7 +2046,8 @@ libsystemd_la_LIBADD = \
 
 libsystemd_la_CFLAGS = \
 	$(AM_CFLAGS) \
-	-pthread
+	-pthread \
+	-lresolv
 
 libsystemd_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
@@ -2143,6 +2096,7 @@ tests += \
 	test-bus-marshal \
 	test-bus-signature \
 	test-bus-chat \
+	test-bus-cleanup \
 	test-bus-server \
 	test-bus-match \
 	test-bus-kernel \
@@ -2157,7 +2111,9 @@ tests += \
 	test-bus-gvariant \
 	test-event \
 	test-dhcp-option \
-	test-dhcp-client
+	test-dhcp-client \
+	test-rtnl \
+	test-resolve
 
 bin_PROGRAMS += \
 	busctl
@@ -2202,6 +2158,15 @@ test_bus_chat_LDADD = \
 	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
+test_bus_cleanup_SOURCES = \
+	src/libsystemd/test-bus-cleanup.c
+
+test_bus_cleanup_LDADD = \
+	libsystemd-internal.la \
+	libsystemd-id128-internal.la \
+	libsystemd-daemon-internal.la \
+	libsystemd-shared.la
+
 test_bus_server_SOURCES = \
 	src/libsystemd/test-bus-server.c
 
@@ -2373,6 +2338,27 @@ test_dhcp_client_LDADD = \
 	libsystemd-id128-internal.la \
 	libsystemd-shared.la
 
+test_rtnl_SOURCES = \
+	src/libsystemd/test-rtnl.c
+
+test_rtnl_LDADD = \
+	libsystemd-internal.la \
+	libsystemd-daemon-internal.la \
+	libsystemd-id128-internal.la \
+	libsystemd-shared.la
+
+test_resolve_SOURCES = \
+	src/systemd/sd-resolve.h \
+	src/libsystemd/test-resolve.c
+
+test_resolve_LDADD = \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
+test_resolve_CFLAGS = \
+	$(AM_CFLAGS) \
+	-pthread
+
 busctl_SOURCES = \
 	src/libsystemd/busctl.c
 
@@ -2613,7 +2599,7 @@ libudev_core_la_LIBADD = \
 	libudev-internal.la \
 	libsystemd-label.la \
 	libsystemd-daemon-internal.la \
-	libsystemd-rtnl.la \
+	libsystemd-internal.la \
 	libsystemd-id128-internal.la \
 	libsystemd-shared.la \
 	$(BLKID_LIBS) \
@@ -4092,7 +4078,6 @@ systemd_networkd_LDADD = \
 	libsystemd-daemon-internal.la \
 	libsystemd-internal.la \
 	libsystemd-id128-internal.la \
-	libsystemd-rtnl.la \
 	libsystemd-label.la \
 	libsystemd-shared.la
 
@@ -4118,7 +4103,6 @@ test_network_LDADD = \
 	libsystemd-internal.la \
 	libsystemd-id128-internal.la \
 	libsystemd-daemon-internal.la \
-	libsystemd-rtnl.la \
 	libsystemd-label.la \
 	libsystemd-shared.la
 
@@ -4942,7 +4926,7 @@ valgrind-tests: $(TESTS)
 		if file $$f | grep -q shell; then \
 		echo -e "$${x}Skipping non-binary $$f"; else \
 		echo -e "$${x}Running $$f"; \
-	        libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=4194400 --error-exitcode=55 $(builddir)/$$f ; fi; \
+	        libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
 		x="\n\n"; \
 	done