fsck,fstab-generator: be lenient about missing fsck.<type>

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 151c4cc22793ee84f1b045aae908be3a6bb029e7..04e8e323d53bf91b755dc557766ec837afa216e0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -646,6 +646,8 @@ test_rtnl_SOURCES = \
 
 test_rtnl_LDADD = \
        libsystemd-rtnl.la \
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
        libsystemd-shared.la
 
 tests += test-rtnl
@@ -1024,6 +1026,7 @@ libsystemd_core_la_LIBADD = \
        libsystemd-daemon-internal.la \
        libudev-internal.la \
        libsystemd-shared.la \
+       libsystemd-rtnl.la \
        $(LIBWRAP_LIBS) \
        $(PAM_LIBS) \
        $(AUDIT_LIBS) \
@@ -1730,6 +1733,10 @@ bootctl_LDADD = \
 
 bin_PROGRAMS += \
        bootctl
+
+dist_zshcompletion_DATA += \
+       shell-completion/zsh/_bootctl
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -1847,7 +1854,8 @@ systemd_nspawn_LDADD = \
        libsystemd-bus-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-rtnl.la
 
 # ------------------------------------------------------------------------------
 systemd_run_SOURCES = \
@@ -1881,6 +1889,7 @@ systemd_tty_ask_password_agent_LDADD = \
 
 # ------------------------------------------------------------------------------
 libsystemd_daemon_la_SOURCES = \
+       src/libsystemd-daemon/libsystemd-daemon.sym \
        src/libsystemd-daemon/sd-daemon.c
 
 libsystemd_daemon_internal_la_SOURCES = \
@@ -1926,11 +1935,11 @@ pkgconfiglib_DATA += \
        src/libsystemd-daemon/libsystemd-daemon.pc
 
 EXTRA_DIST += \
-       src/libsystemd-daemon/libsystemd-daemon.pc.in \
-       src/libsystemd-daemon/libsystemd-daemon.sym
+       src/libsystemd-daemon/libsystemd-daemon.pc.in
 
 # ------------------------------------------------------------------------------
 libsystemd_bus_la_SOURCES = \
+       src/libsystemd-bus/libsystemd-bus.sym \
        src/systemd/sd-bus.h \
        src/systemd/sd-bus-protocol.h \
        src/systemd/sd-bus-vtable.h \
@@ -1991,8 +2000,7 @@ pkgconfiglib_DATA += \
        src/libsystemd-bus/libsystemd-bus.pc
 
 EXTRA_DIST += \
-       src/libsystemd-bus/libsystemd-bus.pc.in \
-       src/libsystemd-bus/libsystemd-bus.sym
+       src/libsystemd-bus/libsystemd-bus.pc.in
 
 lib_LTLIBRARIES += \
        libsystemd-bus.la
@@ -2220,6 +2228,7 @@ lib_LTLIBRARIES += \
        libudev.la
 
 libudev_la_SOURCES =\
+       src/libudev/libudev.sym \
        src/libudev/libudev-private.h \
        src/libudev/libudev.c \
        src/libudev/libudev-list.c \
@@ -2249,8 +2258,7 @@ pkgconfiglib_DATA += \
        src/libudev/libudev.pc
 
 EXTRA_DIST += \
-       src/libudev/libudev.pc.in \
-       src/libudev/libudev.sym
+       src/libudev/libudev.pc.in
 
 CLEANFILES += \
        src/libudev/libudev.pc \
@@ -2802,6 +2810,7 @@ udevlibexec_PROGRAMS += \
 
 # ------------------------------------------------------------------------------
 libsystemd_id128_la_SOURCES = \
+       src/libsystemd-id128/libsystemd-id128.sym \
        src/libsystemd-id128/sd-id128.c
 
 libsystemd_id128_la_CFLAGS = \
@@ -2814,6 +2823,7 @@ libsystemd_id128_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
 
 libsystemd_id128_la_LIBADD = \
+       libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
 libsystemd_id128_internal_la_SOURCES = \
@@ -2853,8 +2863,7 @@ INSTALL_EXEC_HOOKS += libsystemd-id128-install-hook
 UNINSTALL_EXEC_HOOKS += libsystemd-id128-uninstall-hook
 
 EXTRA_DIST += \
-       src/libsystemd-id128/libsystemd-id128.pc.in \
-       src/libsystemd-id128/libsystemd-id128.sym
+       src/libsystemd-id128/libsystemd-id128.pc.in
 
 # ------------------------------------------------------------------------------
 
