# 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=7
-LIBUDEV_AGE=3
+LIBUDEV_CURRENT=5
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=4
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
-LIBSYSTEMD_LOGIN_CURRENT=8
+LIBSYSTEMD_LOGIN_CURRENT=9
LIBSYSTEMD_LOGIN_REVISION=1
-LIBSYSTEMD_LOGIN_AGE=8
+LIBSYSTEMD_LOGIN_AGE=9
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_DAEMON_REVISION=10
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=24
+LIBSYSTEMD_ID128_REVISION=26
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_JOURNAL_CURRENT=11
-LIBSYSTEMD_JOURNAL_REVISION=1
+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
pkgconfiglibdir=$(libdir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
userpresetdir=$(prefix)/lib/systemd/user-preset
tmpfilesdir=$(prefix)/lib/tmpfiles.d
sysctldir=$(prefix)/lib/sysctl.d
+networkdir=$(prefix)/lib/systemd/network
pkgincludedir=$(includedir)/systemd
systemgeneratordir=$(rootlibexecdir)/system-generators
usergeneratordir=$(prefix)/lib/systemd/user-generators
dist_pkgsysconf_DATA =
dist_pkgdata_DATA =
dist_dbuspolicy_DATA =
-dbusinterface_DATA =
dist_dbussystemservice_DATA =
check_PROGRAMS =
check_DATA =
-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)\" \
-I $(top_srcdir)/src/core \
-I $(top_srcdir)/src/libudev \
-I $(top_srcdir)/src/udev \
+ -I $(top_srcdir)/src/udev/net \
-I $(top_builddir)/src/udev \
-I $(top_srcdir)/src/libsystemd-bus \
$(OUR_CPPFLAGS)
systemd-fsck \
systemd-ac-power \
systemd-sysctl \
- systemd-sleep
+ systemd-sleep \
+ systemd-socket-proxyd
systemgenerator_PROGRAMS = \
systemd-getty-generator \
systemd-fstab-generator \
systemd-system-update-generator
-systemd_analyze_SOURCES = \
- src/analyze/systemd-analyze.c
-
-systemd_analyze_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
-
-systemd_analyze_LDADD = \
- libsystemd-shared.la \
- libsystemd-dbus.la
-
dist_bashcompletion_DATA = \
shell-completion/bash/journalctl \
shell-completion/bash/systemctl \
shell-completion/bash/systemd-analyze \
+ shell-completion/bash/systemd-run \
shell-completion/bash/udevadm \
shell-completion/bash/kernel-install
shell-completion/zsh/_systemd-nspawn \
shell-completion/zsh/_systemd-analyze \
shell-completion/zsh/_sd_hosts_or_user_at_host \
+ shell-completion/zsh/_systemd-delta \
shell-completion/zsh/_systemd
dist_sysctl_DATA = \
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 \
make-directive-index.py \
xml_helper.py
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+ libsystemd-rtnl.la
+
+libsystemd_rtnl_la_SOURCES = \
+ src/systemd/sd-rtnl.h \
+ src/libsystemd-rtnl/sd-rtnl.c \
+ src/libsystemd-rtnl/rtnl-internal.h \
+ src/libsystemd-rtnl/rtnl-message.c
+
+test_rtnl_SOURCES = \
+ src/libsystemd-rtnl/test-rtnl.c
+
+test_rtnl_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-rtnl.la
+
+tests += test-rtnl
+
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
libsystemd-shared.la
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 \
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 \
src/core/syscall-list.h \
src/core/audit-fd.c \
src/core/audit-fd.h \
- src/core/sync.c \
- src/core/sync.h
+ src/core/async.c \
+ src/core/async.h
if HAVE_KMOD
libsystemd_core_la_SOURCES += \
src/core/syscall-list.txt: Makefile
$(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9(]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
+ $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9(]/ { sub(/__NR_/, "", $$2); if ($$2 !~ /SYSCALL_BASE/) print $$2; }' > $@
src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile
$(AM_V_at)$(MKDIR_P) $(dir $@)
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-strxcpyx \
test-unit-name \
test-unit-file \
+ test-utf8 \
+ test-ellipsize \
test-util \
+ test-namespace \
test-date \
test-sleep \
test-replace-var \
test-time \
test-hashmap \
test-list \
- test-tables
+ test-tables \
+ test-device-nodes
EXTRA_DIST += \
test/sched_idle_bad.service \
test/sched_rr_ok.service \
test/sched_rr_change.service
+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
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_unit_file_LDADD = \
libsystemd-core.la
+test_utf8_SOURCES = \
+ src/test/test-utf8.c
+
+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_namespace_SOURCES = \
+ src/test/test-namespace.c
+
+test_namespace_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
test_cgroup_util_LDADD = \
libsystemd-label.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-daemon.la
test_env_replace_SOURCES = \
src/test/test-env-replace.c
echo "Need to reconfigure with --enable-coverage"
endif
+# ------------------------------------------------------------------------------
+systemd_analyze_SOURCES = \
+ src/analyze/analyze.c
+
+systemd_analyze_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS)
+
+systemd_analyze_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-bus.la
+
# ------------------------------------------------------------------------------
systemd_initctl_SOURCES = \
src/initctl/initctl.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)
# ------------------------------------------------------------------------------
# ------------------------------------------------------------------------------
if ENABLE_TMPFILES
systemd_tmpfiles_SOURCES = \
- src/tmpfiles/tmpfiles.c
+ src/tmpfiles/tmpfiles.c \
+ src/shared/specifier.c \
+ src/shared/specifier.h
systemd_tmpfiles_LDADD = \
libsystemd-label.la \
libsystemd-shared.la \
- libsystemd-capability.la
+ libsystemd-capability.la \
+ libsystemd-id128-internal.la
rootbin_PROGRAMS += \
systemd-tmpfiles
systemd_fsck_LDADD = \
libsystemd-shared.la \
- libsystemd-dbus.la \
+ libsystemd-bus.la \
libudev.la
# ------------------------------------------------------------------------------
endif
# ------------------------------------------------------------------------------
+if HAVE_BLKID
systemgenerator_PROGRAMS += \
systemd-gpt-auto-generator
systemd_gpt_auto_generator_CFLAGS = \
$(AM_CFLAGS) \
$(BLKID_CFLAGS)
+endif
# ------------------------------------------------------------------------------
systemd_rc_local_generator_SOURCES = \
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 += \
$(sysconfdir)/udev/rules.d \
$(sysconfdir)/udev/hwdb.d
+dist_network_DATA = \
+ network/99-default.link
+
dist_udevrules_DATA += \
rules/99-systemd.rules \
rules/42-usb-hid-pm.rules \
rules/75-net-description.rules \
rules/75-tty-description.rules \
rules/78-sound-card.rules \
- rules/80-net-name-slot.rules \
+ rules/85-net-configure-link.rules \
rules/95-udev-late.rules
dist_udevhwdb_DATA = \
src/udev/udev-builtin-input_id.c \
src/udev/udev-builtin-keyboard.c \
src/udev/udev-builtin-net_id.c \
+ src/udev/udev-builtin-net_setup_link.c \
src/udev/udev-builtin-path_id.c \
- src/udev/udev-builtin-usb_id.c
+ src/udev/udev-builtin-usb_id.c \
+ src/udev/net/link-config.h \
+ src/udev/net/link-config.c \
+ src/udev/net/ethtool-util.h \
+ src/udev/net/ethtool-util.c
nodist_libudev_core_la_SOURCES = \
src/udev/keyboard-keys-from-name.h \
- src/udev/keyboard-keys-to-name.h
+ src/udev/keyboard-keys-to-name.h \
+ src/udev/net/link-config-gperf.c
BUILT_SOURCES += \
$(nodist_libudev_core_la_SOURCES)
CLEANFILES += \
src/udev/keyboard-keys-from-name.gperf \
- src/udev/keyboard-keys.txt
+ src/udev/keyboard-keys.txt \
+ src/udev/net/link-config-gperf.c
+
+EXTRA_DIST += \
+ src/udev/net/link-config-gperf.gperf
libudev_core_la_CFLAGS = \
$(AM_CFLAGS) \
libudev-private.la \
libsystemd-label.la \
libsystemd-daemon-internal.la \
- $(RT_LIBS) \
libsystemd-shared.la \
+ libsystemd-rtnl.la \
+ libsystemd-id128-internal.la \
$(BLKID_LIBS) \
$(KMOD_LIBS)
libudev_core_la_SOURCES += \
src/udev/udev-builtin-uaccess.c \
src/login/logind-acl.c \
- src/login/sd-login.c
+ src/login/sd-login.c \
+ src/systemd/sd-login.h \
+ src/login/login-shared.c \
+ src/login/login-shared.h
libudev_core_la_LIBADD += \
libsystemd-acl.la
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)
test_id128_LDADD = \
libsystemd-shared.la \
- libsystemd-id128-internal.la
+ libsystemd-id128-internal.la \
+ libsystemd-daemon.la
tests += \
test-id128
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 \
test_catalog_SOURCES = \
src/journal/test-catalog.c
+test_catalog_CFLAGS = \
+ $(AM_CFLAGS) \
+ -DCATALOG_DIR=\"$(abs_top_srcdir)/catalog\"
+
test_catalog_LDADD = \
libsystemd-shared.la \
libsystemd-label.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
systemd_localed_SOURCES = \
src/locale/localed.c
-systemd_localed_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
-
systemd_localed_LDADD = \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-dbus.la
+ libsystemd-bus.la
nodist_systemunit_DATA += \
units/systemd-localed.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 \
src/login/logind-seat.h \
src/login/logind-session.c \
src/login/logind-session.h \
+ src/login/logind-session-device.c \
+ src/login/logind-session-device.h \
src/login/logind-user.c \
src/login/logind-user.h \
src/login/logind-inhibit.c \
src/login/logind-session-dbus.c \
src/login/logind-seat-dbus.c \
src/login/logind-user-dbus.c \
- src/login/logind-acl.h
+ src/login/logind-acl.h \
+ src/login/login-shared.c \
+ src/login/login-shared.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
systemd_inhibit_LDADD = \
libsystemd-shared.la \
- libsystemd-dbus.la
+ libsystemd-bus.la
rootbin_PROGRAMS += \
systemd-inhibit
libsystemd-login-internal.la \
libsystemd-shared.la
+test_login_shared_SOURCES = \
+ src/login/test-login-shared.c
+
+test_login_shared_LDADD = \
+ libsystemd-login-internal.la \
+ libsystemd-shared.la
+
test_inhibit_SOURCES = \
src/login/test-inhibit.c
test-inhibit
tests += \
- test-login-tables
+ test-login-tables \
+ test-login-shared
libsystemd_login_la_SOURCES = \
- src/login/sd-login.c
+ src/login/sd-login.c \
+ src/systemd/sd-login.h \
+ src/login/login-shared.c \
+ src/login/login-shared.h
libsystemd_login_la_CFLAGS = \
$(AM_CFLAGS) \
pamlib_LTLIBRARIES = \
pam_systemd.la
+
+dist_pamconf_DATA = \
+ src/login/systemd-user
endif
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
clean-sphinx:
-rm -rf docs/html/python-systemd/
+# Remove Python stuff, e.g. to force rebuilding for a different Python version.
+clean-python:
+ -rm -rf src/python-systemd/.libs src/python-systemd/*.l[ao]
+ -rm -f _daemon.la id128.la _journal.la login.la _reader.la
+
# ------------------------------------------------------------------------------
substitutions = \
'|rootlibexecdir=$(rootlibexecdir)|' \
'|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)|' \
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 \
INSTALL_DIRS += \
$(prefix)/lib/modules-load.d \
$(sysconfdir)/modules-load.d \
+ $(prefix)/lib/systemd/network \
+ $(sysconfdir)/systemd/network \
$(prefix)/lib/sysctl.d \
$(sysconfdir)/sysctl.d \
$(prefix)/lib/kernel/install.d \
--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) \
+ --with-pamconfdir=$$dc_install_base/$(pamconfdir) \
--with-rootprefix=$$dc_install_base \
--disable-split-usr
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