chiark / gitweb /
Add sabridge for socket activation of traditional daemons
[elogind.git] / Makefile.am
index 7785865..2877184 100644 (file)
@@ -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 \
@@ -721,7 +726,15 @@ libsystemd_shared_la_SOURCES = \
        src/shared/acpi-fpdt.c \
        src/shared/boot-timestamps.h \
        src/shared/boot-timestamps.c \
-       src/shared/refcnt.h
+       src/shared/refcnt.h \
+       src/shared/mkdir.c \
+       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 += \
@@ -765,15 +778,12 @@ noinst_LTLIBRARIES += \
        libsystemd-label.la
 
 libsystemd_label_la_SOURCES = \
-       src/shared/cgroup-label.c \
        src/shared/socket-label.c \
        src/shared/label.c \
        src/shared/label.h \
        src/shared/selinux-util.c \
        src/shared/selinux-util.h \
-       src/shared/mkdir.c \
        src/shared/mkdir-label.c \
-       src/shared/mkdir.h \
        src/shared/ask-password-api.c \
        src/shared/ask-password-api.h \
        src/shared/fileio-label.c \
@@ -1130,6 +1140,7 @@ tests += \
        test-unit-name \
        test-unit-file \
        test-utf8 \
+       test-ellipsize \
        test-util \
        test-date \
        test-sleep \
@@ -1320,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
 
@@ -1935,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 \
@@ -1957,8 +1976,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 \
@@ -1982,7 +2007,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
@@ -2032,6 +2060,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
 
@@ -2096,6 +2136,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
 
@@ -2142,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 += \
@@ -2316,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)
@@ -2378,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
@@ -2704,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)
@@ -2957,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 \
@@ -3157,6 +3209,22 @@ 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 = \
        src/journal/coredump.c
@@ -3378,6 +3446,26 @@ 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 += \
        systemd-cryptsetup
@@ -4562,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