# 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
# 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
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
dbuspolicydir=@dbuspolicydir@
dbussessionservicedir=@dbussessionservicedir@
dbussystemservicedir=@dbussystemservicedir@
-dbusinterfacedir=@dbusinterfacedir@
pamlibdir=@pamlibdir@
pamconfdir=@pamconfdir@
pkgconfigdatadir=$(datadir)/pkgconfig
dist_pkgsysconf_DATA =
dist_pkgdata_DATA =
dist_dbuspolicy_DATA =
-dbusinterface_DATA =
dist_dbussystemservice_DATA =
check_PROGRAMS =
check_DATA =
systemd-fsck \
systemd-ac-power \
systemd-sysctl \
- systemd-sleep
+ systemd-sleep \
+ systemd-socket-proxyd
systemgenerator_PROGRAMS = \
systemd-getty-generator \
units/initrd-cleanup.service.in \
units/initrd-udevadm-cleanup-db.service.in \
units/initrd-switch-root.service.in \
- units/systemd-nspawn@.service.in \
- introspect.awk
+ units/systemd-nspawn@.service.in
CLEANFILES += \
units/console-shell.service.m4 \
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 \
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 \
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 += \
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 \
src/shared/logs-show.c \
src/shared/logs-show.h
-libsystemd_logs_la_CFLAGS = \
- $(AM_CFLAGS)
-
libsystemd_logs_la_LIBADD = \
libsystemd-journal-internal.la \
libsystemd-id128-internal.la \
dist_dbussystemservice_DATA += \
src/core/org.freedesktop.systemd1.service
-dbusinterface_DATA += \
- org.freedesktop.systemd1.Manager.xml \
- org.freedesktop.systemd1.Job.xml \
- org.freedesktop.systemd1.Unit.xml \
- org.freedesktop.systemd1.Service.xml \
- org.freedesktop.systemd1.Socket.xml \
- org.freedesktop.systemd1.Timer.xml \
- org.freedesktop.systemd1.Target.xml \
- org.freedesktop.systemd1.Device.xml \
- org.freedesktop.systemd1.Mount.xml \
- org.freedesktop.systemd1.Automount.xml \
- org.freedesktop.systemd1.Snapshot.xml \
- org.freedesktop.systemd1.Swap.xml \
- org.freedesktop.systemd1.Path.xml
-
polkitpolicy_in_in_files += \
src/core/org.freedesktop.systemd1.policy.in.in
-org.freedesktop.systemd1.%.xml: systemd
- $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \
- $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
- $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
pkgconfigdata_DATA = \
src/core/systemd.pc
test-unit-name \
test-unit-file \
test-utf8 \
+ test-ellipsize \
test-util \
test-date \
test-sleep \
test_device_nodes_SOURCES = \
src/test/test-device-nodes.c
-test_device_nodes_CFLAGS = \
- $(AM_CFLAGS)
-
test_device_nodes_LDADD = \
libsystemd-shared.la
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
test_utf8_SOURCES = \
src/test/test-utf8.c
-test_utf8_CFLAGS = \
- $(AM_CFLAGS)
-
test_utf8_LDADD = \
libsystemd-shared.la
test_util_SOURCES = \
src/test/test-util.c
-test_util_CFLAGS = \
- $(AM_CFLAGS)
-
test_util_LDADD = \
libsystemd-core.la
test_hashmap_SOURCES = \
src/test/test-hashmap.c
-test_hashmap_CFLAGS = \
- $(AM_CFLAGS)
-
test_hashmap_LDADD = \
libsystemd-core.la
test_list_SOURCES = \
src/test/test-list.c
-test_list_CFLAGS = \
- $(AM_CFLAGS)
-
test_list_LDADD = \
libsystemd-core.la
test_prioq_SOURCES = \
src/test/test-prioq.c
-test_prioq_CFLAGS = \
- $(AM_CFLAGS)
-
test_prioq_LDADD = \
libsystemd-core.la
test_fileio_SOURCES = \
src/test/test-fileio.c
-test_fileio_CFLAGS = \
- $(AM_CFLAGS)
-
test_fileio_LDADD = \
libsystemd-core.la
test_time_SOURCES = \
src/test/test-time.c
-test_time_CFLAGS = \
- $(AM_CFLAGS)
-
test_time_LDADD = \
libsystemd-core.la
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
systemd_initctl_LDADD = \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-dbus.la
+ libsystemd-bus.la
# ------------------------------------------------------------------------------
systemd_update_utmp_SOURCES = \
systemd_update_utmp_LDADD = \
libsystemd-shared.la \
- libsystemd-dbus.la \
+ libsystemd-bus.la \
$(AUDIT_LIBS)
# ------------------------------------------------------------------------------
systemd_fsck_LDADD = \
libsystemd-shared.la \
- libsystemd-dbus.la \
+ libsystemd-bus.la \
libudev.la
# ------------------------------------------------------------------------------
systemd_cgroups_agent_SOURCES = \
src/cgroups-agent/cgroups-agent.c
-systemd_cgroups_agent_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
-
systemd_cgroups_agent_LDADD = \
libsystemd-shared.la \
- libsystemd-dbus.la
+ libsystemd-bus.la
# ------------------------------------------------------------------------------
systemctl_SOURCES = \
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 \
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 \
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
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
-test_bus_match_CFLAGS = \
- $(AM_CFLAGS)
-
test_bus_match_LDADD = \
libsystemd-shared.la \
libsystemd-bus.la \
test_bus_kernel_SOURCES = \
src/libsystemd-bus/test-bus-kernel.c
-test_bus_kernel_CFLAGS = \
- $(AM_CFLAGS)
-
test_bus_kernel_LDADD = \
libsystemd-shared.la \
libsystemd-bus.la \
test_bus_kernel_bloom_SOURCES = \
src/libsystemd-bus/test-bus-kernel-bloom.c
-test_bus_kernel_bloom_CFLAGS = \
- $(AM_CFLAGS)
-
test_bus_kernel_bloom_LDADD = \
libsystemd-shared.la \
libsystemd-bus.la \
test_bus_kernel_benchmark_SOURCES = \
src/libsystemd-bus/test-bus-kernel-benchmark.c
-test_bus_kernel_benchmark_CFLAGS = \
- $(AM_CFLAGS)
-
test_bus_kernel_benchmark_LDADD = \
libsystemd-shared.la \
libsystemd-bus.la \
test_bus_memfd_SOURCES = \
src/libsystemd-bus/test-bus-memfd.c
-test_bus_memfd_CFLAGS = \
- $(AM_CFLAGS)
-
test_bus_memfd_LDADD = \
libsystemd-shared.la \
libsystemd-bus.la
test_bus_zero_copy_SOURCES = \
src/libsystemd-bus/test-bus-zero-copy.c
-test_bus_zero_copy_CFLAGS = \
- $(AM_CFLAGS)
-
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_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
libudev_la_LIBADD = \
libsystemd-shared.la \
- libsystemd-label.la \
libsystemd-daemon-internal.la \
- $(RT_LIBS) \
libsystemd-id128-internal.la
pkgconfiglib_DATA += \
libudev-private.la \
libsystemd-label.la \
libsystemd-daemon-internal.la \
- $(RT_LIBS) \
libsystemd-shared.la \
$(BLKID_LIBS) \
$(KMOD_LIBS)
udevadm_LDADD = \
libudev-core.la \
+ libsystemd-label.la \
libsystemd-shared.la
# Update hwdb on installation. Do not bother if installing
src_gudev_GUdev_1_0_gir_INCLUDES = GObject-2.0
src_gudev_GUdev_1_0_gir_CFLAGS = \
+ $(AM_CFLAGS) \
$(INCLUDES) \
-D_GUDEV_COMPILATION \
-D_GUDEV_WORK_AROUND_DEV_T_BUG \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
- -I$(top_srcdir)/src/gdev \
- -I$(top_builddir)/src/gdev
+ -I$(top_srcdir)/src/gudev \
+ -I$(top_builddir)/src/gudev
src_gudev_GUdev_1_0_gir_LIBS = libgudev-1.0.la
-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)
libsystemd-shared.la \
libsystemd-journal-internal.la
-journalctl_SOURCES = \
- src/journal/journalctl.c
-
+# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
journalctl_CFLAGS = \
$(AM_CFLAGS)
+journalctl_SOURCES = \
+ src/journal/journalctl.c
+
journalctl_LDADD = \
libsystemd-shared.la \
libsystemd-journal-internal.la \
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 \
src/journal/journald-rate-limit.h \
src/journal/journal-internal.h
+# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
libsystemd_journal_internal_la_CFLAGS = \
$(AM_CFLAGS)
libsystemd_journal_internal_la_LIBADD = \
- libsystemd-label.la \
libsystemd-audit.la \
libsystemd-daemon.la \
libudev.la \
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
$(MICROHTTPD_LIBS)
systemd_journal_gatewayd_CFLAGS = \
- -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \
$(AM_CFLAGS) \
+ -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \
$(MICROHTTPD_CFLAGS)
dist_systemunit_DATA += \
EXTRA_DIST += \
units/systemd-journal-gatewayd.service.in
+# ------------------------------------------------------------------------------
+
+systemd_socket_proxyd_SOURCES = \
+ src/socket-proxy/socket-proxyd.c
+
+systemd_socket_proxyd_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-logs.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon.la \
+ libsystemd-bus.la
+
# ------------------------------------------------------------------------------
if ENABLE_COREDUMP
systemd_coredump_SOURCES = \
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_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
polkitpolicy_files += \
src/hostname/org.freedesktop.hostname1.policy
-dbusinterface_DATA += \
- org.freedesktop.hostname1.xml
-
-org.freedesktop.hostname1.xml: systemd-hostnamed
- $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \
- $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
- $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
SYSTEM_UNIT_ALIASES += \
systemd-hostnamed.service dbus-org.freedesktop.hostname1.service
polkitpolicy_files += \
src/locale/org.freedesktop.locale1.policy
-dbusinterface_DATA += \
- org.freedesktop.locale1.xml
-
-org.freedesktop.locale1.xml: systemd-localed
- $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \
- $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
- $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
SYSTEM_UNIT_ALIASES += \
systemd-localed.service dbus-org.freedesktop.locale1.service
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
polkitpolicy_files += \
src/timedate/org.freedesktop.timedate1.policy
-org.freedesktop.timedate1.xml: systemd-timedated
- $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
- $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
- $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
-dbusinterface_DATA += \
- org.freedesktop.timedate1.xml
-
INSTALL_DIRS += \
$(prefix)/lib/systemd/ntp-units.d \
$(sysconfdir)/systemd/ntp-units.d
src/nss-myhostname/ifconf.h \
src/nss-myhostname/netlink.c
-libnss_myhostname_la_CFLAGS = \
- $(AM_CFLAGS)
-
libnss_myhostname_la_LDFLAGS = \
$(AM_LDFLAGS) \
-module \
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 \
libsystemd_logind_core_la_CFLAGS = \
$(AM_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(DBUS_CFLAGS)
libsystemd_logind_core_la_LIBADD = \
libsystemd-label.la \
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
man/custom-man.xsl
# ------------------------------------------------------------------------------
-DBUS_PREPROCESS = $(CPP) -P $(CFLAGS) $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
-
-CLEANFILES += \
- $(dbusinterface_DATA)
-
if HAVE_SYSV_COMPAT
sysvinit_DATA = \
docs/sysvinit/README
systemd-update-utmp.service
LOCAL_FS_TARGET_WANTS += \
systemd-remount-fs.service \
- systemd-fsck-root.service \
tmp.mount
MULTI_USER_TARGET_WANTS += \
getty.target \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
--with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
--with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
- --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
--with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
--with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
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
~ianmdlvl / elogind.git / blobdiff