X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=ba27a348b8fd26e1eb24ee1b0404cb2e695ce581;hp=1458697c05aae916e29868dca4492ea8219a5604;hb=40ca29a1370379d43e44c0ed425eecc7218dcbca;hpb=8552b17660033812080a11533bd0edce74401039 diff --git a/Makefile.am b/Makefile.am index 1458697c0..ba27a348b 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-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 \ @@ -725,7 +730,11 @@ libsystemd_shared_la_SOURCES = \ src/shared/mkdir.c \ src/shared/mkdir.h \ src/shared/smack-util.c \ - src/shared/smack-util.h + 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 += \ @@ -1131,6 +1140,7 @@ tests += \ test-unit-name \ test-unit-file \ test-utf8 \ + test-ellipsize \ test-util \ test-date \ test-sleep \ @@ -1321,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 @@ -1936,8 +1952,9 @@ EXTRA_DIST += \ libsystemd_bus_la_SOURCES = \ src/systemd/sd-bus.h \ src/systemd/sd-bus-protocol.h \ - src/systemd/sd-memfd.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 \ @@ -1961,8 +1978,15 @@ 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 \ + 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 \ @@ -1988,7 +2012,8 @@ tests += \ test-bus-memfd \ test-bus-zero-copy \ test-bus-introspect \ - test-bus-objects + test-bus-objects \ + test-event noinst_PROGRAMS += \ busctl @@ -2124,6 +2149,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 @@ -2170,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 += \ @@ -2344,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) @@ -2406,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 @@ -2732,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) @@ -2985,7 +3013,6 @@ libsystemd_journal_internal_la_CFLAGS = \ $(AM_CFLAGS) libsystemd_journal_internal_la_LIBADD = \ - libsystemd-label.la \ libsystemd-audit.la \ libsystemd-daemon.la \ libudev.la \ @@ -3184,6 +3211,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 = \ @@ -3405,6 +3448,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 += \ @@ -3595,15 +3658,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