X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=151c4cc22793ee84f1b045aae908be3a6bb029e7;hb=f1e0c18340acb7df53d5b638846fe5687255dad0;hp=55a945b65b7b40acaba9fad0b559f1be5e64c1fe;hpb=d23284faa9a4d78410b939d42d20b6da3e475f87;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 55a945b65..151c4cc22 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2006,6 +2006,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 +2043,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 +2093,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 +2121,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 +2162,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 +2194,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 @@ -3772,6 +3812,7 @@ EXTRA_DIST += \ endif # ------------------------------------------------------------------------------ +if ENABLE_NETWORKD rootlibexec_PROGRAMS += \ systemd-networkd @@ -3823,6 +3864,7 @@ EXTRA_DIST += \ CLEANFILES += \ src/network/networkd-gperf.c +endif # ------------------------------------------------------------------------------ if ENABLE_LOGIND @@ -4620,23 +4662,24 @@ 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 exported: $(lib_LTLIBRARIES) - $(AM_V_GEN)for f in $(lib_LTLIBRARIES) ; do \ - nm -g --defined-only $(builddir)/.libs/"$${f/.la/.so}" 2>&1 /dev/null | grep " T " | cut -d" " -f3 ; \ + $(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 > $@ check-api-docs: exported man - for symbol in `cat exported` ; do \ + $(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))) @@ -4652,3 +4695,102 @@ CLEANFILES += \ 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)echo '#include ' > $@ + $(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> $@ + $(AM_V_at)echo 'return 0; }' >> $@ +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