chiark / gitweb /
keymap: Recognize different Toshiba Satellite capitalizations
[elogind.git] / Makefile.am
index 8e5f5110e45d956ee71120090f2bfd6e91410aed..aed8c326a7041d408aba556e32524ccd329d986e 100644 (file)
@@ -460,6 +460,7 @@ nodist_systemunit_DATA = \
        units/systemd-nspawn@.service
 
 dist_userunit_DATA = \
+       units/user/basic.target \
        units/user/default.target \
        units/user/exit.target
 
@@ -3926,8 +3927,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 +3946,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 +4057,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 +4083,7 @@ test_network_LDADD = \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-rtnl.la \
+       libsystemd-dhcp.la \
        libsystemd-shared.la
 
 tests += \
@@ -4898,8 +4903,11 @@ 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"; \
-               libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=4194400 --error-exitcode=55 $(builddir)/$$f ; \
+               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; \
+               x="\n\n"; \
        done
 
 exported-%: %