chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
hostnamed: port over from libdbus to libsystemd-bus
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 92de1630b4d81b15d8ea2dadba23689ea5ca58fb..b337f4f09b8be515903e7604fa5971acd51dbb40 100644 (file)
--- 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
@@ -34,16 +35,16 @@ SUBDIRS = . po
 # Keep the test-suite.log
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
-LIBUDEV_CURRENT=4
-LIBUDEV_REVISION=8
-LIBUDEV_AGE=3
+LIBUDEV_CURRENT=5
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=4
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=3
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=9
-LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_REVISION=1
 LIBSYSTEMD_LOGIN_AGE=9
 
 LIBSYSTEMD_DAEMON_CURRENT=0
@@ -51,11 +52,11 @@ LIBSYSTEMD_DAEMON_REVISION=10
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=25
+LIBSYSTEMD_ID128_REVISION=26
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=11
-LIBSYSTEMD_JOURNAL_REVISION=2
+LIBSYSTEMD_JOURNAL_REVISION=3
 LIBSYSTEMD_JOURNAL_AGE=11
 
 # Dirs of external packages
@@ -298,7 +299,8 @@ bin_PROGRAMS = \
        systemd-detect-virt \
        systemd-delta \
        systemd-analyze \
-       systemd-run
+       systemd-run \
+       systemd-saproxy
 
 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,17 @@ 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 \
+       src/libsystemd-bus/bus-util.c \
+       src/libsystemd-bus/bus-util.h \
+       src/libsystemd-bus/event-util.h
 
 libsystemd_bus_la_LIBADD =  \
        libsystemd-id128-internal.la \
@@ -1982,7 +2010,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 +2063,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 +2139,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 +2203,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 +2375,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 +2436,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 +2763,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)
@@ -2903,6 +2959,7 @@ test_catalog_LDADD = \
 libsystemd_journal_la_SOURCES = \
        src/journal/sd-journal.c \
        src/systemd/sd-journal.h \
+       src/systemd/_sd-common.h \
        src/journal/journal-file.c \
        src/journal/journal-file.h \
        src/journal/journal-vacuum.c \
@@ -2957,7 +3014,6 @@ libsystemd_journal_internal_la_CFLAGS = \
        $(AM_CFLAGS)
 
 libsystemd_journal_internal_la_LIBADD = \
-       libsystemd-label.la \
        libsystemd-audit.la \
        libsystemd-daemon.la \
        libudev.la \
@@ -3067,7 +3123,8 @@ tests += \
 
 pkginclude_HEADERS += \
        src/systemd/sd-journal.h \
-       src/systemd/sd-messages.h
+       src/systemd/sd-messages.h \
+       src/systemd/_sd-common.h
 
 lib_LTLIBRARIES += \
        libsystemd-journal.la
@@ -3156,6 +3213,22 @@ endif
 EXTRA_DIST += \
        units/systemd-journal-gatewayd.service.in
 
+# ------------------------------------------------------------------------------
+
+systemd_saproxy_SOURCES = \
+       src/saproxy/saproxy.c
+
+systemd_saproxy_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-logs.la \
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon.la \
+       libsystemd-bus.la
+
+systemd_saproxy_CFLAGS = \
+       $(AM_CFLAGS)
+
 # ------------------------------------------------------------------------------
 if ENABLE_COREDUMP
 systemd_coredump_SOURCES = \
@@ -3377,6 +3450,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 += \
@@ -3418,15 +3511,11 @@ if ENABLE_HOSTNAMED
 systemd_hostnamed_SOURCES = \
        src/hostname/hostnamed.c
 
-systemd_hostnamed_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 systemd_hostnamed_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
-       libsystemd-dbus.la
+       libsystemd-bus.la
 
 rootlibexec_PROGRAMS += \
        systemd-hostnamed
@@ -3567,15 +3656,11 @@ if ENABLE_TIMEDATED
 systemd_timedated_SOURCES = \
        src/timedate/timedated.c
 
-systemd_timedated_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 systemd_timedated_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
-       libsystemd-dbus.la
+       libsystemd-bus.la
 
 rootlibexec_PROGRAMS += \
        systemd-timedated
@@ -4562,3 +4647,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
Unnamed repository; edit this file 'description' to name the repository.