.PRECIOUS: $(TEST_SUITE_LOG) Makefile
LIBUDEV_CURRENT=7
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=1
LIBUDEV_AGE=6
LIBGUDEV_CURRENT=2
LIBGUDEV_REVISION=0
LIBGUDEV_AGE=2
-LIBSYSTEMD_CURRENT=4
+LIBSYSTEMD_CURRENT=5
LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=4
+LIBSYSTEMD_AGE=5
# The following four libraries only exist for compatibility reasons,
# their version info should not be bumped anymore
BUSNAMES_TARGET_WANTS =
TIMERS_TARGET_WANTS =
USER_SOCKETS_TARGET_WANTS =
+USER_DEFAULT_TARGET_WANTS =
USER_BUSNAMES_TARGET_WANTS =
SYSTEM_UNIT_ALIASES =
what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants)
what="$(SLICES_TARGET_WANTS)" && wants=slices.target && dir=$(systemunitdir) && $(add-wants)
what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants)
+ what="$(USER_DEFAULT_TARGET_WANTS)" && wants=default.target && dir=$(userunitdir) && $(add-wants)
install-busnames-target-wants-hook:
what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants)
systemd-remount-fs \
systemd-reply-password \
systemd-fsck \
+ systemd-machine-id-commit \
systemd-ac-power \
systemd-sysctl \
systemd-sleep \
units/systemd-kexec.service \
units/systemd-fsck@.service \
units/systemd-fsck-root.service \
+ units/systemd-machine-id-commit.service \
units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
units/user/systemd-exit.service.in \
units/systemd-fsck@.service.in \
units/systemd-fsck-root.service.in \
- units/user@.service.in \
+ units/systemd-machine-id-commit.service.in \
+ units/user@.service.m4.in \
units/debug-shell.service.in \
units/systemd-suspend.service.in \
units/quotaon.service.in \
EXTRA_DIST += \
man/systemd.index.xml \
man/index.html \
- man/systemd.directives.xml
+ man/systemd.directives.xml \
+ man/glib-event-glue.c
CLEANFILES += \
man/systemd.index.xml \
libsystemd-shared.la
libsystemd_shared_la_SOURCES = \
+ src/shared/capability.c \
+ src/shared/capability.h \
src/shared/linux/auto_dev-ioctl.h \
- src/shared/linux/fanotify.h \
src/shared/ioprio.h \
src/shared/missing.h \
src/shared/initreq.h \
src/shared/securebits.h \
src/shared/special.h \
src/shared/list.h \
+ src/shared/unaligned.h \
src/shared/macro.h \
src/shared/def.h \
src/shared/sparse-endian.h \
src/shared/refcnt.h \
src/shared/udev-util.h \
- src/shared/bus-errors.h \
src/shared/device-nodes.c \
src/shared/device-nodes.h \
src/shared/util.c \
src/shared/time-util.h \
src/shared/locale-util.c \
src/shared/locale-util.h \
+ src/shared/mempool.c \
+ src/shared/mempool.h \
src/shared/hashmap.c \
src/shared/hashmap.h \
src/shared/siphash24.c \
src/shared/siphash24.h \
- src/shared/set.c \
src/shared/set.h \
src/shared/fdset.c \
src/shared/fdset.h \
src/shared/socket-util.h \
src/shared/in-addr-util.c \
src/shared/in-addr-util.h \
+ src/shared/ether-addr-util.h \
src/shared/conf-files.c \
src/shared/conf-files.h \
src/shared/cgroup-util.c \
src/shared/af-list.h \
src/shared/arphrd-list.c \
src/shared/arphrd-list.h \
+ src/shared/cap-list.c \
+ src/shared/cap-list.h \
src/shared/audit.c \
src/shared/audit.h \
src/shared/xml.c \
src/shared/xml.h \
- src/shared/condition-util.c \
- src/shared/condition-util.h \
src/shared/bus-label.c \
src/shared/bus-label.h \
src/shared/gpt.h \
src/shared/copy.h \
src/shared/base-filesystem.c \
src/shared/base-filesystem.h \
- src/shared/memfd.c \
- src/shared/memfd.h \
+ src/shared/memfd-util.c \
+ src/shared/memfd-util.h \
src/shared/uid-range.c \
src/shared/uid-range.h \
- src/shared/switch-root.h \
- src/shared/switch-root.c \
src/shared/nss-util.h
if HAVE_UTMP
src/shared/af-from-name.h \
src/shared/af-to-name.h \
src/shared/arphrd-from-name.h \
- src/shared/arphrd-to-name.h
+ src/shared/arphrd-to-name.h \
+ src/shared/cap-from-name.h \
+ src/shared/cap-to-name.h
libsystemd_shared_la_CFLAGS = \
$(AM_CFLAGS) \
+ $(CAP_CFLAGS) \
$(SECCOMP_CFLAGS) \
-pthread
+libsystemd_shared_la_LIBADD = \
+ $(CAP_LIBS)
+
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
libsystemd-units.la
src/shared/mkdir-label.c \
src/shared/ask-password-api.c \
src/shared/ask-password-api.h \
+ src/shared/switch-root.h \
+ src/shared/switch-root.c \
src/shared/fileio-label.c \
src/shared/fileio-label.h \
src/shared/dev-setup.c \
src/shared/dev-setup.h \
src/shared/dropin.c \
src/shared/dropin.h \
+ src/shared/condition.c \
+ src/shared/condition.h \
src/shared/generator.h \
src/shared/generator.c
src/shared/logs-show.c \
src/shared/logs-show.h
-# ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
- libsystemd-capability.la
-
-libsystemd_capability_la_SOURCES = \
- src/shared/capability.c \
- src/shared/capability.h
-
-libsystemd_capability_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(CAP_CFLAGS)
-
-libsystemd_capability_la_LIBADD = \
- $(CAP_LIBS)
-
# ------------------------------------------------------------------------------
if HAVE_ACL
noinst_LTLIBRARIES += \
src/core/machine-id-setup.h \
src/core/mount-setup.c \
src/core/mount-setup.h \
+ src/core/kmod-setup.c \
+ src/core/kmod-setup.h \
src/core/loopback-setup.h \
src/core/loopback-setup.c \
- src/core/condition.c \
- src/core/condition.h \
src/core/namespace.c \
src/core/namespace.h \
src/core/build.h \
src/core/failure-action.c \
src/core/failure-action.h
-if HAVE_KMOD
-libsystemd_core_la_SOURCES += \
- src/core/kmod-setup.c \
- src/core/kmod-setup.h
-endif
-
nodist_libsystemd_core_la_SOURCES = \
src/core/load-fragment-gperf.c \
src/core/load-fragment-gperf-nulstr.c
$(AM_CFLAGS) \
$(PAM_CFLAGS) \
$(AUDIT_CFLAGS) \
- $(CAP_CFLAGS) \
$(KMOD_CFLAGS) \
$(APPARMOR_CFLAGS) \
$(SECCOMP_CFLAGS) \
+ $(MOUNT_CFLAGS) \
-pthread
libsystemd_core_la_LIBADD = \
- libsystemd-capability.la \
libsystemd-units.la \
libsystemd-label.la \
libudev-internal.la \
libsystemd-internal.la \
$(PAM_LIBS) \
$(AUDIT_LIBS) \
- $(CAP_LIBS) \
$(KMOD_LIBS) \
$(APPARMOR_LIBS) \
- $(SECCOMP_LIBS)
+ $(SECCOMP_LIBS) \
+ $(MOUNT_LIBS)
if HAVE_SECCOMP
libsystemd_core_la_LIBADD += \
src/shared/af-from-name.gperf \
src/shared/arphrd-list.txt \
src/shared/arphrd-from-name.gperf \
- src/shared/dns_type-list.txt \
- src/shared/dns_type-from-name.gperf
+ src/shared/cap-list.txt \
+ src/shared/cap-from-name.gperf \
+ src/resolve/dns_type-list.txt \
+ src/resolve/dns_type-from-name.gperf
BUILT_SOURCES += \
src/shared/errno-from-name.h \
src/shared/af-to-name.h \
src/shared/arphrd-from-name.h \
src/shared/arphrd-to-name.h \
+ src/shared/cap-from-name.h \
+ src/shared/cap-to-name.h \
src/resolve/dns_type-from-name.h \
src/resolve/dns_type-to-name.h
src/shared/af-to-name.h: src/shared/af-list.txt
$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const af_names[] = { "} !/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
+
src/shared/arphrd-list.txt:
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include net/if_arp.h - </dev/null | $(AWK) '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $$2; }' | sed -e 's/ARPHRD_//' >$@
$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct arphrd_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, ARPHRD_%s\n", $$1, $$1 }' <$< >$@
+src/shared/cap-list.txt:
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/capability.h -include missing.h - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@
+
+src/shared/cap-to-name.h: src/shared/cap-list.txt
+ $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
+
+src/shared/cap-from-name.gperf: src/shared/cap-list.txt
+ $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct capability_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@
+
+src/shared/cap-from-name.h: src/shared/cap-from-name.gperf
+ $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@
+
+
src/resolve/dns_type-list.txt: src/resolve/dns-type.h
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)$(SED) -n -r 's/.* DNS_TYPE_(\w+).*/\1/p' <$< >$@
test-env-replace \
test-strbuf \
test-strv \
+ test-path \
test-path-util \
test-strxcpyx \
test-unit-name \
test-fileio \
test-time \
test-hashmap \
+ test-set \
test-list \
+ test-unaligned \
test-tables \
test-device-nodes \
test-xml \
test-capability \
test-async \
test-ratelimit \
- test-condition-util \
+ test-condition \
test-uid-range \
- test-bus-policy
+ test-bus-policy \
+ test-locale-util \
+ test-execute \
+ test-copy \
+ test-cap-list
EXTRA_DIST += \
test/a.service \
test/testsuite.target \
test/timers.target \
test/unstoppable.service \
+ test/path-changed.service \
+ test/path-directorynotempty.service \
+ test/path-existsglob.service \
+ test/path-exists.service \
+ test/path-makedirectory.service \
+ test/path-modified.service \
+ test/path-mycustomunit.service \
+ test/path-service.service \
+ test/path-changed.path \
+ test/path-directorynotempty.path \
+ test/path-existsglob.path \
+ test/path-exists.path \
+ test/path-makedirectory.path \
+ test/path-modified.path \
+ test/path-unit.path \
+ test/exec-environment-empty.service \
+ test/exec-environment-multiple.service \
+ test/exec-environment.service \
+ test/exec-group.service \
+ test/exec-ignoresigpipe-no.service \
+ test/exec-ignoresigpipe-yes.service \
+ test/exec-personality-x86-64.service \
+ test/exec-personality-x86.service \
+ test/exec-privatedevices-no.service \
+ test/exec-privatedevices-yes.service \
+ test/exec-privatetmp-no.service \
+ test/exec-privatetmp-yes.service \
+ test/exec-systemcallerrornumber.service \
+ test/exec-systemcallfilter-failing2.service \
+ test/exec-systemcallfilter-failing.service \
+ test/exec-systemcallfilter-not-failing2.service \
+ test/exec-systemcallfilter-not-failing.service \
+ test/exec-user.service \
+ test/exec-workingdirectory.service \
test/bus-policy/hello.conf \
test/bus-policy/methods.conf \
test/bus-policy/ownerships.conf \
- test/bus-policy/signals.conf
+ test/bus-policy/signals.conf \
+ test/bus-policy/check-own-rules.conf \
+ test/bus-policy/many-rules.conf \
+ test/bus-policy/test.conf
EXTRA_DIST += \
src/test/test-capability.c
test_capability_LDADD = \
- libsystemd-shared.la \
- libsystemd-capability.la
+ libsystemd-shared.la
test_async_SOURCES = \
src/test/test-async.c
test_async_LDADD = \
libsystemd-shared.la
-test_condition_util_SOURCES = \
- src/test/test-condition-util.c
+test_locale_util_SOURCES = \
+ src/test/test-locale-util.c
-test_condition_util_LDADD = \
- libsystemd-shared.la \
- libsystemd-internal.la
+test_locale_util_LDADD = \
+ libsystemd-shared.la
+test_copy_SOURCES = \
+ src/test/test-copy.c
+
+test_copy_LDADD = \
+ libsystemd-shared.la
+
+test_condition_SOURCES = \
+ src/test/test-condition.c
+
+test_condition_LDADD = \
+ libsystemd-label.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la
test_fdset_SOURCES = \
src/test/test-fdset.c
test_fdset_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la \
+ libsystemd-internal.la
test_ratelimit_SOURCES = \
src/test/test-ratelimit.c
src/test/test-util.c
test_util_LDADD = \
- libsystemd-core.la
+ -lm \
+ libsystemd-shared.la
test_uid_range_SOURCES = \
src/test/test-uid-range.c
test_uid_range_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
+
+test_cap_list_SOURCES = \
+ src/test/test-cap-list.c
+
+test_cap_list_LDADD = \
+ libsystemd-shared.la
test_socket_util_SOURCES = \
src/test/test-socket-util.c
test_socket_util_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
test_ring_SOURCES = \
src/test/test-ring.c
test_ring_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
test_barrier_SOURCES = \
src/test/test-barrier.c
test_barrier_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
test_pty_SOURCES = \
src/test/test-pty.c
test_namespace_LDADD = \
libsystemd-core.la
+CLEANFILES += \
+ src/test/test-hashmap-ordered.c
+
+BUILT_SOURCES += \
+ src/test/test-hashmap-ordered.c
+
+src/test/test-hashmap-ordered.c: src/test/test-hashmap-plain.c
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_GEN)$(AWK) 'BEGIN { print "/* GENERATED FILE */\n#define ORDERED" } \
+ { if (!match($$0, "^#include")) \
+ gsub(/hashmap/, "ordered_hashmap"); \
+ gsub(/HASHMAP/, "ORDERED_HASHMAP"); \
+ gsub(/Hashmap/, "OrderedHashmap"); \
+ print }' <$< >$@
+
+nodist_test_hashmap_SOURCES = \
+ src/test/test-hashmap-ordered.c
+
test_hashmap_SOURCES = \
- src/test/test-hashmap.c
+ src/test/test-hashmap.c \
+ src/test/test-hashmap-plain.c
test_hashmap_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
+
+test_set_SOURCES = \
+ src/test/test-set.c
+
+test_set_LDADD = \
+ libsystemd-shared.la
test_xml_SOURCES = \
src/test/test-xml.c
src/test/test-list.c
test_list_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
+
+test_unaligned_LDADD = \
+ libsystemd-shared.la
+
+test_unaligned_SOURCES = \
+ src/test/test-unaligned.c
test_tables_SOURCES = \
src/test/test-tables.c \
src/test/test-prioq.c
test_prioq_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
test_fileio_SOURCES = \
src/test/test-fileio.c
test_fileio_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
test_time_SOURCES = \
src/test/test-time.c
test_time_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
test_architecture_SOURCES = \
src/test/test-architecture.c
src/test/test-log.c
test_log_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
test_ipcrm_SOURCES = \
src/test/test-ipcrm.c
src/test/test-ellipsize.c
test_ellipsize_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
test_date_SOURCES = \
src/test/test-date.c
test_date_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
test_sleep_SOURCES = \
src/test/test-sleep.c
src/test/test-cgroup-mask.c
test_cgroup_mask_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -DTEST_DIR=\"$(abs_top_srcdir)/test\"
+ $(AM_CPPFLAGS)
test_cgroup_mask_CFLAGS = \
$(AM_CFLAGS) \
test_path_util_LDADD = \
libsystemd-shared.la
+test_path_SOURCES = \
+ src/test/test-path.c
+
+test_path_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_path_LDADD = \
+ libsystemd-core.la
+
+test_execute_SOURCES = \
+ src/test/test-execute.c
+
+test_execute_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_execute_LDADD = \
+ libsystemd-core.la
+
test_strxcpyx_SOURCES = \
src/test/test-strxcpyx.c
src/test/test-sched-prio.c
test_sched_prio_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -DTEST_DIR=\"$(abs_top_srcdir)/test\"
+ $(AM_CPPFLAGS)
test_sched_prio_CFLAGS = \
$(AM_CFLAGS) \
src/bus-proxyd/bus-policy.h
test_bus_policy_LDADD = \
- libsystemd-capability.la \
libsystemd-internal.la \
libsystemd-shared.la
$(MKDIR_P) $(coverage_dir)
lcov $(coverage_opts) --compat-libtool --capture --no-external \
| sed 's|$(abspath $(builddir))|$(abspath $(srcdir))|' > $(coverage_dir)/.lcov.info
- genhtml -t "systemd test coverage" -o $(coverage_dir) $(coverage_dir)/.lcov.info
+ lcov --remove $(coverage_dir)/.lcov.info --output-file $(coverage_dir)/.lcov-clean.info 'test-*'
+ genhtml -t "systemd test coverage" -o $(coverage_dir) $(coverage_dir)/.lcov-clean.info
@echo "Coverage report generated in $(abs_builddir)/$(coverage_dir)/index.html"
# lcov doesn't work properly with vpath builds, make sure that bad
systemd_tmpfiles_LDADD = \
libsystemd-units.la \
libsystemd-label.la \
- libsystemd-capability.la \
libsystemd-internal.la \
libsystemd-shared.la
dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
tmpfiles.d/systemd-nologin.conf \
- tmpfiles.d/systemd-remote.conf \
tmpfiles.d/tmp.conf \
tmpfiles.d/x11.conf \
tmpfiles.d/var.conf
systemd_sysusers_LDADD = \
libsystemd-units.la \
libsystemd-label.la \
- libsystemd-capability.la \
libsystemd-internal.la \
libsystemd-shared.la
systemd-sysusers.service
dist_sysusers_DATA = \
- sysusers.d/systemd.conf \
- sysusers.d/systemd-remote.conf
+ sysusers.d/systemd.conf
nodist_sysusers_DATA = \
sysusers.d/basic.conf
systemd_firstboot_LDADD = \
libsystemd-units.la \
libsystemd-label.la \
- libsystemd-capability.la \
libsystemd-internal.la \
libsystemd-shared.la \
-lcrypt
libudev-internal.la \
libsystemd-shared.la
+# ------------------------------------------------------------------------------
+systemd_machine_id_commit_SOURCES = \
+ src/machine-id-commit/machine-id-commit.c \
+ src/core/machine-id-setup.c \
+ src/core/machine-id-setup.h
+
+systemd_machine_id_commit_LDADD = \
+ libsystemd-label.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la
+
+SYSINIT_TARGET_WANTS += \
+ systemd-machine-id-commit.service
+
# ------------------------------------------------------------------------------
systemd_ac_power_SOURCES = \
src/ac-power/ac-power.c
systemd_dbus1_generator_LDADD = \
libsystemd-label.la \
- libsystemd-shared.la \
- libsystemd-internal.la
+ libsystemd-internal.la \
+ libsystemd-shared.la
dbus1-generator-install-hook:
$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
systemd_nspawn_LDADD = \
libsystemd-label.la \
- libsystemd-capability.la \
libsystemd-internal.la \
libudev-internal.la \
libsystemd-shared.la \
systemd_run_LDADD = \
libsystemd-label.la \
- libsystemd-capability.la \
libsystemd-internal.la \
libsystemd-shared.la
src/bus-proxyd/bus-policy.h
systemd_bus_proxyd_LDADD = \
- libsystemd-capability.la \
libsystemd-internal.la \
libsystemd-shared.la
dist_systemunit_DATA += \
units/systemd-bus-proxyd.socket
-dist_userunit_DATA += \
- units/user/systemd-bus-proxyd.socket \
+nodist_userunit_DATA += \
units/user/systemd-bus-proxyd@.service
+
+dist_userunit_DATA += \
+ units/user/systemd-bus-proxyd.socket
endif
EXTRA_DIST += \
- units/systemd-bus-proxyd@.service.in
+ units/systemd-bus-proxyd@.service.m4.in \
+ units/user/systemd-bus-proxyd@.service.in
+
+if HAVE_SMACK
+bus-proxyd-set-cap-hook:
+ -$(SETCAP) cap_mac_admin+ei $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd
+
+INSTALL_EXEC_HOOKS += bus-proxyd-set-cap-hook
+endif
# ------------------------------------------------------------------------------
systemd_tty_ask_password_agent_SOURCES = \
src/libsystemd/sd-bus/bus-control.h \
src/libsystemd/sd-bus/bus-error.c \
src/libsystemd/sd-bus/bus-error.h \
+ src/libsystemd/sd-bus/bus-common-errors.h \
+ src/libsystemd/sd-bus/bus-common-errors.c \
src/libsystemd/sd-bus/bus-internal.c \
src/libsystemd/sd-bus/bus-internal.h \
src/libsystemd/sd-bus/bus-socket.c \
src/libsystemd/sd-network/network-util.c
nodist_libsystemd_internal_la_SOURCES = \
- src/libsystemd/libsystemd.sym \
- src/libsystemd/sd-bus/bus-error-mapping.c
+ src/libsystemd/libsystemd.sym
libsystemd_internal_la_CFLAGS = \
$(AM_CFLAGS) \
src/libsystemd/sd-bus/bus-dump.c \
src/libsystemd/sd-bus/bus-dump.h
-libsystemd_dump_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(CAP_CFLAGS)
-
noinst_LTLIBRARIES += \
libsystemd-dump.la
EXTRA_DIST += \
src/libsystemd/libsystemd.sym.m4 \
src/libsystemd/libsystemd.pc.in \
- src/libsystemd/sd-bus/bus-error-mapping.gperf \
src/libsystemd/sd-bus/DIFFERENCES \
src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
CLEANFILES += \
- src/libsystemd/libsystemd.sym \
- src/libsystemd/sd-bus/bus-error-mapping.c
+ src/libsystemd/libsystemd.sym
BUILT_SOURCES += \
src/libsystemd/libsystemd.sym
test-bus-gvariant \
test-event \
test-rtnl \
+ test-local-addresses \
test-resolve
bin_PROGRAMS += \
src/libsystemd/sd-bus/test-bus-marshal.c
test_bus_marshal_LDADD = \
+ libsystemd-dump.la \
libsystemd-internal.la \
libsystemd-shared.la \
- libsystemd-dump.la \
- libsystemd-capability.la \
$(GLIB_LIBS) \
- $(DBUS_LIBS) \
- $(CAP_LIBS)
+ $(DBUS_LIBS)
test_bus_marshal_CFLAGS = \
$(AM_CFLAGS) \
$(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(CAP_CFLAGS)
+ $(DBUS_CFLAGS)
test_bus_signature_SOURCES = \
src/libsystemd/sd-bus/test-bus-signature.c
test_bus_signature_LDADD = \
- libsystemd-shared.la \
- libsystemd-internal.la
+ libsystemd-internal.la \
+ libsystemd-shared.la
test_bus_chat_SOURCES = \
src/libsystemd/sd-bus/test-bus-chat.c
test_bus_objects_CFLAGS = \
$(AM_CFLAGS) \
- $(CAP_CFLAGS) \
-pthread
test_bus_objects_LDADD = \
- libsystemd-internal.la \
- libsystemd-shared.la \
libsystemd-dump.la \
- libsystemd-capability.la \
- $(CAP_LIBS)
+ libsystemd-internal.la \
+ libsystemd-shared.la
test_bus_error_SOURCES = \
src/libsystemd/sd-bus/test-bus-error.c
src/libsystemd/sd-bus/test-bus-gvariant.c
test_bus_gvariant_LDADD = \
+ libsystemd-dump.la \
libsystemd-internal.la \
libsystemd-shared.la \
- libsystemd-dump.la \
- libsystemd-capability.la \
- $(GLIB_LIBS) \
- $(CAP_LIBS)
+ $(GLIB_LIBS)
test_bus_gvariant_CFLAGS = \
$(AM_CFLAGS) \
$(GLIB_CFLAGS)
- $(CAP_CFLAGS)
test_bus_creds_SOURCES = \
src/libsystemd/sd-bus/test-bus-creds.c
test_bus_creds_LDADD = \
- libsystemd-internal.la \
- libsystemd-shared.la \
libsystemd-dump.la \
- libsystemd-capability.la
+ libsystemd-internal.la \
+ libsystemd-shared.la
test_bus_match_SOURCES = \
src/libsystemd/sd-bus/test-bus-match.c
src/libsystemd/sd-bus/test-bus-kernel.c
test_bus_kernel_LDADD = \
- libsystemd-internal.la \
- libsystemd-shared.la \
libsystemd-dump.la \
- libsystemd-capability.la \
- $(CAP_LIBS)
-
-test_bus_kernel_CFLAGS = \
- $(AM_CFLAGS) \
- $(CAP_CFLAGS)
+ libsystemd-internal.la \
+ libsystemd-shared.la
test_bus_kernel_bloom_SOURCES = \
src/libsystemd/sd-bus/test-bus-kernel-bloom.c
src/libsystemd/sd-bus/test-bus-zero-copy.c
test_bus_zero_copy_LDADD = \
- libsystemd-internal.la \
- libsystemd-shared.la \
libsystemd-dump.la \
- libsystemd-capability.la \
- $(CAP_LIBS)
-
-test_bus_zero_copy_CFLAGS = \
- $(AM_CFLAGS) \
- $(CAP_CFLAGS)
+ libsystemd-internal.la \
+ libsystemd-shared.la
test_bus_introspect_SOURCES = \
src/libsystemd/sd-bus/test-bus-introspect.c
libsystemd-internal.la \
libsystemd-shared.la
+test_local_addresses_SOURCES = \
+ src/libsystemd/sd-rtnl/test-local-addresses.c
+
+test_local_addresses_LDADD = \
+ libsystemd-internal.la \
+ libsystemd-shared.la
+
test_resolve_SOURCES = \
src/libsystemd/sd-resolve/test-resolve.c
-pthread
busctl_SOURCES = \
- src/libsystemd/sd-bus/busctl.c
+ src/libsystemd/sd-bus/busctl.c \
+ src/libsystemd/sd-bus/busctl-introspect.c \
+ src/libsystemd/sd-bus/busctl-introspect.h
busctl_LDADD = \
- libsystemd-internal.la \
- libsystemd-shared.la \
libsystemd-dump.la \
- libsystemd-capability.la \
- $(CAP_LIBS)
-
-busctl_CFLAGS = \
- $(AM_CFLAGS) \
- $(CAP_CFLAGS)
+ libsystemd-internal.la \
+ libsystemd-shared.la
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
src/systemd/sd-icmp6-nd.h \
src/systemd/sd-dhcp6-client.h \
src/systemd/sd-dhcp6-lease.h \
+ src/systemd/sd-pppoe.h \
src/libsystemd-network/sd-dhcp-client.c \
src/libsystemd-network/sd-dhcp-server.c \
src/libsystemd-network/dhcp-network.c \
src/libsystemd-network/ipv4ll-network.c \
src/libsystemd-network/ipv4ll-packet.c \
src/libsystemd-network/ipv4ll-internal.h \
+ src/libsystemd-network/sd-pppoe.c \
src/libsystemd-network/network-internal.c \
src/libsystemd-network/network-internal.h \
src/libsystemd-network/sd-icmp6-nd.c \
libsystemd-internal.la \
libsystemd-shared.la
+test_pppoe_SOURCES = \
+ src/systemd/sd-pppoe.h \
+ src/libsystemd-network/test-pppoe.c
+
+test_pppoe_LDADD = \
+ libsystemd-network.la \
+ libsystemd-shared.la
+
test_icmp6_rs_SOURCES = \
src/systemd/sd-dhcp6-client.h \
src/systemd/sd-icmp6-nd.h \
test-icmp6-rs \
test-dhcp6-client
+manual_tests += \
+ test-pppoe
+
# ------------------------------------------------------------------------------
if ENABLE_TERMINAL
noinst_LTLIBRARIES += \
libsystemd-terminal.la
+rootlibexec_PROGRAMS += \
+ systemd-consoled
+
noinst_PROGRAMS += \
systemd-evcat \
systemd-modeset \
systemd-subterm
-unifontdatadir=$(datadir)/unifont
-
-dist_unifontdata_DATA = \
+dist_pkgdata_DATA += \
src/libsystemd-terminal/unifont-glyph-array.bin
+nodist_userunit_DATA += \
+ units/user/systemd-consoled.service
+
+USER_DEFAULT_TARGET_WANTS += \
+ systemd-consoled.service
+
+EXTRA_DIST += \
+ units/user/systemd-consoled.service.in
+
tests += \
test-term-page \
test-term-parser \
src/libsystemd-terminal/sysview.h \
src/libsystemd-terminal/sysview-internal.h \
src/libsystemd-terminal/sysview.c \
+ src/libsystemd-terminal/term.h \
src/libsystemd-terminal/term-internal.h \
src/libsystemd-terminal/term-charset.c \
src/libsystemd-terminal/term-page.c \
src/libsystemd-terminal/term-parser.c \
src/libsystemd-terminal/term-screen.c \
src/libsystemd-terminal/term-wcwidth.c \
- src/libsystemd-terminal/unifont-internal.h \
+ src/libsystemd-terminal/unifont.h \
+ src/libsystemd-terminal/unifont-def.h \
src/libsystemd-terminal/unifont.c
libsystemd_terminal_la_LIBADD = \
libsystemd-shared.la \
$(TERMINAL_LIBS)
+systemd_consoled_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(TERMINAL_CFLAGS)
+
+systemd_consoled_SOURCES = \
+ src/console/consoled.h \
+ src/console/consoled.c \
+ src/console/consoled-display.c \
+ src/console/consoled-manager.c \
+ src/console/consoled-session.c \
+ src/console/consoled-terminal.c \
+ src/console/consoled-workspace.c
+
+systemd_consoled_LDADD = \
+ libsystemd-terminal.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la \
+ $(TERMINAL_LIBS)
+
systemd_evcat_CFLAGS = \
$(AM_CFLAGS) \
$(TERMINAL_CFLAGS)
rules/50-udev-default.rules \
rules/60-drm.rules \
rules/60-keyboard.rules \
+ rules/70-mouse.rules \
rules/60-persistent-storage-tape.rules \
rules/60-persistent-serial.rules \
rules/60-persistent-input.rules \
hwdb/20-acpi-vendor.hwdb \
hwdb/20-OUI.hwdb \
hwdb/20-net-ifname.hwdb \
- hwdb/60-keyboard.hwdb
+ hwdb/60-keyboard.hwdb \
+ hwdb/70-mouse.hwdb
udevconfdir = $(sysconfdir)/udev
dist_udevconf_DATA = \
src/udev/udevadm-settle.c \
src/udev/udevadm-trigger.c \
src/udev/udevadm-test.c \
- src/udev/udevadm-test-builtin.c
+ src/udev/udevadm-test-builtin.c \
+ src/udev/udevadm-util.c \
+ src/udev/udevadm-util.h
udevadm_LDADD = \
libudev-core.la
src/test/test-udev.c
test_udev_LDADD = \
- libudev-core.la \
+ libudev-core.la \
$(BLKID_LIBS) \
$(KMOD_LIBS) \
$(SELINUX_LIBS)
systemd_journal_remote_LDADD += \
$(MICROHTTPD_LIBS)
+if ENABLE_SYSUSERS
+dist_sysusers_DATA += \
+ sysusers.d/systemd-remote.conf
+endif
+
+if ENABLE_TMPFILES
+dist_tmpfiles_DATA += \
+ tmpfiles.d/systemd-remote.conf
+endif
+
if HAVE_GNUTLS
systemd_journal_remote_LDADD += \
$(GNUTLS_LIBS)
$(LIBCURL_CFLAGS)
systemd_journal_upload_LDADD = \
- libsystemd-core.la \
libsystemd-internal.la \
libsystemd-journal-internal.la \
libsystemd-shared.la \
src/journal/journald-wall.h \
src/journal/journald-native.c \
src/journal/journald-native.h \
+ src/journal/journald-audit.c \
+ src/journal/journald-audit.h \
src/journal/journald-rate-limit.c \
src/journal/journald-rate-limit.h \
src/journal/journal-internal.h
libsystemd_journal_core_la_LIBADD = \
libsystemd-journal-internal.la \
libudev-internal.la \
- libsystemd-capability.la \
libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
dist_systemunit_DATA += \
units/systemd-journald.socket \
- units/systemd-journald-dev-log.socket
+ units/systemd-journald-dev-log.socket \
+ units/systemd-journald-audit.socket
nodist_systemunit_DATA += \
units/systemd-journald.service \
SOCKETS_TARGET_WANTS += \
systemd-journald.socket \
- systemd-journald-dev-log.socket
+ systemd-journald-dev-log.socket \
+ systemd-journald-audit.socket
SYSINIT_TARGET_WANTS += \
systemd-journald.service \
nodist_systemunit_DATA += \
units/systemd-vconsole-setup.service
+nodist_udevrules_DATA += \
+ src/vconsole/90-vconsole.rules
+
SYSINIT_TARGET_WANTS += \
systemd-vconsole-setup.service
+
+CLEANFILES += \
+ src/vconsole/90-vconsole.rules
endif
EXTRA_DIST += \
+ src/vconsole/90-vconsole.rules.in \
units/systemd-vconsole-setup.service.in
# ------------------------------------------------------------------------------
dist_pkgsysconf_DATA += \
src/bootchart/bootchart.conf
+
+nodist_systemunit_DATA += \
+ units/systemd-bootchart.service
+
+EXTRA_DIST += \
+ units/systemd-bootchart.service.in
+
+CLEANFILES += \
+ units/systemd-bootchart.service
endif
# ------------------------------------------------------------------------------
systemd_localed_LDADD = \
libsystemd-label.la \
libsystemd-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ $(XKBCOMMON_LIBS)
+
+systemd_localed_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(XKBCOMMON_CFLAGS)
nodist_systemunit_DATA += \
units/systemd-localed.service
libsystemd-resolve.la \
libsystemd-network.la \
libsystemd-label.la \
- libsystemd-capability.la \
libsystemd-internal.la \
libsystemd-shared.la \
-lm
src/resolve/resolved-gperf.c
systemd_resolved_LDADD = \
- libsystemd-capability.la \
libsystemd-network.la \
libsystemd-label.la \
libsystemd-internal.la \
src/resolve/test-dns-domain.c
test_dns_domain_LDADD = \
- libsystemd-capability.la \
libsystemd-network.la \
libsystemd-label.la \
libsystemd-internal.la \
src/network/networkd.c
systemd_networkd_LDADD = \
- libsystemd-networkd-core.la \
- libsystemd-capability.la
+ libsystemd-networkd-core.la
noinst_LTLIBRARIES += \
libsystemd-networkd-core.la
src/network/networkd-link.c \
src/network/networkd-ipv4ll.c \
src/network/networkd-dhcp4.c \
+ src/network/networkd-dhcp6.c \
src/network/networkd-network.c \
src/network/networkd-address.c \
src/network/networkd-route.c \
test_network_SOURCES = \
src/network/test-network.c
-test_network_CFLAGS = \
- $(AM_CFLAGS)
-
test_network_LDADD = \
libsystemd-networkd-core.la
libsystemd_logind_core_la_LIBADD = \
libsystemd-label.la \
- libsystemd-capability.la \
libsystemd-internal.la \
libudev-internal.la \
libsystemd-shared.la
-Wl,--version-script=$(top_srcdir)/src/login/pam_systemd.sym
pam_systemd_la_LIBADD = \
- libsystemd-capability.la \
libsystemd-internal.la \
libsystemd-shared.la \
$(PAM_LIBS)
BUSNAMES_TARGET_WANTS += \
org.freedesktop.login1.busname
-if ENABLE_MULTI_SEAT_X
-
-systemd_multi_seat_x_SOURCES = \
- src/login/multi-seat-x.c
-
-systemd_multi_seat_x_LDADD = \
- libsystemd-label.la \
- libsystemd-shared.la
-
-rootlibexec_PROGRAMS += \
- systemd-multi-seat-x
-
-endif
-
dist_udevrules_DATA += \
src/login/70-uaccess.rules \
src/login/70-power-switch.rules
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
+sysusers.d/%: sysusers.d/%.m4
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
+
tmpfiles.d/%: tmpfiles.d/%.m4
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
git-contrib:
@git shortlog -s `git describe --abbrev=0`.. | cut -c8- | awk '{ print $$0 "," }' | sort -u
+
+EXTRA_DIST += \
+ tools/gdb-sd_dump_hashmaps.py
~ianmdlvl / elogind.git / blobdiff