networkd: add DHCPv4 support

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bc6fa1a47648e1a1e9775838925087f0f094f76c..44b69171a412e8a4da3a3eb58bf975e785221ee2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1904,7 +1904,7 @@ systemd_bus_proxyd_LDADD = \
        libsystemd-shared.la
 
 bus-proxyd-install-hook:
-       $(AM_V_LN)$(LN_S) -f ../../lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
+       $(AM_V_LN)$(LN_S) -f ../lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
 
 bus-proxyd-uninstall-hook:
        rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
@@ -3926,8 +3926,8 @@ noinst_LTLIBRARIES += \
        libsystemd-dhcp.la
 
 libsystemd_dhcp_la_LIBADD = \
-       libsystemd-shared.la \
-       libsystemd-bus.la
+       libsystemd-bus-internal.la \
+       libsystemd-shared.la
 
 test_dhcp_option_SOURCES = \
        src/libsystemd-dhcp/dhcp-protocol.h \
@@ -3945,9 +3945,11 @@ test_dhcp_client_SOURCES = \
        src/libsystemd-dhcp/test-dhcp-client.c
 
 test_dhcp_client_LDADD = \
+       libsystemd-bus-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-id128-internal.la \
        libsystemd-dhcp.la \
-       libsystemd-shared.la \
-       libsystemd-bus.la
+       libsystemd-shared.la
 
 tests += \
        test-dhcp-option \
@@ -4054,6 +4056,7 @@ systemd_networkd_LDADD = \
        libsystemd-bus-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-rtnl.la \
+       libsystemd-dhcp.la \
        libsystemd-shared.la
 
 nodist_systemunit_DATA += \
@@ -4079,6 +4082,7 @@ test_network_LDADD = \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-rtnl.la \
+       libsystemd-dhcp.la \
        libsystemd-shared.la
 
 tests += \
@@ -4898,8 +4902,9 @@ install-tree: all
 # exclude the one perl script we have in there
 valgrind-tests: $(TESTS)
        $(AM_V_GEN)for f in $(filter-out %.pl, $^); do \
-               echo "Running $$f"; \
+               echo -e "$${x}Running $$f"; \
                libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=4194400 --error-exitcode=55 $(builddir)/$$f ; \
+               x="\n\n"; \
        done
 
 exported-%: %