X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=86bcfdfd8bcdbee29ced7839eb1a4b738aa57603;hp=f80ffc67491760535f4af0daa98b7b8ea1a859b4;hb=7a6f1457462840ed52f2a332e2bd56ca210cff2d;hpb=810626a80de8361dfbe27110d585023b3d6167a6 diff --git a/Makefile.am b/Makefile.am index f80ffc674..86bcfdfd8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,16 +39,16 @@ SUBDIRS = . po .PRECIOUS: $(TEST_SUITE_LOG) Makefile LIBUDEV_CURRENT=7 -LIBUDEV_REVISION=0 +LIBUDEV_REVISION=2 LIBUDEV_AGE=6 LIBGUDEV_CURRENT=2 LIBGUDEV_REVISION=0 LIBGUDEV_AGE=2 -LIBSYSTEMD_CURRENT=4 -LIBSYSTEMD_REVISION=0 -LIBSYSTEMD_AGE=4 +LIBSYSTEMD_CURRENT=5 +LIBSYSTEMD_REVISION=1 +LIBSYSTEMD_AGE=5 # The following four libraries only exist for compatibility reasons, # their version info should not be bumped anymore @@ -217,6 +217,7 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/libsystemd/sd-event \ -I $(top_srcdir)/src/libsystemd/sd-rtnl \ -I $(top_srcdir)/src/libsystemd/sd-network \ + -I $(top_srcdir)/src/libsystemd/sd-hwdb \ -I $(top_srcdir)/src/libsystemd-network \ -I $(top_srcdir)/src/libsystemd-terminal \ $(OUR_CPPFLAGS) @@ -250,6 +251,7 @@ SOCKETS_TARGET_WANTS = BUSNAMES_TARGET_WANTS = TIMERS_TARGET_WANTS = USER_SOCKETS_TARGET_WANTS = +USER_DEFAULT_TARGET_WANTS = USER_BUSNAMES_TARGET_WANTS = SYSTEM_UNIT_ALIASES = @@ -270,6 +272,7 @@ install-target-wants-hook: 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) @@ -378,12 +381,12 @@ rootlibexec_PROGRAMS = \ systemd \ systemd-cgroups-agent \ systemd-initctl \ - systemd-update-utmp \ systemd-shutdownd \ systemd-shutdown \ systemd-remount-fs \ systemd-reply-password \ systemd-fsck \ + systemd-machine-id-commit \ systemd-ac-power \ systemd-sysctl \ systemd-sleep \ @@ -391,6 +394,11 @@ rootlibexec_PROGRAMS = \ systemd-socket-proxyd \ systemd-update-done +if HAVE_UTMP +rootlibexec_PROGRAMS += \ + systemd-update-utmp +endif + systemgenerator_PROGRAMS = \ systemd-getty-generator \ systemd-fstab-generator \ @@ -517,8 +525,6 @@ nodist_systemunit_DATA = \ units/systemd-initctl.service \ units/systemd-shutdownd.service \ units/systemd-remount-fs.service \ - units/systemd-update-utmp.service \ - units/systemd-update-utmp-runlevel.service \ units/systemd-ask-password-wall.service \ units/systemd-ask-password-console.service \ units/systemd-sysctl.service \ @@ -532,10 +538,11 @@ nodist_systemunit_DATA = \ 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/systemd-udev-hwdb-update.service \ + units/systemd-hwdb-update.service \ units/debug-shell.service \ units/initrd-parse-etc.service \ units/initrd-cleanup.service \ @@ -544,6 +551,12 @@ nodist_systemunit_DATA = \ units/systemd-nspawn@.service \ units/systemd-update-done.service +if HAVE_UTMP +nodist_systemunit_DATA += \ + units/systemd-update-utmp.service \ + units/systemd-update-utmp-runlevel.service +endif + dist_userunit_DATA = \ units/user/basic.target \ units/user/default.target \ @@ -578,7 +591,8 @@ EXTRA_DIST += \ 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 \ @@ -704,7 +718,8 @@ man/systemd.directives.xml: $(top_srcdir)/tools/make-directive-index.py $(SOURCE 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 \ @@ -721,7 +736,6 @@ EXTRA_DIST += \ $(man_MANS) \ tools/make-man-index.py \ tools/make-directive-index.py \ - tools/make-man-rules.py \ tools/xml_helper.py # ------------------------------------------------------------------------------ @@ -729,20 +743,21 @@ noinst_LTLIBRARIES += \ 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 \ @@ -759,11 +774,12 @@ libsystemd_shared_la_SOURCES = \ 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 \ @@ -797,6 +813,7 @@ libsystemd_shared_la_SOURCES = \ 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 \ @@ -805,7 +822,6 @@ libsystemd_shared_la_SOURCES = \ src/shared/cgroup-show.h \ src/shared/unit-name.c \ src/shared/unit-name.h \ - src/shared/utmp-wtmp.c \ src/shared/utmp-wtmp.h \ src/shared/watchdog.c \ src/shared/watchdog.h \ @@ -846,12 +862,14 @@ libsystemd_shared_la_SOURCES = \ 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/json.c \ + src/shared/json.h \ src/shared/bus-label.c \ src/shared/bus-label.h \ src/shared/gpt.h \ @@ -871,13 +889,20 @@ libsystemd_shared_la_SOURCES = \ 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 + src/shared/nss-util.h \ + src/shared/btrfs-util.c \ + src/shared/btrfs-util.h \ + src/shared/verbs.c \ + src/shared/verbs.h + +if HAVE_UTMP +libsystemd_shared_la_SOURCES += \ + src/shared/utmp-wtmp.c +endif nodist_libsystemd_shared_la_SOURCES = \ src/shared/errno-from-name.h \ @@ -885,13 +910,19 @@ nodist_libsystemd_shared_la_SOURCES = \ 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 @@ -919,12 +950,16 @@ libsystemd_label_la_SOURCES = \ 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 @@ -971,21 +1006,6 @@ libsystemd_logs_la_SOURCES = \ 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 += \ @@ -1114,10 +1134,10 @@ libsystemd_core_la_SOURCES = \ 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 \ @@ -1131,12 +1151,6 @@ libsystemd_core_la_SOURCES = \ 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 @@ -1145,14 +1159,13 @@ libsystemd_core_la_CFLAGS = \ $(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 \ @@ -1160,10 +1173,10 @@ libsystemd_core_la_LIBADD = \ 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 += \ @@ -1187,8 +1200,10 @@ CLEANFILES += \ 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 \ @@ -1197,6 +1212,8 @@ BUILT_SOURCES += \ 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 @@ -1222,6 +1239,7 @@ src/shared/af-list.txt: 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 - $@ @@ -1233,6 +1251,20 @@ src/shared/arphrd-from-name.gperf: src/shared/arphrd-list.txt $(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 - $@ + +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, tolower($$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' <$< >$@ @@ -1293,7 +1325,8 @@ manual_tests += \ test-install \ test-watchdog \ test-log \ - test-ipcrm + test-ipcrm \ + test-btrfs if HAVE_KMOD manual_tests += \ @@ -1307,6 +1340,7 @@ tests += \ test-env-replace \ test-strbuf \ test-strv \ + test-path \ test-path-util \ test-strxcpyx \ test-unit-name \ @@ -1330,10 +1364,13 @@ tests += \ test-fileio \ test-time \ test-hashmap \ + test-set \ test-list \ + test-unaligned \ test-tables \ test-device-nodes \ test-xml \ + test-json \ test-architecture \ test-socket-util \ test-fdset \ @@ -1341,8 +1378,13 @@ tests += \ test-capability \ test-async \ test-ratelimit \ - test-condition-util \ - test-uid-range + test-condition \ + test-uid-range \ + test-bus-policy \ + test-locale-util \ + test-execute \ + test-copy \ + test-cap-list EXTRA_DIST += \ test/a.service \ @@ -1374,7 +1416,51 @@ EXTRA_DIST += \ test/sysinit.target \ test/testsuite.target \ test/timers.target \ - test/unstoppable.service + 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/exec-umask-0177.service \ + test/exec-umask-default.service \ + test/bus-policy/hello.conf \ + test/bus-policy/methods.conf \ + test/bus-policy/ownerships.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-helper.h @@ -1472,8 +1558,7 @@ test_capability_SOURCES = \ 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 @@ -1481,19 +1566,32 @@ test_async_SOURCES = \ 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 @@ -1505,31 +1603,38 @@ test_util_SOURCES = \ 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 @@ -1549,11 +1654,36 @@ test_namespace_SOURCES = \ 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 @@ -1561,11 +1691,24 @@ test_xml_SOURCES = \ test_xml_LDADD = \ libsystemd-shared.la +test_json_SOURCES = \ + src/test/test-json.c + +test_json_LDADD = \ + libsystemd-shared.la \ + -lm + test_list_SOURCES = \ 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 \ @@ -1595,19 +1738,19 @@ test_prioq_SOURCES = \ 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 @@ -1619,7 +1762,7 @@ test_log_SOURCES = \ src/test/test-log.c test_log_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_ipcrm_SOURCES = \ src/test/test-ipcrm.c @@ -1628,6 +1771,12 @@ test_ipcrm_LDADD = \ libsystemd-shared.la \ -lrt +test_btrfs_SOURCES = \ + src/test/test-btrfs.c + +test_btrfs_LDADD = \ + libsystemd-shared.la + test_rtnl_manual_SOURCES = \ src/test/test-rtnl-manual.c @@ -1644,13 +1793,13 @@ test_ellipsize_SOURCES = \ 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 @@ -1695,8 +1844,7 @@ test_cgroup_mask_SOURCES = \ 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) \ @@ -1740,6 +1888,24 @@ test_path_util_SOURCES = \ 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 @@ -1765,8 +1931,7 @@ test_sched_prio_SOURCES = \ 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) \ @@ -1782,6 +1947,15 @@ test_conf_files_SOURCES = \ test_conf_files_LDADD = \ libsystemd-shared.la +test_bus_policy_SOURCES = \ + src/bus-proxyd/test-bus-policy.c \ + src/bus-proxyd/bus-policy.c \ + src/bus-proxyd/bus-policy.h + +test_bus_policy_LDADD = \ + libsystemd-internal.la \ + libsystemd-shared.la + # ------------------------------------------------------------------------------ ## .PHONY so it always rebuilds it .PHONY: coverage lcov-run lcov-report coverage-sync @@ -1806,7 +1980,8 @@ lcov-report: $(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 @@ -1936,7 +2111,6 @@ systemd_tmpfiles_SOURCES = \ systemd_tmpfiles_LDADD = \ libsystemd-units.la \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -1957,7 +2131,6 @@ nodist_tmpfiles_DATA = \ 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 @@ -1999,7 +2172,6 @@ systemd_sysusers_SOURCES = \ systemd_sysusers_LDADD = \ libsystemd-units.la \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -2013,8 +2185,7 @@ SYSINIT_TARGET_WANTS += \ 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 @@ -2034,9 +2205,11 @@ endif dist_factory_etc_DATA = \ factory/etc/nsswitch.conf +if HAVE_PAM dist_factory_pam_DATA = \ factory/etc/pam.d/system-auth \ factory/etc/pam.d/other +endif # ------------------------------------------------------------------------------ if ENABLE_FIRSTBOOT @@ -2046,7 +2219,6 @@ systemd_firstboot_SOURCES = \ systemd_firstboot_LDADD = \ libsystemd-units.la \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la \ -lcrypt @@ -2098,6 +2270,20 @@ systemd_fsck_LDADD = \ 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 @@ -2259,8 +2445,8 @@ systemd_dbus1_generator_SOURCES = \ 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) @@ -2330,8 +2516,7 @@ systemctl_LDADD = \ # ------------------------------------------------------------------------------ systemd_notify_SOURCES = \ - src/notify/notify.c \ - src/readahead/sd-readahead.c + src/notify/notify.c systemd_notify_LDADD = \ libsystemd-internal.la \ @@ -2390,7 +2575,6 @@ systemd_nspawn_CFLAGS = \ systemd_nspawn_LDADD = \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libudev-internal.la \ libsystemd-shared.la \ @@ -2408,7 +2592,6 @@ systemd_run_SOURCES = \ systemd_run_LDADD = \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -2419,7 +2602,6 @@ systemd_bus_proxyd_SOURCES = \ src/bus-proxyd/bus-policy.h systemd_bus_proxyd_LDADD = \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -2441,13 +2623,26 @@ nodist_systemunit_DATA += \ 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 + +CLEANFILES += \ + units/systemd-bus-proxyd@.service.m4 + +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 = \ @@ -2471,11 +2666,14 @@ libsystemd_internal_la_SOURCES = \ src/systemd/sd-daemon.h \ src/systemd/sd-path.h \ src/systemd/sd-network.h \ + src/systemd/sd-hwdb.h \ src/libsystemd/sd-bus/sd-bus.c \ src/libsystemd/sd-bus/bus-control.c \ 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 \ @@ -2529,11 +2727,13 @@ libsystemd_internal_la_SOURCES = \ src/libsystemd/sd-path/sd-path.c \ src/libsystemd/sd-network/sd-network.c \ src/libsystemd/sd-network/network-util.h \ - src/libsystemd/sd-network/network-util.c + src/libsystemd/sd-network/network-util.c \ + src/libsystemd/sd-hwdb/sd-hwdb.c \ + src/libsystemd/sd-hwdb/hwdb-util.h \ + src/libsystemd/sd-hwdb/hwdb-internal.h 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) \ @@ -2561,23 +2761,17 @@ libsystemd_dump_la_SOURCES = \ 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 @@ -2656,6 +2850,7 @@ tests += \ test-bus-gvariant \ test-event \ test-rtnl \ + test-local-addresses \ test-resolve bin_PROGRAMS += \ @@ -2665,26 +2860,23 @@ test_bus_marshal_SOURCES = \ 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 @@ -2724,15 +2916,12 @@ test_bus_objects_SOURCES = \ 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 @@ -2745,26 +2934,22 @@ test_bus_gvariant_SOURCES = \ 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 @@ -2777,15 +2962,9 @@ test_bus_kernel_SOURCES = \ 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 @@ -2805,15 +2984,9 @@ test_bus_zero_copy_SOURCES = \ 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 @@ -2836,6 +3009,13 @@ test_rtnl_LDADD = \ 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 @@ -2849,18 +3029,14 @@ test_resolve_CFLAGS = \ -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 += \ @@ -2878,6 +3054,7 @@ libsystemd_network_la_SOURCES = \ 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 \ @@ -2892,6 +3069,7 @@ libsystemd_network_la_SOURCES = \ 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 \ @@ -2901,7 +3079,19 @@ libsystemd_network_la_SOURCES = \ src/libsystemd-network/dhcp6-network.c \ src/libsystemd-network/dhcp6-option.c \ src/libsystemd-network/dhcp6-lease-internal.h \ - src/libsystemd-network/sd-dhcp6-lease.c + src/libsystemd-network/sd-dhcp6-lease.c \ + src/libsystemd-network/lldp.h \ + src/libsystemd-network/lldp-tlv.h \ + src/libsystemd-network/lldp-tlv.c \ + src/libsystemd-network/lldp-network.h \ + src/libsystemd-network/lldp-network.c \ + src/libsystemd-network/lldp-port.h \ + src/libsystemd-network/lldp-port.c \ + src/libsystemd-network/lldp-internal.h \ + src/libsystemd-network/lldp-internal.c \ + src/libsystemd-network/lldp-util.h \ + src/libsystemd-network/sd-lldp.h \ + src/libsystemd-network/sd-lldp.c libsystemd_network_la_LIBADD = \ libudev-internal.la \ @@ -2951,6 +3141,14 @@ test_ipv4ll_LDADD = \ 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 \ @@ -2972,35 +3170,60 @@ test_dhcp6_client_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la +test_lldp_SOURCES = \ + src/libsystemd-network/lldp.h \ + src/libsystemd-network/lldp-tlv.h \ + src/libsystemd-network/lldp-tlv.c \ + src/libsystemd-network/test-lldp.c + +test_lldp_LDADD = \ + libsystemd-network.la \ + libsystemd-internal.la \ + libsystemd-shared.la + tests += \ test-dhcp-option \ test-dhcp-client \ test-dhcp-server \ test-ipv4ll \ test-icmp6-rs \ - test-dhcp6-client + test-dhcp6-client \ + test-lldp + +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 + tests += \ test-term-page \ test-term-parser \ test-unifont endif +EXTRA_DIST += \ + units/user/systemd-consoled.service.in + libsystemd_terminal_la_CFLAGS = \ $(AM_CFLAGS) \ $(TERMINAL_CFLAGS) @@ -3018,13 +3241,15 @@ libsystemd_terminal_la_SOURCES = \ 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 = \ @@ -3033,6 +3258,25 @@ 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) @@ -3124,7 +3368,6 @@ libudev_la_SOURCES =\ src/libudev/libudev-enumerate.c \ src/libudev/libudev-monitor.c \ src/libudev/libudev-queue.c \ - src/libudev/libudev-hwdb-def.h \ src/libudev/libudev-hwdb.c libudev_la_CFLAGS = \ @@ -3183,8 +3426,7 @@ libudev_internal_la_CFLAGS = \ # ------------------------------------------------------------------------------ INSTALL_DIRS += \ - $(sysconfdir)/udev/rules.d \ - $(sysconfdir)/udev/hwdb.d + $(sysconfdir)/udev/rules.d dist_network_DATA = \ network/99-default.link \ @@ -3196,6 +3438,7 @@ dist_udevrules_DATA += \ 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 \ @@ -3211,19 +3454,6 @@ dist_udevrules_DATA += \ nodist_udevrules_DATA += \ rules/99-systemd.rules -dist_udevhwdb_DATA = \ - hwdb/20-pci-vendor-model.hwdb \ - hwdb/20-pci-classes.hwdb \ - hwdb/20-usb-vendor-model.hwdb \ - hwdb/20-usb-classes.hwdb \ - hwdb/20-sdio-vendor-model.hwdb \ - hwdb/20-sdio-classes.hwdb \ - hwdb/20-bluetooth-vendor-product.hwdb \ - hwdb/20-acpi-vendor.hwdb \ - hwdb/20-OUI.hwdb \ - hwdb/20-net-ifname.hwdb \ - hwdb/60-keyboard.hwdb - udevconfdir = $(sysconfdir)/udev dist_udevconf_DATA = \ src/udev/udev.conf @@ -3243,14 +3473,12 @@ CLEANFILES += \ EXTRA_DIST += \ units/systemd-udevd.service.in \ units/systemd-udev-trigger.service.in \ - units/systemd-udev-settle.service.in \ - units/systemd-udev-hwdb-update.service.in + units/systemd-udev-settle.service.in CLEANFILES += \ units/systemd-udevd.service \ units/systemd-udev-trigger.service \ - units/systemd-udev-settle.service \ - units/systemd-udev-hwdb-update.service + units/systemd-udev-settle.service SOCKETS_TARGET_WANTS += \ systemd-udevd-control.socket \ @@ -3258,8 +3486,7 @@ SOCKETS_TARGET_WANTS += \ SYSINIT_TARGET_WANTS += \ systemd-udevd.service \ - systemd-udev-trigger.service \ - systemd-udev-hwdb-update.service + systemd-udev-trigger.service rootbin_PROGRAMS += \ udevadm @@ -3373,15 +3600,56 @@ udevadm_SOURCES = \ 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 +# ------------------------------------------------------------------------------ +INSTALL_DIRS += \ + $(sysconfdir)/udev/hwdb.d + +systemd_hwdb_SOURCES = \ + src/libsystemd/sd-hwdb/hwdb-internal.h \ + src/hwdb/hwdb.c + +systemd_hwdb_LDADD = \ + libsystemd-shared.la \ + libsystemd-internal.la \ + libudev-internal.la + +rootbin_PROGRAMS += \ + systemd-hwdb + +dist_udevhwdb_DATA = \ + hwdb/20-pci-vendor-model.hwdb \ + hwdb/20-pci-classes.hwdb \ + hwdb/20-usb-vendor-model.hwdb \ + hwdb/20-usb-classes.hwdb \ + hwdb/20-sdio-vendor-model.hwdb \ + hwdb/20-sdio-classes.hwdb \ + hwdb/20-bluetooth-vendor-product.hwdb \ + hwdb/20-acpi-vendor.hwdb \ + hwdb/20-OUI.hwdb \ + hwdb/20-net-ifname.hwdb \ + hwdb/60-keyboard.hwdb \ + hwdb/70-mouse.hwdb + +EXTRA_DIST += \ + units/systemd-hwdb-update.service.in + +CLEANFILES += \ + units/systemd-hwdb-update.service + +SYSINIT_TARGET_WANTS += \ + systemd-hwdb-update.service + # Update hwdb on installation. Do not bother if installing # in DESTDIR, since this is likely for packaging purposes. hwdb-update-hook: - -test -n "$(DESTDIR)" || $(rootbindir)/udevadm hwdb --update + -test -n "$(DESTDIR)" || $(rootbindir)/systemd-hwdb update INSTALL_DATA_HOOKS += \ hwdb-update-hook @@ -3404,13 +3672,14 @@ test_libudev_SOURCES = \ test_libudev_LDADD = \ libsystemd-label.la \ libudev-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-internal.la test_udev_SOURCES = \ src/test/test-udev.c test_udev_LDADD = \ - libudev-core.la \ + libudev-core.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) \ $(SELINUX_LIBS) @@ -3745,6 +4014,16 @@ systemd_journal_remote_CFLAGS = \ 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) @@ -3792,7 +4071,6 @@ systemd_journal_upload_CFLAGS = \ $(LIBCURL_CFLAGS) systemd_journal_upload_LDADD = \ - libsystemd-core.la \ libsystemd-internal.la \ libsystemd-journal-internal.la \ libsystemd-shared.la \ @@ -3949,6 +4227,8 @@ libsystemd_journal_core_la_SOURCES = \ 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 @@ -3959,7 +4239,6 @@ nodist_libsystemd_journal_core_la_SOURCES = \ libsystemd_journal_core_la_LIBADD = \ libsystemd-journal-internal.la \ libudev-internal.la \ - libsystemd-capability.la \ libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -4100,7 +4379,8 @@ bin_PROGRAMS += \ 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 \ @@ -4112,13 +4392,15 @@ dist_pkgsysconf_DATA += \ dist_catalog_DATA = \ catalog/systemd.fr.catalog \ - catalog/systemd.ru.catalog \ catalog/systemd.it.catalog \ + catalog/systemd.pl.catalog \ + catalog/systemd.ru.catalog \ catalog/systemd.catalog 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 \ @@ -4309,63 +4591,19 @@ rootlibexec_PROGRAMS += \ nodist_systemunit_DATA += \ units/systemd-vconsole-setup.service +nodist_udevrules_DATA += \ + src/vconsole/90-vconsole.rules + SYSINIT_TARGET_WANTS += \ systemd-vconsole-setup.service -endif - -EXTRA_DIST += \ - units/systemd-vconsole-setup.service.in - -# ------------------------------------------------------------------------------ -if ENABLE_READAHEAD -systemd_readahead_SOURCES = \ - src/readahead/readahead.c \ - src/readahead/readahead-collect.c \ - src/readahead/readahead-replay.c \ - src/readahead/readahead-analyze.c \ - src/readahead/readahead-common.c \ - src/readahead/readahead-common.h - -systemd_readahead_LDADD = \ - libsystemd-internal.la \ - libudev-internal.la \ - libsystemd-shared.la - -dist_doc_DATA += \ - src/readahead/sd-readahead.c \ - src/systemd/sd-readahead.h - -rootlibexec_PROGRAMS += \ - systemd-readahead - -dist_systemunit_DATA += \ - units/systemd-readahead-drop.service \ - units/systemd-readahead-done.timer - -nodist_systemunit_DATA += \ - units/systemd-readahead-collect.service \ - units/systemd-readahead-replay.service \ - units/systemd-readahead-done.service - -manual_tests += \ - test-ssd - -test_ssd_SOURCES = \ - src/readahead/test-ssd.c \ - src/readahead/readahead-common.c \ - src/readahead/readahead-common.h - -test_ssd_LDADD = \ - libsystemd-internal.la \ - libudev-internal.la \ - libsystemd-shared.la +CLEANFILES += \ + src/vconsole/90-vconsole.rules endif EXTRA_DIST += \ - units/systemd-readahead-collect.service.in \ - units/systemd-readahead-replay.service.in \ - units/systemd-readahead-done.service.in + src/vconsole/90-vconsole.rules.in \ + units/systemd-vconsole-setup.service.in # ------------------------------------------------------------------------------ if ENABLE_BOOTCHART @@ -4386,6 +4624,15 @@ rootlibexec_PROGRAMS += \ 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 # ------------------------------------------------------------------------------ @@ -4582,7 +4829,12 @@ systemd_localed_SOURCES = \ 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 @@ -4721,7 +4973,6 @@ systemd_timesyncd_LDADD = \ libsystemd-resolve.la \ libsystemd-network.la \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la \ -lm @@ -4784,10 +5035,13 @@ rootlibexec_PROGRAMS += \ systemd-machined libsystemd_machine_core_la_SOURCES = \ - src/machine/machined-dbus.c \ src/machine/machine.c \ src/machine/machine.h \ - src/machine/machine-dbus.c + src/machine/image.c \ + src/machine/image.h \ + src/machine/machined-dbus.c \ + src/machine/machine-dbus.c \ + src/machine/image-dbus.c libsystemd_machine_core_la_LIBADD = \ libsystemd-label.la \ @@ -4867,6 +5121,32 @@ libnss_mymachines_la_LIBADD = \ lib_LTLIBRARIES += \ libnss_mymachines.la + +if HAVE_LIBCURL + +bin_PROGRAMS += \ + systemd-import + +systemd_import_SOURCES = \ + src/import/import.c \ + src/import/import-dck.c \ + src/import/import-dck.h \ + src/import/curl-util.c \ + src/import/curl-util.h \ + src/import/aufs-util.c \ + src/import/aufs-util.h + +systemd_import_CFLAGS = \ + $(AM_CFLAGS) \ + $(LIBCURL_CFLAGS) + +systemd_import_LDADD = \ + libsystemd-internal.la \ + libsystemd-shared.la \ + $(LIBCURL_LIBS) \ + -lm +endif + endif # ------------------------------------------------------------------------------ @@ -4922,7 +5202,6 @@ CLEANFILES += \ src/resolve/resolved-gperf.c systemd_resolved_LDADD = \ - libsystemd-capability.la \ libsystemd-network.la \ libsystemd-label.la \ libsystemd-internal.la \ @@ -4975,7 +5254,6 @@ test_dns_domain_SOURCES = \ src/resolve/test-dns-domain.c test_dns_domain_LDADD = \ - libsystemd-capability.la \ libsystemd-network.la \ libsystemd-label.la \ libsystemd-internal.la \ @@ -5039,8 +5317,7 @@ systemd_networkd_SOURCES = \ src/network/networkd.c systemd_networkd_LDADD = \ - libsystemd-networkd-core.la \ - libsystemd-capability.la + libsystemd-networkd-core.la noinst_LTLIBRARIES += \ libsystemd-networkd-core.la @@ -5075,10 +5352,12 @@ libsystemd_networkd_core_la_SOURCES = \ 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 \ src/network/networkd-manager.c \ + src/network/networkd-fdb.c \ src/network/networkd-address-pool.c nodist_libsystemd_networkd_core_la_SOURCES = \ @@ -5127,9 +5406,6 @@ networkctl_LDADD = \ test_network_SOURCES = \ src/network/test-network.c -test_network_CFLAGS = \ - $(AM_CFLAGS) - test_network_LDADD = \ libsystemd-networkd-core.la @@ -5202,7 +5478,6 @@ libsystemd_logind_core_la_SOURCES = \ libsystemd_logind_core_la_LIBADD = \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libudev-internal.la \ libsystemd-shared.la @@ -5311,7 +5586,6 @@ pam_systemd_la_LDFLAGS = \ -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) @@ -5358,20 +5632,6 @@ SYSTEM_UNIT_ALIASES += \ 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 @@ -5779,6 +6039,10 @@ src/%: src/%.m4 $(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) < $< > $@ @@ -5788,7 +6052,7 @@ units/%: units/%.m4 $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ -units/user/%: units/%.m4 +units/user/%: units/user/%.m4 $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ @@ -5891,6 +6155,7 @@ SOCKETS_TARGET_WANTS += \ systemd-initctl.socket \ systemd-shutdownd.socket +if HAVE_UTMP if HAVE_SYSV_COMPAT RUNLEVEL1_TARGET_WANTS += \ systemd-update-utmp-runlevel.service @@ -5905,7 +6170,10 @@ RUNLEVEL5_TARGET_WANTS += \ endif SYSINIT_TARGET_WANTS += \ - systemd-update-utmp.service \ + systemd-update-utmp.service +endif + +SYSINIT_TARGET_WANTS += \ systemd-update-done.service LOCAL_FS_TARGET_WANTS += \ @@ -6094,10 +6362,13 @@ doc-sync: all destdir-sphinx rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/ rsync -rlv --delete --omit-dir-times docs/html/python-systemd/ $(www_target)/python-systemd/ -.PHONY: tango -tango: upload +.PHONY: gardel +gardel: upload + scp man/*.html gardel:public/systemd-man/ + +.PHONY: lennart-fedora +lennart-fedora: cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/ - scp man/*.html tango:public/systemd-man/ .PHONY: install-tree install-tree: all @@ -6216,3 +6487,6 @@ print-%: git-contrib: @git shortlog -s `git describe --abbrev=0`.. | cut -c8- | awk '{ print $$0 "," }' | sort -u + +EXTRA_DIST += \ + tools/gdb-sd_dump_hashmaps.py