X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=44b69171a412e8a4da3a3eb58bf975e785221ee2;hb=4ebe732c0cdcd9431a5095140bc4189f86508725;hp=8e5f5110e45d956ee71120090f2bfd6e91410aed;hpb=8f8770706e360d7bf60bb6384743b7c7e5974aac;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 8e5f5110e..44b69171a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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-%: %