X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=76d1eeb3935474c9127ee8e1d7639fd8da92fd22;hp=8d9c58758f46c9f379ed5a390c30a3d1e38a1a85;hb=9cada1952a371e1b74b5e4bcae020ca1e88fdec8;hpb=1434ae6fd49f8377b0ddbd4c675736e0d3226ea6 diff --git a/Makefile.am b/Makefile.am index 8d9c58758..76d1eeb39 100644 --- a/Makefile.am +++ b/Makefile.am @@ -647,6 +647,7 @@ libsystemd_shared_la_SOURCES = \ src/shared/sparse-endian.h \ src/shared/util.c \ src/shared/util.h \ + src/shared/udev-util.h \ src/shared/virt.c \ src/shared/virt.h \ src/shared/efivars.c \ @@ -683,6 +684,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/exit-status.h \ src/shared/utf8.c \ src/shared/utf8.h \ + src/shared/gunicode.c \ + src/shared/gunicode.h \ src/shared/pager.c \ src/shared/pager.h \ src/shared/ioprio.h \ @@ -723,7 +726,13 @@ libsystemd_shared_la_SOURCES = \ src/shared/boot-timestamps.c \ src/shared/refcnt.h \ src/shared/mkdir.c \ - src/shared/mkdir.h + src/shared/mkdir.h \ + src/shared/smack-util.c \ + src/shared/smack-util.h \ + src/shared/apparmor-util.c \ + src/shared/apparmor-util.h \ + src/shared/ima-util.c \ + src/shared/ima-util.h #------------------------------------------------------------------------------- noinst_LTLIBRARIES += \ @@ -1129,6 +1138,7 @@ tests += \ test-unit-name \ test-unit-file \ test-utf8 \ + test-ellipsize \ test-util \ test-date \ test-sleep \ @@ -1319,6 +1329,12 @@ test_log_SOURCES = \ test_log_LDADD = \ libsystemd-core.la +test_ellipsize_SOURCES = \ + src/test/test-ellipsize.c + +test_ellipsize_LDADD = \ + libsystemd-core.la + test_date_SOURCES = \ src/test/test-date.c @@ -1934,7 +1950,9 @@ EXTRA_DIST += \ libsystemd_bus_la_SOURCES = \ src/systemd/sd-bus.h \ src/systemd/sd-bus-protocol.h \ + src/systemd/sd-bus-vtable.h \ src/systemd/sd-memfd.h \ + src/systemd/sd-event.h \ src/libsystemd-bus/sd-bus.c \ src/libsystemd-bus/bus-control.c \ src/libsystemd-bus/bus-control.h \ @@ -1956,8 +1974,14 @@ libsystemd_bus_la_SOURCES = \ src/libsystemd-bus/bus-match.h \ src/libsystemd-bus/bus-bloom.c \ src/libsystemd-bus/bus-bloom.h \ + src/libsystemd-bus/bus-introspect.c \ + src/libsystemd-bus/bus-introspect.h \ + src/libsystemd-bus/bus-objects.c \ + src/libsystemd-bus/bus-objects.h \ + src/libsystemd-bus/bus-convenience.c \ src/libsystemd-bus/kdbus.h \ - src/libsystemd-bus/sd-memfd.c + src/libsystemd-bus/sd-memfd.c \ + src/libsystemd-bus/sd-event.c libsystemd_bus_la_LIBADD = \ libsystemd-id128-internal.la \ @@ -1981,7 +2005,10 @@ tests += \ test-bus-kernel-bloom \ test-bus-kernel-benchmark \ test-bus-memfd \ - test-bus-zero-copy + test-bus-zero-copy \ + test-bus-introspect \ + test-bus-objects \ + test-event noinst_PROGRAMS += \ busctl @@ -2031,6 +2058,18 @@ test_bus_server_LDADD = \ libsystemd-bus.la \ libsystemd-id128-internal.la +test_bus_objects_SOURCES = \ + src/libsystemd-bus/test-bus-objects.c + +test_bus_objects_CFLAGS = \ + $(AM_CFLAGS) \ + -pthread + +test_bus_objects_LDADD = \ + libsystemd-shared.la \ + libsystemd-bus.la \ + libsystemd-id128-internal.la + test_bus_match_SOURCES = \ src/libsystemd-bus/test-bus-match.c @@ -2095,6 +2134,24 @@ test_bus_zero_copy_LDADD = \ libsystemd-shared.la \ libsystemd-bus.la +test_bus_introspect_SOURCES = \ + src/libsystemd-bus/test-bus-introspect.c + +test_bus_introspect_CFLAGS = \ + $(AM_CFLAGS) + +test_bus_introspect_LDADD = \ + libsystemd-shared.la \ + libsystemd-bus.la + +test_event_SOURCES = \ + src/libsystemd-bus/test-event.c + +test_event_LDADD = \ + libsystemd-shared.la \ + libsystemd-bus.la \ + libsystemd-id128-internal.la + busctl_SOURCES = \ src/libsystemd-bus/busctl.c @@ -2141,9 +2198,7 @@ libudev_la_LDFLAGS = \ libudev_la_LIBADD = \ libsystemd-shared.la \ - libsystemd-label.la \ libsystemd-daemon-internal.la \ - $(RT_LIBS) \ libsystemd-id128-internal.la pkgconfiglib_DATA += \ @@ -2315,7 +2370,6 @@ libudev_core_la_LIBADD = \ libudev-private.la \ libsystemd-label.la \ libsystemd-daemon-internal.la \ - $(RT_LIBS) \ libsystemd-shared.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) @@ -2377,6 +2431,7 @@ udevadm_SOURCES = \ udevadm_LDADD = \ libudev-core.la \ + libsystemd-label.la \ libsystemd-shared.la # Update hwdb on installation. Do not bother if installing @@ -2704,7 +2759,6 @@ libsystemd_id128_la_LDFLAGS = \ libsystemd_id128_la_LIBADD = \ libsystemd-shared.la \ - libsystemd-label.la \ libsystemd-daemon-internal.la \ $(RT_LIBS) @@ -2956,7 +3010,6 @@ libsystemd_journal_internal_la_CFLAGS = \ $(AM_CFLAGS) libsystemd_journal_internal_la_LIBADD = \ - libsystemd-label.la \ libsystemd-audit.la \ libsystemd-daemon.la \ libudev.la \ @@ -3376,6 +3429,26 @@ endif EXTRA_DIST += \ units/systemd-backlight@.service.in +# ------------------------------------------------------------------------------ +if ENABLE_RFKILL +rootlibexec_PROGRAMS += \ + systemd-rfkill + +nodist_systemunit_DATA += \ + units/systemd-rfkill@.service + +systemd_rfkill_SOURCES = \ + src/rfkill/rfkill.c + +systemd_rfkill_LDADD = \ + libsystemd-label.la \ + libsystemd-shared.la \ + libudev-private.la +endif + +EXTRA_DIST += \ + units/systemd-rfkill@.service.in + # ------------------------------------------------------------------------------ if HAVE_LIBCRYPTSETUP rootlibexec_PROGRAMS += \ @@ -4561,3 +4634,8 @@ install-tree: all rm -rf $(abs_srcdir)/install-tree $(MAKE) install DESTDIR=$(abs_srcdir)/install-tree tree $(abs_srcdir)/install-tree + +# 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 ; done