X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=791508bb0ffa827eb3134d8ea11c924f6bb97467;hb=7d4fb3b1c5ec7a117bd5a36e4591819a64e00136;hp=4fe766aa638609f4f16268e7fa3ce49859e03b9b;hpb=4851ac45269f539ff8c90fe686178128584b820c;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 4fe766aa6..791508bb0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,6 +24,9 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} AM_MAKEFLAGS = --no-print-directory AUTOMAKE_OPTIONS = color-tests parallel-tests +GCC_COLORS ?= 'ooh, shiny!' +export GCC_COLORS + SUBDIRS = . po # remove targets if the command fails @@ -35,14 +38,20 @@ SUBDIRS = . po # Keep the test-suite.log .PRECIOUS: $(TEST_SUITE_LOG) Makefile -LIBUDEV_CURRENT=5 -LIBUDEV_REVISION=0 -LIBUDEV_AGE=4 +LIBUDEV_CURRENT=7 +LIBUDEV_REVISION=1 +LIBUDEV_AGE=6 LIBGUDEV_CURRENT=2 LIBGUDEV_REVISION=0 LIBGUDEV_AGE=2 +LIBSYSTEMD_CURRENT=5 +LIBSYSTEMD_REVISION=0 +LIBSYSTEMD_AGE=5 + +# The following four libraries only exist for compatibility reasons, +# their version info should not be bumped anymore LIBSYSTEMD_LOGIN_CURRENT=9 LIBSYSTEMD_LOGIN_REVISION=3 LIBSYSTEMD_LOGIN_AGE=9 @@ -59,10 +68,6 @@ LIBSYSTEMD_JOURNAL_CURRENT=11 LIBSYSTEMD_JOURNAL_REVISION=5 LIBSYSTEMD_JOURNAL_AGE=11 -LIBSYSTEMD_CURRENT=1 -LIBSYSTEMD_REVISION=0 -LIBSYSTEMD_AGE=1 - # Dirs of external packages dbuspolicydir=@dbuspolicydir@ dbussessionservicedir=@dbussessionservicedir@ @@ -86,7 +91,10 @@ pkgsysconfdir=$(sysconfdir)/systemd userunitdir=$(prefix)/lib/systemd/user userpresetdir=$(prefix)/lib/systemd/user-preset tmpfilesdir=$(prefix)/lib/tmpfiles.d +sysusersdir=$(prefix)/lib/sysusers.d sysctldir=$(prefix)/lib/sysctl.d +binfmtdir=$(prefix)/lib/binfmt.d +modulesloaddir=$(prefix)/lib/modules-load.d networkdir=$(rootprefix)/lib/systemd/network pkgincludedir=$(includedir)/systemd systemgeneratordir=$(rootlibexecdir)/system-generators @@ -101,6 +109,8 @@ udevrulesdir=$(udevlibexecdir)/rules.d udevhwdbdir=$(udevlibexecdir)/hwdb.d catalogdir=$(prefix)/lib/systemd/catalog kernelinstalldir = $(prefix)/lib/kernel/install.d +factory_etcdir = $(prefix)/share/factory/etc +factory_pamdir = $(prefix)/share/factory/etc/pam.d # And these are the special ones for / rootprefix=@rootprefix@ @@ -129,9 +139,11 @@ polkitpolicy_files = dist_udevrules_DATA = nodist_udevrules_DATA = dist_pkgsysconf_DATA = +nodist_pkgsysconf_DATA = dist_pkgdata_DATA = dist_dbuspolicy_DATA = dist_dbussystemservice_DATA = +dist_systemunit_DATA_busnames = check_PROGRAMS = check_DATA = tests= @@ -158,6 +170,7 @@ AM_CPPFLAGS = \ -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \ -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \ -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \ + -DCERTIFICATE_ROOT=\"$(CERTIFICATEROOT)\" \ -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" \ -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \ -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \ @@ -180,6 +193,9 @@ AM_CPPFLAGS = \ -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \ -DQUOTACHECK=\"$(QUOTACHECK)\" \ -DKEXEC=\"$(KEXEC)\" \ + -DLIBDIR=\"$(libdir)\" \ + -DROOTLIBDIR=\"$(rootlibdir)\" \ + -DTEST_DIR=\"$(abs_top_srcdir)/test\" \ -I $(top_srcdir)/src \ -I $(top_builddir)/src/shared \ -I $(top_srcdir)/src/shared \ @@ -187,6 +203,9 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/login \ -I $(top_srcdir)/src/journal \ -I $(top_srcdir)/src/timedate \ + -I $(top_srcdir)/src/timesync \ + -I $(top_srcdir)/src/resolve \ + -I $(top_builddir)/src/resolve \ -I $(top_srcdir)/src/systemd \ -I $(top_builddir)/src/core \ -I $(top_srcdir)/src/core \ @@ -197,7 +216,9 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/libsystemd/sd-bus \ -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-network \ + -I $(top_srcdir)/src/libsystemd-terminal \ $(OUR_CPPFLAGS) AM_CFLAGS = $(OUR_CFLAGS) @@ -229,6 +250,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 = @@ -246,10 +268,13 @@ install-target-wants-hook: what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && dir=$(systemunitdir) && $(add-wants) what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && dir=$(systemunitdir) && $(add-wants) what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(systemunitdir) && $(add-wants) - what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants) 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) what="$(USER_BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(userunitdir) && $(add-wants) define add-wants @@ -290,10 +315,19 @@ define install-relative-aliases done endef +install-touch-usr-hook: + touch -c $(DESTDIR)/$(prefix) + INSTALL_EXEC_HOOKS += \ install-target-wants-hook \ install-directories-hook \ - install-aliases-hook + install-aliases-hook \ + install-touch-usr-hook + +if ENABLE_KDBUS +INSTALL_EXEC_HOOKS += \ + install-busnames-target-wants-hook +endif # ------------------------------------------------------------------------------ AM_V_M4 = $(AM_V_M4_$(V)) @@ -322,7 +356,8 @@ rootbin_PROGRAMS = \ systemd-notify \ systemd-ask-password \ systemd-tty-ask-password-agent \ - systemd-machine-id-setup + systemd-machine-id-setup \ + systemd-escape bin_PROGRAMS = \ systemd-cgls \ @@ -331,7 +366,8 @@ bin_PROGRAMS = \ systemd-detect-virt \ systemd-delta \ systemd-analyze \ - systemd-run + systemd-run \ + systemd-path dist_bin_SCRIPTS = \ src/kernel-install/kernel-install @@ -344,7 +380,6 @@ rootlibexec_PROGRAMS = \ systemd \ systemd-cgroups-agent \ systemd-initctl \ - systemd-update-utmp \ systemd-shutdownd \ systemd-shutdown \ systemd-remount-fs \ @@ -354,17 +389,23 @@ rootlibexec_PROGRAMS = \ systemd-sysctl \ systemd-sleep \ systemd-bus-proxyd \ - systemd-socket-proxyd + systemd-socket-proxyd \ + systemd-update-done + +if HAVE_UTMP +rootlibexec_PROGRAMS += \ + systemd-update-utmp +endif systemgenerator_PROGRAMS = \ systemd-getty-generator \ systemd-fstab-generator \ - systemd-system-update-generator + systemd-system-update-generator \ + systemd-debug-generator dist_bashcompletion_DATA = \ shell-completion/bash/busctl \ shell-completion/bash/journalctl \ - shell-completion/bash/systemctl \ shell-completion/bash/systemd-analyze \ shell-completion/bash/systemd-cat \ shell-completion/bash/systemd-cgls \ @@ -376,8 +417,10 @@ dist_bashcompletion_DATA = \ shell-completion/bash/udevadm \ shell-completion/bash/kernel-install +nodist_bashcompletion_DATA = \ + shell-completion/bash/systemctl + dist_zshcompletion_DATA = \ - shell-completion/zsh/_systemctl \ shell-completion/zsh/_journalctl \ shell-completion/zsh/_udevadm \ shell-completion/zsh/_kernel-install \ @@ -385,16 +428,28 @@ dist_zshcompletion_DATA = \ shell-completion/zsh/_systemd-analyze \ shell-completion/zsh/_systemd-run \ shell-completion/zsh/_sd_hosts_or_user_at_host \ + shell-completion/zsh/_sd_outputmodes \ + shell-completion/zsh/_sd_unit_files \ shell-completion/zsh/_systemd-delta \ shell-completion/zsh/_systemd +nodist_zshcompletion_DATA = \ + shell-completion/zsh/_systemctl + +EXTRA_DIST += \ + shell-completion/bash/systemctl.in \ + shell-completion/zsh/_systemctl.in + +CLEANFILES += \ + $(nodist_bashcompletion_DATA) \ + $(nodist_zshcompletion_DATA) + dist_sysctl_DATA = \ sysctl.d/50-default.conf dist_systemunit_DATA = \ units/graphical.target \ units/multi-user.target \ - units/emergency.service \ units/emergency.target \ units/sysinit.target \ units/basic.target \ @@ -409,11 +464,10 @@ dist_systemunit_DATA = \ units/remote-fs.target \ units/remote-fs-pre.target \ units/network.target \ + units/network-pre.target \ units/network-online.target \ units/nss-lookup.target \ units/nss-user-lookup.target \ - units/hibernate.target \ - units/hybrid-sleep.target \ units/poweroff.target \ units/reboot.target \ units/rescue.target \ @@ -425,7 +479,6 @@ dist_systemunit_DATA = \ units/sigpwr.target \ units/sleep.target \ units/sockets.target \ - units/busnames.target \ units/timers.target \ units/paths.target \ units/suspend.target \ @@ -453,6 +506,14 @@ dist_systemunit_DATA = \ units/system-update.target \ units/initrd-switch-root.target +if ENABLE_KDBUS +dist_systemunit_DATA += \ + $(dist_systemunit_DATA_busnames) +endif + +dist_systemunit_DATA_busnames += \ + units/busnames.target + nodist_systemunit_DATA = \ units/getty@.service \ units/serial-getty@.service \ @@ -462,16 +523,12 @@ 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 \ units/emergency.service \ units/rescue.service \ units/user@.service \ - units/systemd-hibernate.service \ - units/systemd-hybrid-sleep.service \ units/systemd-suspend.service \ units/systemd-halt.service \ units/systemd-poweroff.service \ @@ -482,12 +539,20 @@ nodist_systemunit_DATA = \ units/systemd-udevd.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service \ + units/systemd-udev-hwdb-update.service \ units/debug-shell.service \ units/initrd-parse-etc.service \ units/initrd-cleanup.service \ units/initrd-udevadm-cleanup-db.service \ units/initrd-switch-root.service \ - units/systemd-nspawn@.service + 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 \ @@ -497,13 +562,16 @@ dist_userunit_DATA = \ nodist_userunit_DATA = \ units/user/systemd-exit.service +dist_systempreset_DATA = \ + system-preset/90-systemd.preset + EXTRA_DIST += \ units/getty@.service.m4 \ units/serial-getty@.service.m4 \ units/console-shell.service.m4.in \ units/console-getty.service.m4.in \ units/container-getty@.service.m4.in \ - units/rescue.service.m4.in \ + units/rescue.service.in \ units/systemd-initctl.service.in \ units/systemd-shutdownd.service.in \ units/systemd-remount-fs.service.in \ @@ -522,21 +590,19 @@ EXTRA_DIST += \ units/systemd-fsck-root.service.in \ units/user@.service.in \ units/debug-shell.service.in \ - units/systemd-hibernate.service.in \ - units/systemd-hybrid-sleep.service.in \ units/systemd-suspend.service.in \ units/quotaon.service.in \ units/initrd-parse-etc.service.in \ units/initrd-cleanup.service.in \ units/initrd-udevadm-cleanup-db.service.in \ units/initrd-switch-root.service.in \ - units/systemd-nspawn@.service.in + units/systemd-nspawn@.service.in \ + units/systemd-update-done.service.in CLEANFILES += \ units/console-shell.service.m4 \ units/console-getty.service.m4 \ units/container-getty@.service.m4 \ - units/rescue.service.m4 \ units/user@.service.m4 if HAVE_SYSV_COMPAT @@ -545,6 +611,7 @@ nodist_systemunit_DATA += \ units/halt-local.service systemgenerator_PROGRAMS += \ + systemd-sysv-generator \ systemd-rc-local-generator endif @@ -647,7 +714,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 \ @@ -664,7 +732,6 @@ EXTRA_DIST += \ $(man_MANS) \ tools/make-man-index.py \ tools/make-directive-index.py \ - tools/make-man-rules.py \ tools/xml_helper.py # ------------------------------------------------------------------------------ @@ -672,20 +739,23 @@ 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/bus-errors.c \ src/shared/device-nodes.c \ src/shared/device-nodes.h \ src/shared/util.c \ @@ -700,11 +770,14 @@ libsystemd_shared_la_SOURCES = \ src/shared/path-util.h \ src/shared/time-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 \ @@ -736,6 +809,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/pager.h \ src/shared/socket-util.c \ src/shared/socket-util.h \ + src/shared/in-addr-util.c \ + src/shared/in-addr-util.h \ src/shared/conf-files.c \ src/shared/conf-files.h \ src/shared/cgroup-util.c \ @@ -744,7 +819,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 \ @@ -754,8 +828,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/replace-var.h \ src/shared/spawn-polkit-agent.c \ src/shared/spawn-polkit-agent.h \ - src/shared/hwclock.c \ - src/shared/hwclock.h \ + src/shared/clock-util.c \ + src/shared/clock-util.h \ src/shared/time-dst.c \ src/shared/time-dst.h \ src/shared/calendarspec.c \ @@ -783,31 +857,58 @@ libsystemd_shared_la_SOURCES = \ src/shared/errno-list.h \ src/shared/af-list.c \ src/shared/af-list.h \ + src/shared/arphrd-list.c \ + src/shared/arphrd-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/generator.h \ - src/shared/generator.c \ src/shared/clean-ipc.h \ src/shared/clean-ipc.c \ src/shared/login-shared.c \ - src/shared/login-shared.h + src/shared/login-shared.h \ + src/shared/ring.c \ + src/shared/ring.h \ + src/shared/barrier.c \ + src/shared/barrier.h \ + src/shared/pty.c \ + src/shared/pty.h \ + src/shared/async.c \ + src/shared/async.h \ + src/shared/copy.c \ + src/shared/copy.h \ + src/shared/base-filesystem.c \ + src/shared/base-filesystem.h \ + src/shared/memfd-util.c \ + src/shared/memfd-util.h \ + src/shared/uid-range.c \ + src/shared/uid-range.h \ + src/shared/nss-util.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 \ src/shared/errno-to-name.h \ src/shared/af-from-name.h \ - src/shared/af-to-name.h + src/shared/af-to-name.h \ + src/shared/arphrd-from-name.h \ + src/shared/arphrd-to-name.h libsystemd_shared_la_CFLAGS = \ $(AM_CFLAGS) \ - $(SECCOMP_CFLAGS) + $(CAP_CFLAGS) \ + $(SECCOMP_CFLAGS) \ + -pthread + +libsystemd_shared_la_LIBADD = \ + $(CAP_LIBS) # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ @@ -836,10 +937,18 @@ 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/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 libsystemd_label_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -848,6 +957,16 @@ libsystemd_label_la_CFLAGS = \ libsystemd_label_la_LIBADD = \ $(SELINUX_LIBS) +# ----------------------------------------------------------------------------- + +if ENABLE_LDCONFIG +dist_systemunit_DATA += \ + units/ldconfig.service + +SYSINIT_TARGET_WANTS += \ + ldconfig.service +endif + # ------------------------------------------------------------------------------ if HAVE_SECCOMP @@ -874,21 +993,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 += \ @@ -929,6 +1033,10 @@ libsystemd_core_la_SOURCES = \ src/core/socket.h \ src/core/busname.c \ src/core/busname.h \ + src/core/bus-common.c \ + src/core/bus-common.h \ + src/core/bus-endpoint.c \ + src/core/bus-endpoint.h \ src/core/target.c \ src/core/target.h \ src/core/snapshot.c \ @@ -1013,30 +1121,22 @@ 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 \ src/core/sysfs-show.h \ - src/core/switch-root.h \ - src/core/switch-root.c \ src/core/killall.h \ src/core/killall.c \ src/core/audit-fd.c \ src/core/audit-fd.h \ - src/core/async.c \ - src/core/async.h \ src/core/show-status.c \ - src/core/show-status.h - -if HAVE_KMOD -libsystemd_core_la_SOURCES += \ - src/core/kmod-setup.c \ - src/core/kmod-setup.h -endif + src/core/show-status.h \ + src/core/failure-action.c \ + src/core/failure-action.h nodist_libsystemd_core_la_SOURCES = \ src/core/load-fragment-gperf.c \ @@ -1046,14 +1146,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 \ @@ -1061,10 +1160,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 += \ @@ -1085,45 +1184,64 @@ CLEANFILES += \ src/shared/errno-list.txt \ src/shared/errno-from-name.gperf \ src/shared/af-list.txt \ - src/shared/af-from-name.gperf + 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 BUILT_SOURCES += \ src/shared/errno-from-name.h \ src/shared/errno-to-name.h \ src/shared/af-from-name.h \ - src/shared/af-to-name.h + src/shared/af-to-name.h \ + src/shared/arphrd-from-name.h \ + src/shared/arphrd-to-name.h \ + src/resolve/dns_type-from-name.h \ + src/resolve/dns_type-to-name.h -src/shared/errno-list.txt: - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - < /dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+[0-9]/ { print $$2; }' > $@ +%-from-name.gperf: %-list.txt + $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct $(notdir $*)_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@ + +%-from-name.h: %-from-name.gperf + $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_$(notdir $*) -H hash_$(notdir $*)_name -p -C <$< >$@ -src/shared/errno-from-name.gperf: src/shared/errno-list.txt - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct errno_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' < $< > $@ -src/shared/errno-from-name.h: src/shared/errno-from-name.gperf +src/shared/errno-list.txt: $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_errno -H hash_errno_name -p -C < $< > $@ + $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - $@ src/shared/errno-to-name.h: src/shared/errno-list.txt - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@ + $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@ + src/shared/af-list.txt: $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/socket.h - < /dev/null | grep -v AF_UNSPEC | grep -v AF_MAX | $(AWK) '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $$2; }' > $@ + $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/socket.h - $@ -src/shared/af-from-name.gperf: src/shared/af-list.txt - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct af_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' < $< > $@ +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/af-from-name.h: src/shared/af-from-name.gperf +src/shared/arphrd-list.txt: $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_af -H hash_af_name -p -C < $< > $@ + $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include net/if_arp.h - $@ -src/shared/af-to-name.h: src/shared/af-list.txt +src/shared/arphrd-to-name.h: src/shared/arphrd-list.txt + $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const arphrd_names[] = { "} !/CISCO/ { printf "[ARPHRD_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@ + +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/resolve/dns_type-list.txt: src/resolve/dns-type.h $(AM_V_at)$(MKDIR_P) $(dir $@) - $(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 "};"}' < $< > $@ + $(AM_V_GEN)$(SED) -n -r 's/.* DNS_TYPE_(\w+).*/\1/p' <$< >$@ + +src/resolve/dns_type-to-name.h: src/resolve/dns_type-list.txt + $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *dns_type_to_string(int type) {\n\tswitch(type) {" } {printf " case DNS_TYPE_%s: return ", $$1; sub(/_/, "-"); printf "\"%s\";\n", $$1 } END{ print "\ndefault: return NULL;\n\t}\n}\n" }' <$< >$@ + +src/resolve/dns_type-from-name.gperf: src/resolve/dns_type-list.txt + $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct dns_type_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { s=$$1; sub(/_/, "-", s); printf "%s, ", $$s; printf "DNS_TYPE_%s\n", $$1 }' <$< >$@ # ------------------------------------------------------------------------------ systemd_SOURCES = \ @@ -1165,25 +1283,31 @@ CLEANFILES += \ src/core/org.freedesktop.systemd1.policy.in # ------------------------------------------------------------------------------ + manual_tests += \ - test-engine \ test-ns \ test-loopback \ test-hostname \ test-daemon \ test-cgroup \ - test-cgroup-mask \ test-install \ test-watchdog \ test-log \ - test-ipcrm \ + test-ipcrm + +if HAVE_KMOD +manual_tests += \ test-rtnl-manual +endif tests += \ + test-engine \ + test-cgroup-mask \ test-job-type \ test-env-replace \ test-strbuf \ test-strv \ + test-path \ test-path-util \ test-strxcpyx \ test-unit-name \ @@ -1191,6 +1315,9 @@ tests += \ test-utf8 \ test-ellipsize \ test-util \ + test-ring \ + test-barrier \ + test-pty \ test-tmpfiles \ test-namespace \ test-date \ @@ -1204,21 +1331,65 @@ tests += \ test-fileio \ test-time \ test-hashmap \ + test-set \ test-list \ + test-unaligned \ test-tables \ test-device-nodes \ test-xml \ - test-architecture + test-architecture \ + test-socket-util \ + test-fdset \ + test-conf-files \ + test-capability \ + test-async \ + test-ratelimit \ + test-condition \ + test-uid-range \ + test-bus-policy \ + test-locale-util \ + test-execute \ + test-copy EXTRA_DIST += \ + test/a.service \ + test/basic.target \ + test/b.service \ + test/c.service \ + test/daughter.service \ + test/d.service \ + test/end.service \ + test/e.service \ + test/f.service \ + test/grandchild.service \ + test/g.service \ + test/hello-after-sleep.target \ + test/hello.service \ + test/h.service \ + test/parent-deep.slice \ + test/parent.slice \ + test/paths.target \ test/sched_idle_bad.service \ test/sched_idle_ok.service \ test/sched_rr_bad.service \ - test/sched_rr_ok.service \ test/sched_rr_change.service \ + test/sched_rr_ok.service \ + test/shutdown.target \ + test/sleep.service \ + test/sockets.target \ test/son.service \ - test/daughter.service \ - test/parent.slice + test/sysinit.target \ + test/testsuite.target \ + test/timers.target \ + test/unstoppable.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 @@ -1312,10 +1483,86 @@ test_utf8_SOURCES = \ test_utf8_LDADD = \ libsystemd-shared.la +test_capability_SOURCES = \ + src/test/test-capability.c + +test_capability_LDADD = \ + libsystemd-shared.la + +test_async_SOURCES = \ + src/test/test-async.c + +test_async_LDADD = \ + libsystemd-shared.la + +test_locale_util_SOURCES = \ + src/test/test-locale-util.c + +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-shared.la \ + libsystemd-internal.la + +test_ratelimit_SOURCES = \ + src/test/test-ratelimit.c + +test_ratelimit_LDADD = \ + libsystemd-shared.la + test_util_SOURCES = \ src/test/test-util.c test_util_LDADD = \ + -lm \ + libsystemd-shared.la + +test_uid_range_SOURCES = \ + src/test/test-uid-range.c + +test_uid_range_LDADD = \ + libsystemd-shared.la + +test_socket_util_SOURCES = \ + src/test/test-socket-util.c + +test_socket_util_LDADD = \ + libsystemd-shared.la + +test_ring_SOURCES = \ + src/test/test-ring.c + +test_ring_LDADD = \ + libsystemd-shared.la + +test_barrier_SOURCES = \ + src/test/test-barrier.c + +test_barrier_LDADD = \ + libsystemd-shared.la + +test_pty_SOURCES = \ + src/test/test-pty.c + +test_pty_LDADD = \ libsystemd-core.la test_tmpfiles_SOURCES = \ @@ -1330,11 +1577,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 @@ -1346,11 +1618,25 @@ 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 \ - src/shared/test-tables.h + src/shared/test-tables.h \ + src/bus-proxyd/bus-policy.c \ + src/bus-proxyd/bus-policy.h \ + src/journal/journald-server.c \ + src/journal/journald-server.h + +test_tables_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -I$(top_srcdir)/src/bus-proxyd test_tables_CFLAGS = \ $(AM_CFLAGS) \ @@ -1359,26 +1645,28 @@ test_tables_CFLAGS = \ test_tables_LDADD = \ libsystemd-logs.la \ libsystemd-journal-internal.la \ + libsystemd-journal-core.la \ libsystemd-core.la \ + libudev-core.la \ $(RT_LIBS) 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 @@ -1390,7 +1678,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 @@ -1402,22 +1690,26 @@ test_ipcrm_LDADD = \ test_rtnl_manual_SOURCES = \ src/test/test-rtnl-manual.c +test_rtnl_manual_CFLAGS = \ + $(AM_CFLAGS) \ + $(KMOD_CFLAGS) + test_rtnl_manual_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la \ - -lkmod + $(KMOD_LIBS) 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 @@ -1462,8 +1754,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) \ @@ -1507,6 +1798,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 @@ -1532,8 +1841,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) \ @@ -1543,12 +1851,27 @@ test_sched_prio_LDADD = \ libsystemd-core.la \ $(RT_LIBS) +test_conf_files_SOURCES = \ + src/test/test-conf-files.c + +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 # run lcov from scratch, always -coverage: +coverage: all $(MAKE) lcov-run $(MAKE) lcov-report @@ -1567,7 +1890,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 @@ -1583,11 +1907,19 @@ endif # ------------------------------------------------------------------------------ systemd_analyze_SOURCES = \ - src/analyze/analyze.c + src/analyze/analyze.c \ + src/analyze/analyze-verify.c \ + src/analyze/analyze-verify.h + +systemd_verify_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) systemd_analyze_LDADD = \ + libsystemd-core.la \ libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + $(RT_LIBS) # ------------------------------------------------------------------------------ systemd_initctl_SOURCES = \ @@ -1610,6 +1942,15 @@ systemd_update_utmp_LDADD = \ libsystemd-shared.la \ $(AUDIT_LIBS) +# ------------------------------------------------------------------------------ +systemd_update_done_SOURCES = \ + src/update-done/update-done.c + +systemd_update_done_LDADD = \ + libsystemd-internal.la \ + libsystemd-label.la \ + libsystemd-shared.la + # ------------------------------------------------------------------------------ systemd_shutdownd_SOURCES = \ src/shutdownd/shutdownd.c @@ -1669,8 +2010,8 @@ endif endif EXTRA_DIST += \ - units/systemd-modules-load.service.in \ - units/kmod-static-nodes.service.in + units/systemd-modules-load.service.in \ + units/kmod-static-nodes.service.in # ------------------------------------------------------------------------------ if ENABLE_TMPFILES @@ -1680,7 +2021,6 @@ systemd_tmpfiles_SOURCES = \ systemd_tmpfiles_LDADD = \ libsystemd-units.la \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -1695,11 +2035,15 @@ nodist_systemunit_DATA += \ units/systemd-tmpfiles-setup.service \ units/systemd-tmpfiles-clean.service +nodist_tmpfiles_DATA = \ + tmpfiles.d/etc.conf + dist_tmpfiles_DATA = \ tmpfiles.d/systemd.conf \ tmpfiles.d/systemd-nologin.conf \ tmpfiles.d/tmp.conf \ - tmpfiles.d/x11.conf + tmpfiles.d/x11.conf \ + tmpfiles.d/var.conf if HAVE_SYSV_COMPAT dist_tmpfiles_DATA += \ @@ -1722,10 +2066,86 @@ INSTALL_DIRS += \ endif EXTRA_DIST += \ + tmpfiles.d/etc.conf.m4 \ units/systemd-tmpfiles-setup-dev.service.in \ units/systemd-tmpfiles-setup.service.in \ units/systemd-tmpfiles-clean.service.in +CLEANFILES += \ + tmpfiles.d/etc.conf + +# ------------------------------------------------------------------------------ +if ENABLE_SYSUSERS +systemd_sysusers_SOURCES = \ + src/sysusers/sysusers.c + +systemd_sysusers_LDADD = \ + libsystemd-units.la \ + libsystemd-label.la \ + libsystemd-internal.la \ + libsystemd-shared.la + +rootbin_PROGRAMS += \ + systemd-sysusers + +nodist_systemunit_DATA += \ + units/systemd-sysusers.service + +SYSINIT_TARGET_WANTS += \ + systemd-sysusers.service + +dist_sysusers_DATA = \ + sysusers.d/systemd.conf + +nodist_sysusers_DATA = \ + sysusers.d/basic.conf + +EXTRA_DIST += \ + units/systemd-sysusers.service.in \ + sysusers.d/basic.conf.in + +CLEANFILES += \ + sysusers.d/basic.conf + +INSTALL_DIRS += \ + $(sysusersdir) +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 +systemd_firstboot_SOURCES = \ + src/firstboot/firstboot.c + +systemd_firstboot_LDADD = \ + libsystemd-units.la \ + libsystemd-label.la \ + libsystemd-internal.la \ + libsystemd-shared.la \ + -lcrypt + +rootbin_PROGRAMS += \ + systemd-firstboot + +nodist_systemunit_DATA += \ + units/systemd-firstboot.service + +EXTRA_DIST += \ + units/systemd-firstboot.service.in + +SYSINIT_TARGET_WANTS += \ + systemd-firstboot.service +endif + # ------------------------------------------------------------------------------ systemd_machine_id_setup_SOURCES = \ src/machine-id-setup/machine-id-setup-main.c \ @@ -1775,9 +2195,6 @@ systemd_detect_virt_SOURCES = \ systemd_detect_virt_LDADD = \ libsystemd-shared.la -systemd-detect-virt-install-hook: - -$(SETCAP) cap_dac_override,cap_sys_ptrace=ep $(DESTDIR)$(bindir)/systemd-detect-virt - INSTALL_EXEC_HOOKS += \ systemd-detect-virt-install-hook @@ -1796,6 +2213,14 @@ systemd_getty_generator_LDADD = \ libsystemd-label.la \ libsystemd-shared.la +# ------------------------------------------------------------------------------ +systemd_debug_generator_SOURCES = \ + src/debug-generator/debug-generator.c + +systemd_debug_generator_LDADD = \ + libsystemd-label.la \ + libsystemd-shared.la + # ------------------------------------------------------------------------------ systemd_fstab_generator_SOURCES = \ src/fstab-generator/fstab-generator.c \ @@ -1813,8 +2238,45 @@ systemd_system_update_generator_LDADD = \ libsystemd-label.la \ libsystemd-shared.la -if ENABLE_EFI # ------------------------------------------------------------------------------ +if ENABLE_HIBERNATE +systemgenerator_PROGRAMS += \ + systemd-hibernate-resume-generator + +rootlibexec_PROGRAMS += \ + systemd-hibernate-resume + +systemd_hibernate_resume_SOURCES = \ + src/hibernate-resume/hibernate-resume.c + +systemd_hibernate_resume_LDADD = \ + libsystemd-internal.la \ + libsystemd-shared.la + +systemd_hibernate_resume_generator_SOURCES = \ + src/hibernate-resume/hibernate-resume-generator.c + +systemd_hibernate_resume_generator_LDADD = \ + libsystemd-label.la \ + libsystemd-shared.la + +EXTRA_DIST += \ + units/systemd-hibernate.service.in \ + units/systemd-hibernate-resume@.service.in \ + units/systemd-hybrid-sleep.service.in + +dist_systemunit_DATA += \ + units/hibernate.target \ + units/hybrid-sleep.target + +nodist_systemunit_DATA += \ + units/systemd-hibernate.service \ + units/systemd-hibernate-resume@.service \ + units/systemd-hybrid-sleep.service +endif + +# ------------------------------------------------------------------------------ +if ENABLE_EFI systemgenerator_PROGRAMS += \ systemd-efi-boot-generator @@ -1894,6 +2356,15 @@ INSTALL_EXEC_HOOKS += dbus1-generator-install-hook UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook endif +# ------------------------------------------------------------------------------ +systemd_sysv_generator_SOURCES = \ + src/sysv-generator/sysv-generator.c + +systemd_sysv_generator_LDADD = \ + libsystemd-core.la \ + libsystemd-label.la \ + libsystemd-shared.la + # ------------------------------------------------------------------------------ systemd_rc_local_generator_SOURCES = \ src/rc-local-generator/rc-local-generator.c @@ -1921,6 +2392,13 @@ systemd_cgroups_agent_LDADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ +systemd_escape_SOURCES = \ + src/escape/escape.c + +systemd_escape_LDADD = \ + libsystemd-shared.la + +# ----------------------------------------------------------------------------- systemctl_SOURCES = \ src/systemctl/systemctl.c @@ -1934,13 +2412,20 @@ systemctl_LDADD = \ # ------------------------------------------------------------------------------ systemd_notify_SOURCES = \ - src/notify/notify.c \ - src/readahead/sd-readahead.c + src/notify/notify.c systemd_notify_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la +# ------------------------------------------------------------------------------ +systemd_path_SOURCES = \ + src/path/path.c + +systemd_path_LDADD = \ + libsystemd-internal.la \ + libsystemd-shared.la + # ------------------------------------------------------------------------------ systemd_ask_password_SOURCES = \ src/ask-password/ask-password.c @@ -1961,6 +2446,7 @@ systemd_cgls_SOURCES = \ src/cgls/cgls.c systemd_cgls_LDADD = \ + libsystemd-internal.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -1985,7 +2471,6 @@ systemd_nspawn_CFLAGS = \ systemd_nspawn_LDADD = \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libudev-internal.la \ libsystemd-shared.la \ @@ -2003,13 +2488,14 @@ systemd_run_SOURCES = \ systemd_run_LDADD = \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_bus_proxyd_SOURCES = \ - src/bus-proxyd/bus-proxyd.c + src/bus-proxyd/bus-proxyd.c \ + src/bus-proxyd/bus-policy.c \ + src/bus-proxyd/bus-policy.h systemd_bus_proxyd_LDADD = \ libsystemd-internal.la \ @@ -2033,13 +2519,16 @@ 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.in \ + units/user/systemd-bus-proxyd@.service.in # ------------------------------------------------------------------------------ systemd_tty_ask_password_agent_SOURCES = \ @@ -2054,7 +2543,6 @@ libsystemd_internal_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-utf8.h \ src/systemd/sd-event.h \ src/systemd/sd-rtnl.h \ @@ -2062,6 +2550,8 @@ libsystemd_internal_la_SOURCES = \ src/systemd/sd-login.h \ src/systemd/sd-id128.h \ src/systemd/sd-daemon.h \ + src/systemd/sd-path.h \ + src/systemd/sd-network.h \ src/libsystemd/sd-bus/sd-bus.c \ src/libsystemd/sd-bus/bus-control.c \ src/libsystemd/sd-bus/bus-control.h \ @@ -2098,24 +2588,32 @@ libsystemd_internal_la_SOURCES = \ src/libsystemd/sd-bus/bus-track.h \ src/libsystemd/sd-bus/bus-util.c \ src/libsystemd/sd-bus/bus-util.h \ + src/libsystemd/sd-bus/bus-slot.c \ + src/libsystemd/sd-bus/bus-slot.h \ src/libsystemd/sd-bus/bus-protocol.h \ src/libsystemd/sd-bus/kdbus.h \ - src/libsystemd/sd-bus/sd-memfd.c \ src/libsystemd/sd-utf8/sd-utf8.c \ src/libsystemd/sd-event/sd-event.c \ src/libsystemd/sd-event/event-util.h \ src/libsystemd/sd-rtnl/sd-rtnl.c \ src/libsystemd/sd-rtnl/rtnl-internal.h \ src/libsystemd/sd-rtnl/rtnl-message.c \ + src/libsystemd/sd-rtnl/rtnl-types.h \ + src/libsystemd/sd-rtnl/rtnl-types.c \ src/libsystemd/sd-rtnl/rtnl-util.h \ src/libsystemd/sd-rtnl/rtnl-util.c \ + src/libsystemd/sd-rtnl/local-addresses.h \ + src/libsystemd/sd-rtnl/local-addresses.c \ src/libsystemd/sd-id128/sd-id128.c \ src/libsystemd/sd-daemon/sd-daemon.c \ - src/libsystemd/sd-login/sd-login.c + src/libsystemd/sd-login/sd-login.c \ + 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 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) \ @@ -2132,6 +2630,9 @@ libsystemd_resolve_la_CFLAGS = \ $(AM_CFLAGS) \ -pthread +libsystemd_resolve_la_LIBADD = \ + -lresolv + noinst_LTLIBRARIES += \ libsystemd-internal.la \ libsystemd-resolve.la @@ -2140,23 +2641,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 @@ -2171,6 +2666,7 @@ nodist_libsystemd_la_SOURCES = \ libsystemd_la_CFLAGS = \ $(libsystemd_internal_la_CFLAGS) \ + $(libsystemd_resolve_la_CFLAGS) \ $(libsystemd_journal_internal_la_CFLAGS) libsystemd_la_LDFLAGS = \ @@ -2180,9 +2676,9 @@ libsystemd_la_LDFLAGS = \ libsystemd_la_LIBADD = \ libsystemd-shared.la \ + $(libsystemd_internal_la_LIBADD) \ $(libsystemd_journal_internal_la_LIBADD) \ - $(RT_LIBS) \ - -lresolv + $(libsystemd_resolve_la_LIBADD) libsystemd-install-hook: libname=libsystemd.so && $(move-to-rootlibdir) @@ -2206,11 +2702,11 @@ pkginclude_HEADERS += \ 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-utf8.h \ src/systemd/sd-event.h \ src/systemd/sd-rtnl.h \ - src/systemd/sd-resolve.h + src/systemd/sd-resolve.h \ + src/systemd/sd-path.h endif lib_LTLIBRARIES += \ @@ -2226,7 +2722,6 @@ tests += \ test-bus-kernel \ test-bus-kernel-bloom \ test-bus-kernel-benchmark \ - test-bus-memfd \ test-bus-zero-copy \ test-bus-introspect \ test-bus-objects \ @@ -2244,19 +2739,16 @@ 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 @@ -2303,15 +2795,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 @@ -2324,26 +2813,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 @@ -2356,15 +2841,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 @@ -2380,26 +2859,13 @@ test_bus_kernel_benchmark_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la -test_bus_memfd_SOURCES = \ - src/libsystemd/sd-bus/test-bus-memfd.c - -test_bus_memfd_LDADD = \ - libsystemd-internal.la \ - libsystemd-shared.la - 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 @@ -2423,49 +2889,51 @@ test_rtnl_LDADD = \ libsystemd-shared.la test_resolve_SOURCES = \ - src/systemd/sd-resolve.h \ src/libsystemd/sd-resolve/test-resolve.c test_resolve_LDADD = \ - libsystemd-internal.la \ libsystemd-resolve.la \ - libsystemd-shared.la \ - -lresolv + libsystemd-internal.la \ + libsystemd-shared.la test_resolve_CFLAGS = \ $(AM_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 += \ libsystemd-network.la +libsystemd_network_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(KMOD_CFLAGS) + libsystemd_network_la_SOURCES = \ - src/systemd/sd-network.h \ src/systemd/sd-dhcp-client.h \ + src/systemd/sd-dhcp-server.h \ src/systemd/sd-dhcp-lease.h \ src/systemd/sd-ipv4ll.h \ - src/network/sd-network.c \ - src/network/network-util.h \ + 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/dhcp-option.c \ src/libsystemd-network/dhcp-packet.c \ src/libsystemd-network/dhcp-internal.h \ + src/libsystemd-network/dhcp-server-internal.h \ src/libsystemd-network/dhcp-protocol.h \ src/libsystemd-network/dhcp-lease-internal.h \ src/libsystemd-network/sd-dhcp-lease.c \ @@ -2473,13 +2941,24 @@ 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/network-internal.h \ + src/libsystemd-network/sd-icmp6-nd.c \ + src/libsystemd-network/sd-dhcp6-client.c \ + src/libsystemd-network/dhcp6-internal.h \ + src/libsystemd-network/dhcp6-protocol.h \ + 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 libsystemd_network_la_LIBADD = \ + libudev-internal.la \ libsystemd-label.la \ libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + $(KMOD_LIBS) test_dhcp_option_SOURCES = \ src/libsystemd-network/dhcp-protocol.h \ @@ -2503,9 +2982,213 @@ test_dhcp_client_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la +test_dhcp_server_SOURCES = \ + src/libsystemd-network/test-dhcp-server.c + +test_dhcp_server_LDADD = \ + libsystemd-network.la \ + libsystemd-internal.la \ + libsystemd-shared.la + +test_ipv4ll_SOURCES = \ + src/systemd/sd-ipv4ll.h \ + src/libsystemd-network/ipv4ll-internal.h \ + src/libsystemd-network/test-ipv4ll.c + +test_ipv4ll_LDADD = \ + libsystemd-network.la \ + libsystemd-label.la \ + 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 \ + src/libsystemd-network/dhcp6-internal.h \ + src/libsystemd-network/test-icmp6-rs.c + +test_icmp6_rs_LDADD = \ + libsystemd-network.la \ + libsystemd-internal.la \ + libsystemd-shared.la + +test_dhcp6_client_SOURCES = \ + src/systemd/sd-dhcp6-client.h \ + src/libsystemd-network/dhcp6-internal.h \ + src/libsystemd-network/test-dhcp6-client.c + +test_dhcp6_client_LDADD = \ + libsystemd-network.la \ + libsystemd-internal.la \ + libsystemd-shared.la + tests += \ test-dhcp-option \ - test-dhcp-client + test-dhcp-client \ + test-dhcp-server \ + test-ipv4ll \ + 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 + +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 \ + test-unifont +endif + +libsystemd_terminal_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(TERMINAL_CFLAGS) + +libsystemd_terminal_la_SOURCES = \ + src/libsystemd-terminal/grdev.h \ + src/libsystemd-terminal/grdev-internal.h \ + src/libsystemd-terminal/grdev.c \ + src/libsystemd-terminal/grdev-drm.c \ + src/libsystemd-terminal/idev.h \ + src/libsystemd-terminal/idev-internal.h \ + src/libsystemd-terminal/idev.c \ + src/libsystemd-terminal/idev-evdev.c \ + src/libsystemd-terminal/idev-keyboard.c \ + 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.h \ + src/libsystemd-terminal/unifont-def.h \ + src/libsystemd-terminal/unifont.c + +libsystemd_terminal_la_LIBADD = \ + libudev-internal.la \ + libsystemd-internal.la \ + 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) + +systemd_evcat_SOURCES = \ + src/libsystemd-terminal/evcat.c + +systemd_evcat_LDADD = \ + libsystemd-terminal.la \ + libsystemd-internal.la \ + libsystemd-shared.la \ + $(TERMINAL_LIBS) + +systemd_modeset_CFLAGS = \ + $(AM_CFLAGS) \ + $(TERMINAL_CFLAGS) + +systemd_modeset_SOURCES = \ + src/libsystemd-terminal/modeset.c + +systemd_modeset_LDADD = \ + libsystemd-terminal.la \ + libsystemd-internal.la \ + libsystemd-shared.la \ + $(TERMINAL_LIBS) + +systemd_subterm_SOURCES = \ + src/libsystemd-terminal/subterm.c + +systemd_subterm_LDADD = \ + libsystemd-terminal.la \ + libsystemd-internal.la \ + libsystemd-shared.la + +test_term_page_SOURCES = \ + src/libsystemd-terminal/test-term-page.c + +test_term_page_LDADD = \ + libsystemd-terminal.la \ + libsystemd-internal.la \ + libsystemd-shared.la + +test_term_parser_SOURCES = \ + src/libsystemd-terminal/test-term-parser.c + +test_term_parser_LDADD = \ + libsystemd-terminal.la \ + libsystemd-internal.la \ + libsystemd-shared.la + +test_unifont_SOURCES = \ + src/libsystemd-terminal/test-unifont.c + +test_unifont_LDADD = \ + libsystemd-terminal.la \ + libsystemd-internal.la \ + libsystemd-shared.la + +.PHONY: update-unifont +update-unifont: tools/compile-unifont.py + $(AM_V_GEN)$(PYTHON) $< \ + <$(top_srcdir)/src/libsystemd-terminal/unifont.hex \ + >$(top_srcdir)/src/libsystemd-terminal/unifont-glyph-array.bin + @echo "unifont-glyph-array.bin has been regenerated" # ------------------------------------------------------------------------------ if ENABLE_GTK_DOC @@ -2584,8 +3267,7 @@ noinst_LTLIBRARIES += \ libudev_internal_la_SOURCES =\ $(libudev_la_SOURCES) \ - src/libudev/libudev-device-private.c \ - src/libudev/libudev-queue-private.c + src/libudev/libudev-device-private.c libudev_internal_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -2598,13 +3280,15 @@ INSTALL_DIRS += \ dist_network_DATA = \ network/99-default.link \ - network/80-container-host0.network + network/80-container-host0.network \ + network/80-container-ve.network dist_udevrules_DATA += \ rules/42-usb-hid-pm.rules \ 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 \ @@ -2631,7 +3315,8 @@ dist_udevhwdb_DATA = \ 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 = \ @@ -2652,19 +3337,23 @@ CLEANFILES += \ EXTRA_DIST += \ units/systemd-udevd.service.in \ units/systemd-udev-trigger.service.in \ - units/systemd-udev-settle.service.in + units/systemd-udev-settle.service.in \ + units/systemd-udev-hwdb-update.service.in CLEANFILES += \ units/systemd-udevd.service \ units/systemd-udev-trigger.service \ - units/systemd-udev-settle.service + units/systemd-udev-settle.service \ + units/systemd-udev-hwdb-update.service SOCKETS_TARGET_WANTS += \ systemd-udevd-control.socket \ systemd-udevd-kernel.socket + SYSINIT_TARGET_WANTS += \ systemd-udevd.service \ - systemd-udev-trigger.service + systemd-udev-trigger.service \ + systemd-udev-hwdb-update.service rootbin_PROGRAMS += \ udevadm @@ -2739,18 +3428,6 @@ libudev_core_la_LIBADD = \ $(BLKID_LIBS) \ $(KMOD_LIBS) -libudev_core_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DFIRMWARE_PATH="$(FIRMWARE_PATH)" - -if ENABLE_FIRMWARE -libudev_core_la_SOURCES += \ - src/udev/udev-builtin-firmware.c - -dist_udevrules_DATA += \ - rules/50-firmware.rules -endif - if HAVE_KMOD libudev_core_la_SOURCES += \ src/udev/udev-builtin-kmod.c @@ -2790,7 +3467,9 @@ 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 @@ -2827,7 +3506,7 @@ test_udev_SOURCES = \ src/test/test-udev.c test_udev_LDADD = \ - libudev-core.la \ + libudev-core.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) \ $(SELINUX_LIBS) @@ -2963,6 +3642,7 @@ CLEANFILES += \ src/gudev/gudev-1.0.pc libgudev_1_0_la_SOURCES = \ + src/gudev/libgudev-1.0.sym \ src/gudev/gudevenums.h \ src/gudev/gudevenumtypes.h \ src/gudev/gudevenumtypes.h\ @@ -3006,8 +3686,9 @@ libgudev_1_0_la_LIBADD = \ libgudev_1_0_la_LDFLAGS = \ $(AM_LDFLAGS) \ -version-info $(LIBGUDEV_CURRENT):$(LIBGUDEV_REVISION):$(LIBGUDEV_AGE) \ - -export-dynamic -no-undefined \ - -export-symbols-regex '^g_udev_.*' + -export-dynamic \ + -no-undefined \ + -Wl,--version-script=$(top_srcdir)/src/gudev/libgudev-1.0.sym src/gudev/gudevmarshal.h: src/gudev/gudevmarshal.list $(AM_V_at)$(MKDIR_P) $(dir $@) @@ -3070,16 +3751,6 @@ typelibs_DATA = \ CLEANFILES += $(gir_DATA) $(typelibs_DATA) endif # HAVE_INTROSPECTION - -# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed -libgudev-install-hook: - libname=libgudev-1.0.so && $(move-to-rootlibdir) - -libgudev-uninstall-hook: - rm -f $(DESTDIR)$(rootlibdir)/libgudev-1.0.so* - -INSTALL_EXEC_HOOKS += libgudev-install-hook -UNINSTALL_EXEC_HOOKS += libgudev-uninstall-hook endif EXTRA_DIST += \ @@ -3148,19 +3819,20 @@ rootlibexec_PROGRAMS += \ systemd-journal-remote systemd_journal_remote_SOURCES = \ - src/journal/journal-remote-parse.h \ - src/journal/journal-remote-parse.c \ - src/journal/journal-remote-write.h \ - src/journal/journal-remote-write.c \ - src/journal/journal-remote.c + src/journal-remote/journal-remote-parse.h \ + src/journal-remote/journal-remote-parse.c \ + src/journal-remote/journal-remote-write.h \ + src/journal-remote/journal-remote-write.c \ + src/journal-remote/journal-remote.h \ + src/journal-remote/journal-remote.c systemd_journal_remote_LDADD = \ libsystemd-internal.la \ libsystemd-journal-core.la systemd_journal_remote_SOURCES += \ - src/journal/microhttpd-util.h \ - src/journal/microhttpd-util.c + src/journal-remote/microhttpd-util.h \ + src/journal-remote/microhttpd-util.c systemd_journal_remote_CFLAGS = \ $(AM_CFLAGS) \ @@ -3169,10 +3841,82 @@ 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) + +# systemd-journal-remote make sense mostly with full crypto stack +dist_systemunit_DATA += \ + units/systemd-journal-remote.socket + +nodist_systemunit_DATA += \ + units/systemd-journal-remote.service + +EXTRA_DIST += \ + units/systemd-journal-remote.service.in + +journal-remote-install-hook: journal-install-hook + -$(MKDIR_P) $(DESTDIR)/var/log/journal/remote + -chown 0:0 $(DESTDIR)/var/log/journal/remote + -chmod 755 $(DESTDIR)/var/log/journal/remote + +INSTALL_EXEC_HOOKS += journal-remote-install-hook + endif + +nodist_pkgsysconf_DATA += \ + src/journal-remote/journal-remote.conf + +EXTRA_DIST += \ + src/journal-remote/journal-remote.conf.in + +CLEANFILES += \ + src/journal-remote/journal-remote.conf +endif + +if HAVE_LIBCURL +rootlibexec_PROGRAMS += \ + systemd-journal-upload + +systemd_journal_upload_SOURCES = \ + src/journal-remote/journal-upload.h \ + src/journal-remote/journal-upload.c \ + src/journal-remote/journal-upload-journal.c + +systemd_journal_upload_CFLAGS = \ + $(AM_CFLAGS) \ + $(LIBCURL_CFLAGS) + +systemd_journal_upload_LDADD = \ + libsystemd-internal.la \ + libsystemd-journal-internal.la \ + libsystemd-shared.la \ + $(LIBCURL_LIBS) + +nodist_systemunit_DATA += \ + units/systemd-journal-upload.service + +EXTRA_DIST += \ + units/systemd-journal-upload.service.in + +nodist_pkgsysconf_DATA += \ + src/journal-remote/journal-upload.conf + +EXTRA_DIST += \ + src/journal-remote/journal-upload.conf.in + +CLEANFILES += \ + src/journal-remote/journal-upload.conf endif # using _CFLAGS = in the conditional below would suppress AM_CFLAGS @@ -3281,6 +4025,20 @@ test_catalog_CPPFLAGS = \ test_catalog_LDADD = \ libsystemd-journal-core.la +test_compress_SOURCES = \ + src/journal/test-compress.c + +test_compress_LDADD = \ + libsystemd-journal-internal.la \ + libsystemd-shared.la + +test_compress_benchmark_SOURCES = \ + src/journal/test-compress-benchmark.c + +test_compress_benchmark_LDADD = \ + libsystemd-journal-internal.la \ + libsystemd-shared.la + libsystemd_journal_core_la_SOURCES = \ src/journal/journald-kmsg.c \ src/journal/journald-kmsg.h \ @@ -3296,6 +4054,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 @@ -3306,7 +4066,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 @@ -3327,6 +4086,7 @@ journal-install-hook: -setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/ journal-uninstall-hook: + -rmdir $(DESTDIR)/var/log/journal/remote -rmdir $(DESTDIR)/var/log/journal/ INSTALL_EXEC_HOOKS += journal-install-hook @@ -3363,6 +4123,12 @@ tests += \ test-mmap-cache \ test-catalog +if HAVE_COMPRESSION +tests += \ + test-compress \ + test-compress-benchmark +endif + pkginclude_HEADERS += \ src/systemd/sd-journal.h \ src/systemd/sd-messages.h \ @@ -3389,15 +4155,15 @@ libsystemd_journal_internal_la_SOURCES = \ src/journal/mmap-cache.h # using _CFLAGS = in the conditional below would suppress AM_CFLAGS -libsystemd_journal_internal_la_CFLAGS = +libsystemd_journal_internal_la_CFLAGS = \ $(AM_CFLAGS) libsystemd_journal_internal_la_LIBADD = -if HAVE_XZ libsystemd_journal_internal_la_SOURCES += \ src/journal/compress.c +if HAVE_XZ libsystemd_journal_internal_la_CFLAGS += \ $(XZ_CFLAGS) @@ -3405,6 +4171,11 @@ libsystemd_journal_internal_la_LIBADD += \ $(XZ_LIBS) endif +if HAVE_LZ4 +libsystemd_journal_internal_la_LIBADD += \ + -llz4 +endif + if HAVE_GCRYPT libsystemd_journal_internal_la_SOURCES += \ src/journal/journal-authenticate.c \ @@ -3434,30 +4205,39 @@ bin_PROGRAMS += \ systemd-cat dist_systemunit_DATA += \ - units/systemd-journald.socket + units/systemd-journald.socket \ + units/systemd-journald-dev-log.socket \ + units/systemd-journald-audit.socket nodist_systemunit_DATA += \ units/systemd-journald.service \ - units/systemd-journal-flush.service + units/systemd-journal-flush.service \ + units/systemd-journal-catalog-update.service dist_pkgsysconf_DATA += \ src/journal/journald.conf 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.socket \ + systemd-journald-dev-log.socket \ + systemd-journald-audit.socket + SYSINIT_TARGET_WANTS += \ systemd-journald.service \ - systemd-journal-flush.service + systemd-journal-flush.service \ + systemd-journal-catalog-update.service EXTRA_DIST += \ units/systemd-journald.service.in \ units/systemd-journal-flush.service.in \ + units/systemd-journal-catalog-update.service.in \ src/journal/journald-gperf.gperf CLEANFILES += \ @@ -3471,9 +4251,9 @@ rootlibexec_PROGRAMS += \ systemd-journal-gatewayd systemd_journal_gatewayd_SOURCES = \ - src/journal/journal-gatewayd.c \ - src/journal/microhttpd-util.h \ - src/journal/microhttpd-util.c + src/journal-remote/journal-gatewayd.c \ + src/journal-remote/microhttpd-util.h \ + src/journal-remote/microhttpd-util.c systemd_journal_gatewayd_LDADD = \ libsystemd-logs.la \ @@ -3502,7 +4282,7 @@ nodist_systemunit_DATA += \ units/systemd-journal-gatewayd.service dist_gatewayddocumentroot_DATA = \ - src/journal/browse.html + src/journal-remote/browse.html endif @@ -3518,12 +4298,15 @@ systemd_socket_proxyd_LDADD = \ libsystemd-logs.la \ libsystemd-internal.la \ libsystemd-journal-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-resolve.la # ------------------------------------------------------------------------------ if ENABLE_COREDUMP systemd_coredump_SOURCES = \ - src/journal/coredump.c + src/journal/coredump.c \ + src/journal/coredump-vacuum.c \ + src/journal/coredump-vacuum.h systemd_coredump_LDADD = \ libsystemd-journal-internal.la \ @@ -3531,25 +4314,54 @@ systemd_coredump_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la +if HAVE_ELFUTILS +systemd_coredump_SOURCES += \ + src/journal/stacktrace.c \ + src/journal/stacktrace.h + +systemd_coredump_LDADD += \ + $(ELFUTILS_LIBS) +endif + rootlibexec_PROGRAMS += \ systemd-coredump -systemd_coredumpctl_SOURCES = \ +dist_pkgsysconf_DATA += \ + src/journal/coredump.conf + +if HAVE_ACL +systemd_coredump_LDADD += \ + libsystemd-acl.la +endif + +coredumpctl_SOURCES = \ src/journal/coredumpctl.c -systemd_coredumpctl_LDADD = \ +coredumpctl_LDADD = \ libsystemd-journal-internal.la \ libsystemd-internal.la \ libsystemd-shared.la bin_PROGRAMS += \ - systemd-coredumpctl + coredumpctl + +manual_tests += \ + test-coredump-vacuum + +test_coredump_vacuum_SOURCES = \ + src/journal/test-coredump-vacuum.c \ + src/journal/coredump-vacuum.c \ + src/journal/coredump-vacuum.h + +test_coredump_vacuum_LDADD = \ + libsystemd-internal.la \ + libsystemd-shared.la dist_bashcompletion_DATA += \ - shell-completion/bash/systemd-coredumpctl + shell-completion/bash/coredumpctl dist_zshcompletion_DATA += \ - shell-completion/zsh/_systemd-coredumpctl + shell-completion/zsh/_coredumpctl sysctl_DATA = \ sysctl.d/50-coredump.conf @@ -3606,50 +4418,15 @@ rootlibexec_PROGRAMS += \ nodist_systemunit_DATA += \ units/systemd-vconsole-setup.service -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 +dist_udevrules_DATA += \ + src/vconsole/90-vconsole.rules +SYSINIT_TARGET_WANTS += \ + systemd-vconsole-setup.service endif EXTRA_DIST += \ - units/systemd-readahead-collect.service.in \ - units/systemd-readahead-replay.service.in \ - units/systemd-readahead-done.service.in + units/systemd-vconsole-setup.service.in # ------------------------------------------------------------------------------ if ENABLE_BOOTCHART @@ -3765,7 +4542,8 @@ systemgenerator_PROGRAMS += \ systemd-cryptsetup-generator dist_systemunit_DATA += \ - units/cryptsetup.target + units/cryptsetup.target \ + units/cryptsetup-pre.target systemd_cryptsetup_SOURCES = \ src/cryptsetup/cryptsetup.c @@ -3808,7 +4586,7 @@ rootlibexec_PROGRAMS += \ nodist_systemunit_DATA += \ units/systemd-hostnamed.service -dist_systemunit_DATA += \ +dist_systemunit_DATA_busnames += \ units/org.freedesktop.hostname1.busname dist_dbuspolicy_DATA += \ @@ -3851,44 +4629,12 @@ EXTRA_DIST += \ units/systemd-hostnamed.service.in # ------------------------------------------------------------------------------ -if ENABLE_KDBUS -systemd_bus_driverd_SOURCES = \ - src/bus-driverd/bus-driverd.c - -systemd_bus_driverd_LDADD = \ - libsystemd-internal.la \ - libsystemd-shared.la - -rootlibexec_PROGRAMS += \ - systemd-bus-driverd - -nodist_systemunit_DATA += \ - units/systemd-bus-driverd.service - -dist_systemunit_DATA += \ - units/org.freedesktop.DBus.busname \ +dist_systemunit_DATA_busnames += \ units/org.freedesktop.systemd1.busname BUSNAMES_TARGET_WANTS += \ - org.freedesktop.DBus.busname \ - org.freedesktop.systemd1.busname - -nodist_userunit_DATA += \ - units/user/systemd-bus-driverd.service - -USER_BUSNAMES_TARGET_WANTS += \ - org.freedesktop.DBus.busname \ org.freedesktop.systemd1.busname -USER_UNIT_ALIASES += \ - $(systemunitdir)/org.freedesktop.DBus.busname org.freedesktop.DBus.busname \ - $(systemunitdir)/org.freedesktop.systemd1.busname org.freedesktop.systemd1.busname -endif - -EXTRA_DIST += \ - units/systemd-bus-driverd.service.in \ - units/user/systemd-bus-driverd.service.in - # ------------------------------------------------------------------------------ if ENABLE_LOCALED systemd_localed_SOURCES = \ @@ -3897,12 +4643,17 @@ 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 -dist_systemunit_DATA += \ +dist_systemunit_DATA_busnames += \ units/org.freedesktop.locale1.busname rootlibexec_PROGRAMS += \ @@ -3929,9 +4680,6 @@ dist_pkgdata_DATA += \ dist_noinst_SCRIPT = \ src/locale/generate-kbd-model-map -update-kbd-model-map: src/locale/generate-kbd-model-map - $PYTHON $< >src/locale/kbd-model-map - localectl_SOURCES = \ src/locale/localectl.c @@ -3960,24 +4708,13 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ if ENABLE_TIMEDATED -libsystemd_timedated_core_la_SOURCES = \ - src/timedate/timedate-sntp.c \ - src/timedate/timedate-sntp.h - -libsystemd_timedated_core_la_LIBADD = \ - libsystemd-label.la \ - libsystemd-internal.la \ - libsystemd-shared.la \ - -lm - -noinst_LTLIBRARIES += \ - libsystemd-timedated-core.la - systemd_timedated_SOURCES = \ src/timedate/timedated.c systemd_timedated_LDADD = \ - libsystemd-timedated-core.la + libsystemd-label.la \ + libsystemd-internal.la \ + libsystemd-shared.la rootlibexec_PROGRAMS += \ systemd-timedated @@ -3991,16 +4728,12 @@ dist_dbuspolicy_DATA += \ nodist_systemunit_DATA += \ units/systemd-timedated.service -dist_systemunit_DATA += \ +dist_systemunit_DATA_busnames += \ units/org.freedesktop.timedate1.busname polkitpolicy_files += \ src/timedate/org.freedesktop.timedate1.policy -INSTALL_DIRS += \ - $(prefix)/lib/systemd/ntp-units.d \ - $(sysconfdir)/systemd/ntp-units.d - SYSTEM_UNIT_ALIASES += \ systemd-timedated.service dbus-org.freedesktop.timedate1.service @@ -4022,15 +4755,6 @@ dist_bashcompletion_DATA += \ dist_zshcompletion_DATA += \ shell-completion/zsh/_timedatectl - -test_timedate_sntp_SOURCES = \ - src/timedate/test-timedate-sntp.c - -test_timedate_sntp_LDADD = \ - libsystemd-timedated-core.la - -manual_tests += \ - test-timedate-sntp endif polkitpolicy_in_files += \ @@ -4039,12 +4763,61 @@ polkitpolicy_in_files += \ EXTRA_DIST += \ units/systemd-timedated.service.in +# ------------------------------------------------------------------------------ +if ENABLE_TIMESYNCD +systemd_timesyncd_SOURCES = \ + src/timesync/timesyncd.c \ + src/timesync/timesyncd-manager.c \ + src/timesync/timesyncd-manager.h \ + src/timesync/timesyncd-conf.c \ + src/timesync/timesyncd-conf.h \ + src/timesync/timesyncd-server.c \ + src/timesync/timesyncd-server.h + +nodist_systemd_timesyncd_SOURCES = \ + src/timesync/timesyncd-gperf.c + +EXTRA_DIST += \ + src/timesync/timesyncd-gperf.gperf + +CLEANFILES += \ + src/timesync/timesyncd-gperf.c + +systemd_timesyncd_LDADD = \ + libsystemd-resolve.la \ + libsystemd-network.la \ + libsystemd-label.la \ + libsystemd-internal.la \ + libsystemd-shared.la \ + -lm + +rootlibexec_PROGRAMS += \ + systemd-timesyncd + +nodist_systemunit_DATA += \ + units/systemd-timesyncd.service + +GENERAL_ALIASES += \ + $(systemunitdir)/systemd-timesyncd.service $(pkgsysconfdir)/system/sysinit.target.wants/systemd-timesyncd.service + +EXTRA_DIST += \ + units/systemd-timesyncd.service.in + +nodist_pkgsysconf_DATA += \ + src/timesync/timesyncd.conf + +EXTRA_DIST += \ + src/timesync/timesyncd.conf.in + +CLEANFILES += \ + src/timesync/timesyncd.conf +endif + # ------------------------------------------------------------------------------ if HAVE_MYHOSTNAME libnss_myhostname_la_SOURCES = \ - src/nss-myhostname/nss-myhostname.c \ - src/nss-myhostname/ifconf.h \ - src/nss-myhostname/netlink.c + src/nss-myhostname/nss-myhostname.sym \ + src/nss-myhostname/nss-myhostname.c libnss_myhostname_la_LDFLAGS = \ $(AM_LDFLAGS) \ @@ -4052,7 +4825,12 @@ libnss_myhostname_la_LDFLAGS = \ -export-dynamic \ -avoid-version \ -shared \ - -shrext .so.2 + -shrext .so.2 \ + -Wl,--version-script=$(top_srcdir)/src/nss-myhostname/nss-myhostname.sym + +libnss_myhostname_la_LIBADD = \ + libsystemd-shared.la \ + libsystemd-internal.la lib_LTLIBRARIES += \ libnss_myhostname.la @@ -4111,7 +4889,9 @@ nodist_systemunit_DATA += \ units/systemd-machined.service dist_systemunit_DATA += \ - units/machine.slice \ + units/machine.slice + +dist_systemunit_DATA_busnames += \ units/org.freedesktop.machine1.busname dist_dbussystemservice_DATA += \ @@ -4133,6 +4913,184 @@ BUSNAMES_TARGET_WANTS += \ EXTRA_DIST += \ units/systemd-machined.service.in +libnss_mymachines_la_SOURCES = \ + src/nss-mymachines/nss-mymachines.sym \ + src/nss-mymachines/nss-mymachines.c + +libnss_mymachines_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -module \ + -export-dynamic \ + -avoid-version \ + -shared \ + -shrext .so.2 \ + -Wl,--version-script=$(top_srcdir)/src/nss-mymachines/nss-mymachines.sym + +libnss_mymachines_la_LIBADD = \ + libsystemd-shared.la \ + libsystemd-internal.la + +lib_LTLIBRARIES += \ + libnss_mymachines.la +endif + +# ------------------------------------------------------------------------------ +if ENABLE_RESOLVED +systemd_resolved_SOURCES = \ + src/resolve/resolved.c \ + src/resolve/resolved-manager.c \ + src/resolve/resolved-manager.h \ + src/resolve/resolved-conf.c \ + src/resolve/resolved-conf.h \ + src/resolve/resolved-bus.c \ + src/resolve/resolved-bus.h \ + src/resolve/resolved-link.h \ + src/resolve/resolved-link.c \ + src/resolve/resolved-def.h \ + src/resolve/resolved-dns-domain.h \ + src/resolve/resolved-dns-domain.c \ + src/resolve/resolved-dns-rr.h \ + src/resolve/resolved-dns-rr.c \ + src/resolve/resolved-dns-question.h \ + src/resolve/resolved-dns-question.c \ + src/resolve/resolved-dns-answer.h \ + src/resolve/resolved-dns-answer.c \ + src/resolve/resolved-dns-packet.h \ + src/resolve/resolved-dns-packet.c \ + src/resolve/resolved-dns-query.h \ + src/resolve/resolved-dns-query.c \ + src/resolve/resolved-dns-transaction.h \ + src/resolve/resolved-dns-transaction.c \ + src/resolve/resolved-dns-scope.h \ + src/resolve/resolved-dns-scope.c \ + src/resolve/resolved-dns-server.h \ + src/resolve/resolved-dns-server.c \ + src/resolve/resolved-dns-cache.h \ + src/resolve/resolved-dns-cache.c \ + src/resolve/resolved-dns-zone.h \ + src/resolve/resolved-dns-zone.c \ + src/resolve/resolved-dns-stream.h \ + src/resolve/resolved-dns-stream.c \ + src/resolve/dns-type.c \ + src/resolve/dns-type.h \ + src/resolve/dns_type-from-name.h \ + src/resolve/dns_type-to-name.h + +nodist_systemd_resolved_SOURCES = \ + src/resolve/resolved-gperf.c + +EXTRA_DIST += \ + src/resolve/resolved-gperf.gperf \ + src/resolve/dns_type-from-name.gperf + +CLEANFILES += \ + src/resolve/resolved-gperf.c + +systemd_resolved_LDADD = \ + libsystemd-network.la \ + libsystemd-label.la \ + libsystemd-internal.la \ + libsystemd-shared.la \ + -lm \ + $(LIBIDN_LIBS) + +rootlibexec_PROGRAMS += \ + systemd-resolved + +nodist_systemunit_DATA += \ + units/systemd-resolved.service + +dist_systemunit_DATA_busnames += \ + units/org.freedesktop.resolve1.busname + +dist_dbuspolicy_DATA += \ + src/resolve/org.freedesktop.resolve1.conf + +dist_dbussystemservice_DATA += \ + src/resolve/org.freedesktop.resolve1.service + +EXTRA_DIST += \ + units/systemd-resolved.service.in + +SYSTEM_UNIT_ALIASES += \ + systemd-resolved.service dbus-org.freedesktop.resolve1.service + +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.resolve1.busname + +GENERAL_ALIASES += \ + $(systemunitdir)/systemd-resolved.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-resolved.service + +nodist_pkgsysconf_DATA += \ + src/resolve/resolved.conf + +EXTRA_DIST += \ + src/resolve/resolved.conf.in + +CLEANFILES += \ + src/resolve/resolved.conf + +tests += \ + test-dns-domain + +test_dns_domain_SOURCES = \ + src/resolve/resolved-dns-domain.h \ + src/resolve/resolved-dns-domain.c \ + src/resolve/test-dns-domain.c + +test_dns_domain_LDADD = \ + libsystemd-network.la \ + libsystemd-label.la \ + libsystemd-internal.la \ + libsystemd-shared.la \ + $(LIBIDN_LIBS) + +libnss_resolve_la_SOURCES = \ + src/nss-resolve/nss-resolve.sym \ + src/nss-resolve/nss-resolve.c + +libnss_resolve_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -module \ + -export-dynamic \ + -avoid-version \ + -shared \ + -shrext .so.2 \ + -Wl,--version-script=$(top_srcdir)/src/nss-resolve/nss-resolve.sym + +libnss_resolve_la_LIBADD = \ + libsystemd-shared.la \ + libsystemd-internal.la + +lib_LTLIBRARIES += \ + libnss_resolve.la + +systemd_resolve_host_SOURCES = \ + src/resolve-host/resolve-host.c \ + src/resolve/resolved-dns-packet.c \ + src/resolve/resolved-dns-packet.h \ + src/resolve/resolved-dns-rr.c \ + src/resolve/resolved-dns-rr.h \ + src/resolve/resolved-dns-answer.c \ + src/resolve/resolved-dns-answer.h \ + src/resolve/resolved-dns-question.c \ + src/resolve/resolved-dns-question.h \ + src/resolve/resolved-dns-domain.c \ + src/resolve/resolved-dns-domain.h \ + src/resolve/dns-type.c \ + src/resolve/dns-type.h \ + src/resolve/dns_type-from-name.h \ + src/resolve/dns_type-to-name.h + +systemd_resolve_host_LDADD = \ + libsystemd-internal.la \ + libsystemd-shared.la \ + -lm \ + $(LIBIDN_LIBS) + +rootlibexec_PROGRAMS += \ + systemd-resolve-host + endif # ------------------------------------------------------------------------------ @@ -4149,14 +5107,41 @@ systemd_networkd_LDADD = \ noinst_LTLIBRARIES += \ libsystemd-networkd-core.la +libsystemd_networkd_core_la_CFLAGS = \ + $(AM_CFLAGS) + libsystemd_networkd_core_la_SOURCES = \ + src/libsystemd-network/network-internal.h \ src/network/networkd.h \ - src/network/networkd-link.c \ + src/network/networkd-link.h \ + src/network/networkd-netdev.h \ + src/network/networkd-netdev-tunnel.h \ + src/network/networkd-netdev-veth.h \ + src/network/networkd-netdev-vxlan.h \ + src/network/networkd-netdev-vlan.h \ + src/network/networkd-netdev-macvlan.h \ + src/network/networkd-netdev-dummy.h \ + src/network/networkd-netdev-tuntap.h \ + src/network/networkd-netdev-bond.h \ + src/network/networkd-netdev-bridge.h \ src/network/networkd-netdev.c \ + src/network/networkd-netdev-tunnel.c \ + src/network/networkd-netdev-veth.c \ + src/network/networkd-netdev-vxlan.c \ + src/network/networkd-netdev-vlan.c \ + src/network/networkd-netdev-macvlan.c \ + src/network/networkd-netdev-dummy.c \ + src/network/networkd-netdev-tuntap.c \ + src/network/networkd-netdev-bond.c \ + src/network/networkd-netdev-bridge.c \ + src/network/networkd-link.c \ + src/network/networkd-ipv4ll.c \ + src/network/networkd-dhcp4.c \ src/network/networkd-network.c \ src/network/networkd-address.c \ src/network/networkd-route.c \ - src/network/networkd-manager.c + src/network/networkd-manager.c \ + src/network/networkd-address-pool.c nodist_libsystemd_networkd_core_la_SOURCES = \ src/network/networkd-network-gperf.c \ @@ -4169,20 +5154,36 @@ libsystemd_networkd_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-shared.la -nodist_systemunit_DATA += \ - units/systemd-networkd.service - -GENERAL_ALIASES += \ - $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service - rootlibexec_PROGRAMS += \ systemd-networkd-wait-online +systemd_networkd_wait_online_CFLAGS = \ + $(AM_CFLAGS) + systemd_networkd_wait_online_SOURCES = \ - src/network/networkd-wait-online.c + src/libsystemd-network/network-internal.h \ + src/network/networkd-wait-online.h \ + src/network/networkd-wait-online-link.h \ + src/network/networkd-wait-online.c \ + src/network/networkd-wait-online-manager.c \ + src/network/networkd-wait-online-link.c systemd_networkd_wait_online_LDADD = \ + libsystemd-network.la \ + libudev-internal.la \ + libsystemd-internal.la \ + libsystemd-shared.la + +rootbin_PROGRAMS += \ + networkctl + +networkctl_SOURCES = \ + src/network/networkctl.c + +networkctl_LDADD = \ libsystemd-internal.la \ + libudev-internal.la \ + libsystemd-shared.la \ libsystemd-network.la test_network_SOURCES = \ @@ -4191,13 +5192,31 @@ test_network_SOURCES = \ test_network_LDADD = \ libsystemd-networkd-core.la +test_network_tables_SOURCES = \ + src/network/test-network-tables.c \ + src/shared/test-tables.h + +test_network_tables_LDADD = \ + libsystemd-networkd-core.la \ + libudev-core.la + tests += \ - test-network + test-network \ + test-network-tables + +nodist_systemunit_DATA += \ + units/systemd-networkd.service \ + units/systemd-networkd-wait-online.service + +GENERAL_ALIASES += \ + $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \ + $(systemunitdir)/systemd-networkd-wait-online.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service EXTRA_DIST += \ src/network/networkd-network-gperf.gperf \ src/network/networkd-netdev-gperf.gperf \ - units/systemd-networkd.service.in + units/systemd-networkd.service.in \ + units/systemd-networkd-wait-online.service.in CLEANFILES += \ src/network/networkd-network-gperf.c \ @@ -4242,7 +5261,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 @@ -4334,7 +5352,8 @@ tests += \ if HAVE_PAM pam_systemd_la_SOURCES = \ - src/login/pam-module.c + src/login/pam_systemd.sym \ + src/login/pam_systemd.c pam_systemd_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -4347,10 +5366,9 @@ pam_systemd_la_LDFLAGS = \ -export-dynamic \ -avoid-version \ -shared \ - -export-symbols-regex '^pam_sm_.*' + -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) @@ -4367,7 +5385,9 @@ nodist_systemunit_DATA += \ units/systemd-user-sessions.service dist_systemunit_DATA += \ - units/user.slice \ + units/user.slice + +dist_systemunit_DATA_busnames += \ units/org.freedesktop.login1.busname dist_dbussystemservice_DATA += \ @@ -4395,20 +5415,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 @@ -4462,10 +5468,12 @@ _journal_la_LIBADD = \ id128_la_SOURCES = \ src/python-systemd/id128.c \ - src/python-systemd/id128-constants.h \ src/python-systemd/pyutil.c \ src/python-systemd/pyutil.h +nodist_id128_la_SOURCES = \ + src/python-systemd/id128-constants.h + id128_la_CFLAGS = \ $(AM_CFLAGS) \ -fvisibility=default \ @@ -4727,9 +5735,11 @@ substitutions = \ '|udevrulesdir=$(udevrulesdir)|' \ '|catalogdir=$(catalogdir)|' \ '|tmpfilesdir=$(tmpfilesdir)|' \ + '|sysusersdir=$(sysusersdir)|' \ '|sysctldir=$(sysctldir)|' \ '|systemgeneratordir=$(systemgeneratordir)|' \ '|usergeneratordir=$(usergeneratordir)|' \ + '|CERTIFICATEROOT=$(CERTIFICATEROOT)|' \ '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \ '|PACKAGE_NAME=$(PACKAGE_NAME)|' \ '|PACKAGE_URL=$(PACKAGE_URL)|' \ @@ -4754,7 +5764,16 @@ substitutions = \ '|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \ '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \ '|PYTHON=$(PYTHON)|' \ - '|PYTHON_BINARY=$(PYTHON_BINARY)|' + '|PYTHON_BINARY=$(PYTHON_BINARY)|' \ + '|NTP_SERVERS=$(NTP_SERVERS)|' \ + '|DNS_SERVERS=$(DNS_SERVERS)|' \ + '|systemuidmax=$(SYSTEM_UID_MAX)|' \ + '|systemgidmax=$(SYSTEM_GID_MAX)|' \ + '|TTY_GID=$(TTY_GID)|' \ + '|systemsleepdir=$(systemsleepdir)|' \ + '|systemshutdowndir=$(systemshutdowndir)|' \ + '|binfmtdir=$(binfmtdir)|' \ + '|modulesloaddir=$(modulesloaddir)|' SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ @@ -4773,15 +5792,24 @@ sysctl.d/%: sysctl.d/%.in %.pc: %.pc.in $(SED_PROCESS) +%.conf: %.conf.in + $(SED_PROCESS) + src/core/macros.%: src/core/macros.%.in $(SED_PROCESS) src/%.policy.in: src/%.policy.in.in $(SED_PROCESS) +shell-completion/%: shell-completion/%.in + $(SED_PROCESS) + %.rules: %.rules.in $(SED_PROCESS) +%.conf: %.conf.in + $(SED_PROCESS) + %.sh: %.sh.in $(SED_PROCESS) $(AM_V_GEN)chmod +x $@ @@ -4794,6 +5822,11 @@ src/%: src/%.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) < $< > $@ + + units/%: units/%.m4 $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ @@ -4901,6 +5934,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 @@ -4913,14 +5947,22 @@ RUNLEVEL4_TARGET_WANTS += \ RUNLEVEL5_TARGET_WANTS += \ systemd-update-utmp-runlevel.service endif + SYSINIT_TARGET_WANTS += \ systemd-update-utmp.service +endif + +SYSINIT_TARGET_WANTS += \ + systemd-update-done.service + LOCAL_FS_TARGET_WANTS += \ systemd-remount-fs.service \ tmp.mount + MULTI_USER_TARGET_WANTS += \ getty.target \ systemd-ask-password-wall.path + SYSINIT_TARGET_WANTS += \ dev-hugepages.mount \ dev-mqueue.mount \ @@ -4949,7 +5991,6 @@ SYSTEM_UNIT_ALIASES += \ USER_UNIT_ALIASES += \ $(systemunitdir)/shutdown.target shutdown.target \ $(systemunitdir)/sockets.target sockets.target \ - $(systemunitdir)/busnames.target busnames.target \ $(systemunitdir)/timers.target timers.target \ $(systemunitdir)/paths.target paths.target \ $(systemunitdir)/bluetooth.target bluetooth.target \ @@ -4957,6 +5998,11 @@ USER_UNIT_ALIASES += \ $(systemunitdir)/sound.target sound.target \ $(systemunitdir)/smartcard.target smartcard.target +if ENABLE_KDBUS +USER_UNIT_ALIASES += \ + $(systemunitdir)/busnames.target busnames.target +endif + GENERAL_ALIASES += \ $(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \ $(systemunitdir)/getty@.service $(pkgsysconfdir)/system/getty.target.wants/getty@tty1.service \ @@ -5030,37 +6076,62 @@ DISTCHECK_CONFIGURE_FLAGS += \ --with-sysvrcnd-path= endif +if HAVE_PYTHON +DISTCHECK_CONFIGURE_FLAGS += \ + --with-python +endif + if ENABLE_GTK_DOC DISTCHECK_CONFIGURE_FLAGS += \ --enable-gtk-doc endif +# +# Require python when making dist +# +.PHONY: dist-check-python +dist-check-python: +if !HAVE_PYTHON + @echo "*** python and python-lxml module must be installed and enabled in order to make dist" + @false +endif + +dist-check-compat-libs: +if !ENABLE_COMPAT_LIBS + @echo "*** compat-libs must be enabled in order to make dist" + @false +endif + +dist: dist-check-python dist-check-compat-libs + # check "broken" platforms limited toolchains for link breakage before we release -.PHONY: check-broken -check-broken: - $(MAKE) CFLAGS='-fno-lto' LDFLAGS='-Wl,--no-as-needed -Wl,--no-gc-sections' distcheck +.PHONY: linkcheck +linkcheck: + $(MAKE) CFLAGS='-fno-lto' LDFLAGS='-Wl,-fuse-ld=gold -Wl,--as-needed -Wl,--no-gc-sections' distcheck .PHONY: hwdb-update hwdb-update: ( cd $(top_srcdir)/hwdb && \ wget -N http://www.linux-usb.org/usb.ids \ - http://pci-ids.ucw.cz/v2.2/pci.ids \ - http://standards.ieee.org/develop/regauth/oui/oui.txt \ - http://standards.ieee.org/develop/regauth/iab/iab.txt && \ + http://pci-ids.ucw.cz/v2.2/pci.ids \ + http://standards.ieee.org/develop/regauth/oui/oui.txt \ + http://standards.ieee.org/develop/regauth/iab/iab.txt && \ ./ids-update.pl ) .PHONY: kdbus-update kdbus-update: - ( cd $(top_srcdir)/src/libsystemd/ && \ + ( cd $(top_srcdir)/src/libsystemd/sd-bus/ && \ wget -N https://d-bus.googlecode.com/git/kdbus.h ) +.PHONY: git-tag +git-tag: + git tag -s "v$(VERSION)" -m "systemd $(VERSION)" + +www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd .PHONY: upload upload: all check dist - cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/ - scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/ - scp man/*.html tango:public/systemd-man/ + scp systemd-$(VERSION).tar.xz $(www_target) -www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd .PHONY: doc-sync doc-sync: all destdir-sphinx gtkdoc-rebase --html-dir=docs/libudev/html --online @@ -5070,9 +6141,10 @@ 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: git-tag -git-tag: - git tag -s "v$(VERSION)" -m "systemd $(VERSION)" +.PHONY: tango +tango: upload + cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/ + scp man/*.html tango:public/systemd-man/ .PHONY: install-tree install-tree: all @@ -5088,12 +6160,12 @@ valgrind-tests: $(TESTS) if file $$f | grep -q shell; then \ echo -e "$${x}Skipping non-binary $$f"; else \ echo -e "$${x}Running $$f"; \ - libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \ + libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \ x="\n\n"; \ done exported-%: % - $(AM_V_GEN)nm -g --defined-only $(builddir)/.libs/$(<:.la=.so) 2>&1 /dev/null | grep " T " | cut -d" " -f3 > $@ + $(AM_V_GEN)$(NM) -g --defined-only $(builddir)/.libs/$(<:.la=.so) 2>&1 /dev/null | grep " T " | cut -d" " -f3 > $@ exported: $(addprefix exported-, $(lib_LTLIBRARIES)) $(AM_V_GEN)cat $^ > $@ @@ -5113,7 +6185,7 @@ ALL_OBJECTS:=$(foreach v,$(OBJECT_VARIABLES),$($(v))) undefined defined: $(ALL_OBJECTS) $(AM_V_GEN)for f in $(ALL_OBJECTS) ; do \ - nm -g --$@-only `echo $(builddir)/"$$f" | sed -e 's,\([^/]*\).lo$$,.libs/\1.o,'` ; \ + $(NM) -g --$@-only `echo $(builddir)/"$$f" | sed -e 's,\([^/]*\).lo$$,.libs/\1.o,'` ; \ done | cut -c 20- | cut -d @ -f 1 | sort -u > $@ CLEANFILES += \ @@ -5150,7 +6222,9 @@ test-libsystemd-sym.c: \ src/systemd/sd-daemon.h \ src/systemd/sd-login.h \ src/systemd/sd-bus.h \ - src/systemd/sd-utf8.h + src/systemd/sd-utf8.h \ + src/systemd/sd-resolve.h \ + src/systemd/sd-path.h $(generate-sym-test) test-libudev-sym.c: \ @@ -5165,6 +6239,9 @@ test_libsystemd_sym_LDADD = \ test_libudev_sym_SOURCES = \ test-libudev-sym.c +test_libudev_sym_CFLAGS = \ + $(AM_CFLAGS) \ + -Wno-deprecated-declarations test_libudev_sym_LDADD = \ libudev.la @@ -5176,60 +6253,6 @@ tests += \ test-libsystemd-sym \ test-libudev-sym -if ENABLE_COMPAT_LIBS -test-libsystemd-daemon-sym.c: \ - src/compat-libs/libsystemd-daemon.sym \ - src/systemd/sd-daemon.h - $(generate-sym-test) - -test-libsystemd-id128-sym.c: \ - src/compat-libs/libsystemd-id128.sym \ - src/systemd/sd-id128.h - $(generate-sym-test) - -test-libsystemd-journal-sym.c: \ - src/compat-libs/libsystemd-journal.sym \ - src/systemd/sd-journal.h - $(generate-sym-test) - -test-libsystemd-login-sym.c: \ - src/compat-libs/libsystemd-login.sym \ - src/systemd/sd-login.h - $(generate-sym-test) - -test_libsystemd_daemon_sym_SOURCES = \ - test-libsystemd-daemon-sym.c -test_libsystemd_daemon_sym_LDADD = \ - libsystemd-daemon.la - -test_libsystemd_id128_sym_SOURCES = \ - test-libsystemd-id128-sym.c -test_libsystemd_id128_sym_LDADD = \ - libsystemd-id128.la - -test_libsystemd_journal_sym_SOURCES = \ - test-libsystemd-journal-sym.c -test_libsystemd_journal_sym_LDADD = \ - libsystemd-journal.la - -test_libsystemd_login_sym_SOURCES = \ - test-libsystemd-login-sym.c -test_libsystemd_login_sym_LDADD = \ - libsystemd-login.la - -BUILT_SOURCES += \ - $(test_libsystemd_journal_sym_SOURCES) \ - $(test_libsystemd_login_sym_SOURCES) \ - $(test_libsystemd_id128_sym_SOURCES) \ - $(test_libsystemd_daemon_sym_SOURCES) - -tests += \ - test-libsystemd-journal-sym \ - test-libsystemd-login-sym \ - test-libsystemd-id128-sym \ - test-libsystemd-daemon-sym -endif - .PHONY: cppcheck cppcheck: cppcheck --enable=all -q $(top_srcdir) @@ -5240,3 +6263,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