X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=04e8e323d53bf91b755dc557766ec837afa216e0;hp=ae927af907a5816c24cc10e442c20d48927d9128;hb=94192cdaf652c9717f15274504ed315126c07a93;hpb=39da205fbb31851ce67442fc8c7c809a6a9344f5 diff --git a/Makefile.am b/Makefile.am index ae927af90..04e8e323d 100644 --- 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 @@ -2006,6 +2014,17 @@ libsystemd_bus_internal_la_CFLAGS = \ noinst_LTLIBRARIES += \ libsystemd-bus-internal.la +libsystemd_bus_dump_la_SOURCES = \ + src/libsystemd-bus/bus-dump.c \ + src/libsystemd-bus/bus-dump.h + +libsystemd_bus_dump_la_CFLAGS = \ + $(AM_CFLAGS) + $(CAP_CFLAGS) + +noinst_LTLIBRARIES += \ + libsystemd-bus-dump.la + tests += \ test-bus-marshal \ test-bus-signature \ @@ -2032,13 +2051,17 @@ test_bus_marshal_LDADD = \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ + libsystemd-bus-dump.la \ + libsystemd-capability.la \ $(GLIB_LIBS) \ - $(DBUS_LIBS) + $(DBUS_LIBS) \ + $(CAP_LIBS) test_bus_marshal_CFLAGS = \ $(AM_CFLAGS) \ $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) + $(DBUS_CFLAGS) \ + $(CAP_CFLAGS) test_bus_signature_SOURCES = \ src/libsystemd-bus/test-bus-signature.c @@ -2078,13 +2101,17 @@ test_bus_objects_SOURCES = \ test_bus_objects_CFLAGS = \ $(AM_CFLAGS) \ + $(CAP_CFLAGS) \ -pthread test_bus_objects_LDADD = \ libsystemd-bus-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-bus-dump.la \ + libsystemd-capability.la \ + $(CAP_LIBS) test_bus_match_SOURCES = \ src/libsystemd-bus/test-bus-match.c @@ -2102,7 +2129,14 @@ test_bus_kernel_LDADD = \ libsystemd-bus-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-bus-dump.la \ + libsystemd-capability.la \ + $(CAP_LIBS) + +test_bus_kernel_CFLAGS = \ + $(AM_CFLAGS) \ + $(CAP_CFLAGS) test_bus_kernel_bloom_SOURCES = \ src/libsystemd-bus/test-bus-kernel-bloom.c @@ -2136,7 +2170,14 @@ test_bus_zero_copy_LDADD = \ libsystemd-bus-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-bus-dump.la \ + libsystemd-capability.la \ + $(CAP_LIBS) + +test_bus_zero_copy_CFLAGS = \ + $(AM_CFLAGS) \ + $(CAP_CFLAGS) test_bus_introspect_SOURCES = \ src/libsystemd-bus/test-bus-introspect.c @@ -2161,7 +2202,14 @@ busctl_LDADD = \ libsystemd-bus-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-bus-dump.la \ + libsystemd-capability.la \ + $(CAP_LIBS) + +busctl_CFLAGS = \ + $(AM_CFLAGS) \ + $(CAP_CFLAGS) # ------------------------------------------------------------------------------ if ENABLE_GTK_DOC @@ -2180,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 \ @@ -2209,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 \ @@ -2762,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 = \ @@ -2774,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 = \ @@ -2813,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 # ------------------------------------------------------------------------------ @@ -2944,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 \ @@ -3161,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 @@ -3772,6 +3821,7 @@ EXTRA_DIST += \ endif # ------------------------------------------------------------------------------ +if ENABLE_NETWORKD rootlibexec_PROGRAMS += \ systemd-networkd @@ -3789,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 @@ -3811,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 @@ -3823,6 +3875,7 @@ EXTRA_DIST += \ CLEANFILES += \ src/network/networkd-gperf.c +endif # ------------------------------------------------------------------------------ if ENABLE_LOGIND @@ -3964,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 \ @@ -4099,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 \ @@ -4620,18 +4673,25 @@ install-tree: all # Let's run all tests of the test suite, but under valgrind. Let's # exclude the one perl script we have in there valgrind-tests: $(TESTS) - for f in $(TESTS) ; do \ - [ "$$f" == "$${f/.pl/}" ] && libtool --mode=execute valgrind --leak-check=full --error-exitcode=55 $(builddir)/$$f ; \ + $(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 ; \ done -check-api-docs: $(lib_LTLIBRARIES) man - for symbol in `for f in $(lib_LTLIBRARIES) ; do nm -g --defined-only $(builddir)/.libs/"$${f/.la/.so}" 2>&1 /dev/null | grep " T " | cut -d" " -f3 ; done` ; do \ +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 \ if test -f $(builddir)/man/$$symbol.html ; then \ echo " Symbol $$symbol() is documented." ; \ else \ echo "‣ Symbol $$symbol() lacks documentation." ; \ fi ; \ - done + done OBJECT_VARIABLES:=$(filter %_OBJECTS,$(.VARIABLES)) ALL_OBJECTS:=$(foreach v,$(OBJECT_VARIABLES),$($(v))) @@ -4645,5 +4705,101 @@ CLEANFILES += \ defined \ undefined -check-api-unused: defined undefined - diff -u undefined defined | grep ^+ | grep -v ^+++ | cut -c2- +check-api-unused: defined undefined exported + ( cat exported undefined ) | sort -u | diff -u - defined | grep ^+ | grep -v ^+++ | cut -c2- + +# Stupid test that everything purported to be exported really is + +define generate-sym-test + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_at)printf '#include \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> $@ + $(AM_V_at)printf 'return 0; }\n' >> $@ +endef + +test-libsystemd-bus-sym.c: \ + src/libsystemd-bus/libsystemd-bus.sym \ + src/systemd/sd-bus.h \ + src/systemd/sd-utf8.h \ + Makefile + $(generate-sym-test) + +test-libsystemd-daemon-sym.c: \ + src/libsystemd-daemon/libsystemd-daemon.sym \ + src/systemd/sd-daemon.h \ + Makefile + $(generate-sym-test) + +test-libsystemd-id128-sym.c: \ + src/libsystemd-id128/libsystemd-id128.sym \ + src/systemd/sd-id128.h \ + Makefile + $(generate-sym-test) + +test-libsystemd-journal-sym.c: \ + src/journal/libsystemd-journal.sym \ + src/systemd/sd-journal.h \ + Makefile + $(generate-sym-test) + +test-libsystemd-login-sym.c: \ + src/login/libsystemd-login.sym \ + src/systemd/sd-login.h \ + Makefile + $(generate-sym-test) + +test-libudev-sym.c: \ + src/libudev/libudev.sym \ + src/udev/udev.h \ + Makefile + $(generate-sym-test) + +test_libsystemd_bus_sym_SOURCES = \ + test-libsystemd-bus-sym.c +test_libsystemd_bus_sym_LDADD = \ + libsystemd-bus.la + +test_libsystemd_daemon_sym_SOURCES = \ + test-libsystemd-daemon-sym.c +test_libsystemd_daemon_sym_LDADD = \ + libsystemd-daemon.la + +test_libsystemd_id128_sym_SOURCES = \ + test-libsystemd-id128-sym.c +test_libsystemd_id128_sym_LDADD = \ + libsystemd-id128.la + +test_libsystemd_journal_sym_SOURCES = \ + test-libsystemd-journal-sym.c +test_libsystemd_journal_sym_LDADD = \ + libsystemd-journal.la + +test_libsystemd_login_sym_SOURCES = \ + test-libsystemd-login-sym.c +test_libsystemd_login_sym_LDADD = \ + libsystemd-login.la + +test_libudev_sym_SOURCES = \ + test-libudev-sym.c +test_libudev_sym_LDADD = \ + libudev.la + +BUILT_SOURCES += \ + $(test_libsystemd_bus_sym_SOURCES) \ + $(test_libsystemd_daemon_sym_SOURCES) \ + $(test_libsystemd_id128_sym_SOURCES) \ + $(test_libsystemd_journal_sym_SOURCES) \ + $(test_libsystemd_login_sym_SOURCES) \ + $(test_libudev_sym_SOURCES) + +tests += \ + test-libsystemd-bus-sym \ + test-libsystemd-daemon-sym \ + test-libsystemd-id128-sym \ + test-libsystemd-journal-sym \ + test-libsystemd-login-sym \ + test-libudev-sym