X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=287718413b513f1769734373a8a781ec7411bcbc;hp=9b06c28833c6647f9b56f678777bf6761a4cbdf9;hb=912b54ad47e1597c1744ccd936368b0eb1468b16;hpb=118ecf32425a590ea266b5c2b6de7962bb242356 diff --git a/Makefile.am b/Makefile.am index 9b06c2883..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 @@ -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 @@ -159,7 +160,7 @@ AM_CPPFLAGS = \ -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \ -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \ -DROOTPREFIX=\"$(rootprefix)\" \ - -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \ + -DRANDOM_SEED=\"$(localstatedir)/lib/systemd/random-seed\" \ -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \ -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \ -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \ @@ -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 @@ -642,9 +644,12 @@ libsystemd_shared_la_SOURCES = \ src/shared/list.h \ src/shared/macro.h \ src/shared/def.h \ + src/shared/device-nodes.c \ + src/shared/device-nodes.h \ 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 \ @@ -681,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 \ @@ -715,7 +722,19 @@ libsystemd_shared_la_SOURCES = \ src/shared/output-mode.h \ src/shared/MurmurHash3.c \ src/shared/MurmurHash3.h \ - src/shared/refcnt.h + src/shared/acpi-fpdt.h \ + src/shared/acpi-fpdt.c \ + src/shared/boot-timestamps.h \ + src/shared/boot-timestamps.c \ + 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 += \ @@ -759,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 \ @@ -1124,6 +1140,7 @@ tests += \ test-unit-name \ test-unit-file \ test-utf8 \ + test-ellipsize \ test-util \ test-date \ test-sleep \ @@ -1137,7 +1154,8 @@ tests += \ test-time \ test-hashmap \ test-list \ - test-tables + test-tables \ + test-device-nodes EXTRA_DIST += \ test/sched_idle_bad.service \ @@ -1149,6 +1167,12 @@ EXTRA_DIST += \ EXTRA_DIST += \ src/test/test-helper.h +test_device_nodes_SOURCES = \ + src/test/test-device-nodes.c + +test_device_nodes_LDADD = \ + libsystemd-shared.la + test_engine_SOURCES = \ src/test/test-engine.c @@ -1197,12 +1221,12 @@ test_hostname_LDADD = \ if ENABLE_EFI manual_tests += \ - test-efivars + test-boot-timestamp -test_efivars_SOURCES = \ - src/test/test-efivars.c +test_boot_timestamp_SOURCES = \ + src/test/test-boot-timestamps.c -test_efivars_LDADD = \ +test_boot_timestamp_LDADD = \ libsystemd-shared.la endif @@ -1307,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 @@ -1922,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 \ @@ -1944,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 \ @@ -1969,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 @@ -2019,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 @@ -2083,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 @@ -2129,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 += \ @@ -2303,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) @@ -2365,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 @@ -2691,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) @@ -2944,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 \ @@ -3143,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 = \ @@ -3364,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 += \ @@ -3748,15 +3849,8 @@ systemd_logind_LDADD = \ libsystemd-logind-core.la \ $(libsystemd_logind_core_la_LIBADD) -if HAVE_ACL -systemd_logind_SOURCES += \ - src/login/logind-acl.c - -systemd_logind_LDADD += \ - libsystemd-acl.la -endif - libsystemd_logind_core_la_SOURCES = \ + src/login/logind-core.c \ src/login/logind-dbus.c \ src/login/logind-device.c \ src/login/logind-device.h \ @@ -3794,6 +3888,14 @@ libsystemd_logind_core_la_LIBADD = \ libsystemd-id128-internal.la \ libudev.la +if HAVE_ACL +libsystemd_logind_core_la_SOURCES += \ + src/login/logind-acl.c + +libsystemd_logind_core_la_LIBADD += \ + libsystemd-acl.la +endif + noinst_LTLIBRARIES += \ libsystemd-logind-core.la @@ -4213,7 +4315,7 @@ substitutions = \ '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \ '|PACKAGE_NAME=$(PACKAGE_NAME)|' \ '|PACKAGE_URL=$(PACKAGE_URL)|' \ - '|RANDOM_SEED=$(localstatedir)/lib/random-seed|' \ + '|RANDOM_SEED=$(localstatedir)/lib/systemd/random-seed|' \ '|prefix=$(prefix)|' \ '|exec_prefix=$(exec_prefix)|' \ '|libdir=$(libdir)|' \ @@ -4548,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