X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=287718413b513f1769734373a8a781ec7411bcbc;hp=4c7646d84f4bfac80268346a1457d6d885e9e74a;hb=912b54ad47e1597c1744ccd936368b0eb1468b16;hpb=29ddb38fea134c6132e4f2dd608e9da3871eaebe diff --git a/Makefile.am b/Makefile.am index 4c7646d84..287718413 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,7 @@ # Copyright 2010-2012 Lennart Poettering # Copyright 2010-2012 Kay Sievers # Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss # # systemd is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as published by @@ -298,7 +299,8 @@ bin_PROGRAMS = \ systemd-detect-virt \ systemd-delta \ systemd-analyze \ - systemd-run + systemd-run \ + systemd-sabridge dist_bin_SCRIPTS = \ src/kernel-install/kernel-install @@ -647,6 +649,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 +686,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 +728,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 +1140,7 @@ tests += \ test-unit-name \ test-unit-file \ test-utf8 \ + test-ellipsize \ test-util \ test-date \ test-sleep \ @@ -1319,6 +1331,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 +1952,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 \ @@ -1958,8 +1978,12 @@ libsystemd_bus_la_SOURCES = \ 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 \ @@ -1985,7 +2009,8 @@ tests += \ test-bus-memfd \ test-bus-zero-copy \ test-bus-introspect \ - test-bus-objects + test-bus-objects \ + test-event noinst_PROGRAMS += \ busctl @@ -2121,6 +2146,14 @@ 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 @@ -2167,9 +2200,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 += \ @@ -2341,7 +2372,6 @@ libudev_core_la_LIBADD = \ libudev-private.la \ libsystemd-label.la \ libsystemd-daemon-internal.la \ - $(RT_LIBS) \ libsystemd-shared.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) @@ -2403,6 +2433,7 @@ udevadm_SOURCES = \ udevadm_LDADD = \ libudev-core.la \ + libsystemd-label.la \ libsystemd-shared.la # Update hwdb on installation. Do not bother if installing @@ -2729,10 +2760,7 @@ libsystemd_id128_la_LDFLAGS = \ -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym libsystemd_id128_la_LIBADD = \ - libsystemd-shared.la \ - libsystemd-label.la \ - libsystemd-daemon-internal.la \ - $(RT_LIBS) + libsystemd-shared.la libsystemd_id128_internal_la_SOURCES = \ $(libsystemd_id128_la_SOURCES) @@ -2982,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 \ @@ -3181,6 +3208,22 @@ endif EXTRA_DIST += \ units/systemd-journal-gatewayd.service.in +# ------------------------------------------------------------------------------ + +systemd_sabridge_SOURCES = \ + src/sabridge/sabridge.c + +systemd_sabridge_LDADD = \ + libsystemd-shared.la \ + libsystemd-logs.la \ + libsystemd-journal-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon.la \ + libsystemd-bus.la + +systemd_sabridge_CFLAGS = \ + $(AM_CFLAGS) + # ------------------------------------------------------------------------------ if ENABLE_COREDUMP systemd_coredump_SOURCES = \ @@ -3402,6 +3445,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 += \ @@ -4587,3 +4650,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