mount: don't creat local-fs.target links for mount units when runnin in user mode

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e1a73616525578a48662c0a52d5d6284c6b576cd..aed8c326a7041d408aba556e32524ccd329d986e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
 
@@ -489,7 +490,7 @@ EXTRA_DIST += \
        units/user/systemd-exit.service.in \
        units/systemd-fsck@.service.in \
        units/systemd-fsck-root.service.in \
-       units/user@.service.in \
+       units/user@.service.m4.in \
        units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service \
@@ -508,7 +509,8 @@ CLEANFILES += \
        units/console-shell.service.m4 \
        units/console-getty.service.m4 \
        units/container-getty@.service.m4 \
-       units/rescue.service.m4
+       units/rescue.service.m4 \
+       units/user@.service.m4
 
 if HAVE_SYSV_COMPAT
 nodist_systemunit_DATA += \
@@ -757,8 +759,6 @@ libsystemd_shared_la_SOURCES = \
        src/shared/output-mode.h \
        src/shared/MurmurHash2.c \
        src/shared/MurmurHash2.h \
-       src/shared/MurmurHash3.c \
-       src/shared/MurmurHash3.h \
        src/shared/acpi-fpdt.h \
        src/shared/acpi-fpdt.c \
        src/shared/boot-timestamps.h \
@@ -780,7 +780,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/syscall-list.c \
        src/shared/syscall-list.h \
        src/shared/audit.c \
-       src/shared/audit.h
+       src/shared/audit.h \
+       src/shared/xml.c \
+       src/shared/xml.h
 
 nodist_libsystemd_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
@@ -1157,7 +1159,8 @@ tests += \
        test-hashmap \
        test-list \
        test-tables \
-       test-device-nodes
+       test-device-nodes \
+       test-xml
 
 EXTRA_DIST += \
        test/sched_idle_bad.service \
@@ -1259,6 +1262,12 @@ test_hashmap_SOURCES = \
 test_hashmap_LDADD = \
        libsystemd-core.la
 
+test_xml_SOURCES = \
+       src/test/test-xml.c
+
+test_xml_LDADD = \
+       libsystemd-shared.la
+
 test_list_SOURCES = \
        src/test/test-list.c
 
@@ -1586,6 +1595,7 @@ nodist_systemunit_DATA += \
 
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
+       tmpfiles.d/systemd-nologin.conf \
        tmpfiles.d/tmp.conf \
        tmpfiles.d/x11.conf
 
@@ -1895,7 +1905,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
@@ -3917,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 \
@@ -3936,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 \
@@ -4045,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 += \
@@ -4070,6 +4083,7 @@ test_network_LDADD = \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libsystemd-rtnl.la \
+       libsystemd-dhcp.la \
        libsystemd-shared.la
 
 tests += \
@@ -4613,11 +4627,11 @@ src/%: src/%.m4
        $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
 
 units/%: units/%.m4
-       $(AM_V_M4)$(MKDIR_P) $(dir $@)
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
 
 units/user/%: units/%.m4
-       $(AM_V_M4)$(MKDIR_P) $(dir $@)
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
 
 if ENABLE_POLKIT
@@ -4889,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-%: %
@@ -5014,4 +5031,4 @@ tests += \
        test-libudev-sym
 
 cppcheck:
-       cppcheck --enable=all $(top_srcdir)
+       cppcheck --enable=all -q $(top_srcdir)