@@ -2984,6 +2993,7 @@ test_catalog_LDADD = \
        libsystemd-journal-core.la
 
 libsystemd_journal_la_SOURCES = \
+       src/journal/libsystemd-journal.sym \
        src/journal/sd-journal.c \
        src/systemd/sd-journal.h \
        src/systemd/_sd-common.h \
@@ -3201,7 +3211,6 @@ SYSINIT_TARGET_WANTS += \
 
 EXTRA_DIST += \
        src/journal/libsystemd-journal.pc.in \
-       src/journal/libsystemd-journal.sym \
        units/systemd-journald.service.in \
        units/systemd-journal-flush.service.in \
        src/journal/journald-gperf.gperf
@@ -3830,7 +3839,8 @@ nodist_systemd_networkd_SOURCES = \
 
 systemd_networkd_LDADD = \
        libudev-internal.la \
-       libsystemd-bus.la \
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
        libsystemd-rtnl.la \
        libsystemd-shared.la
 
@@ -3852,7 +3862,8 @@ test_network_SOURCES = \
 
 test_network_LDADD = \
        libudev-internal.la \
-       libsystemd-bus.la \
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
        libsystemd-rtnl.la \
        libsystemd-shared.la
 
@@ -4006,6 +4017,7 @@ tests += \
        test-login-shared
 
 libsystemd_login_la_SOURCES = \
+       src/login/libsystemd-login.sym \
        src/login/sd-login.c \
        src/systemd/sd-login.h \
        src/login/login-shared.c \
@@ -4141,7 +4153,6 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
        src/login/logind-gperf.gperf \
        src/login/libsystemd-login.pc.in \
-       src/login/libsystemd-login.sym \
        src/login/71-seat.rules.in \
        src/login/73-seat-late.rules.in \
        units/systemd-logind.service.in \
@@ -4667,10 +4678,11 @@ valgrind-tests: $(TESTS)
                libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=4194400 --error-exitcode=55 $(builddir)/$$f ; \
        done
 
-exported: $(lib_LTLIBRARIES)
-       $(AM_V_GEN)for f in $(lib_LTLIBRARIES:.la=.so) ; do \
-               nm -g --defined-only $(builddir)/.libs/"$$f" 2>&1 /dev/null | grep " T " | cut -d" " -f3 ; \
-       done > $@
+exported-%: %
+       $(AM_V_GEN)nm -g --defined-only $(builddir)/.libs/$(<:.la=.so) 2>&1 /dev/null | grep " T " | cut -d" " -f3 > $@
+
+exported: $(addprefix exported-, $(lib_LTLIBRARIES))
+       $(AM_V_GEN)cat $^ > $@
 
 check-api-docs: exported man
        $(AM_V_GEN)for symbol in `cat exported` ; do \
@@ -4700,16 +4712,13 @@ check-api-unused: defined undefined exported
 
 define generate-sym-test
        $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_at)echo '#include <stdio.h>' > $@
-       $(AM_V_at)for file in $(notdir $(filter %.h, $^)); do \
-               echo "#include \"$$file\""; \
-       done >> $@
-       $(AM_V_at)echo 'void* functions[] = {' >> $@
-       $(AM_V_GEN)sed -r -n 's/^( +[a-zA-Z0-9_]+);/\1,/p' $< >> $@
-       $(AM_V_at)echo '};' >> $@
-       $(AM_V_at)echo 'int main(void) {' >> $@
-       $(AM_V_at)echo ' unsigned i; for (i=0;i<sizeof(functions)/sizeof(void*);i++) printf("%p\n", functions[i]);' >> $@
-       $(AM_V_at)echo 'return 0; }' >> $@
+       $(AM_V_at)printf '#include <stdio.h>\n' > $@
+       $(AM_V_at)printf '#include "%s"\n' $(notdir $(filter %.h, $^)) >> $@
+       $(AM_V_at)printf 'void* functions[] = {\n' >> $@
+       $(AM_V_GEN)sed -r -n 's/^ +([a-zA-Z0-9_]+);/\1,/p' $< >> $@
+       $(AM_V_at)printf '};\nint main(void) {\n' >> $@
+       $(AM_V_at)printf 'unsigned i; for (i=0;i<sizeof(functions)/sizeof(void*);i++) printf("%%p\\n", functions[i]);\n' >> $@
+       $(AM_V_at)printf 'return 0; }\n' >> $@
 endef
 
 test-libsystemd-bus-sym.c: \