X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=fef6d242c7445c71961987b83d44b163a4422b16;hp=b7c38b6871b925ff42ef47784a988e6a8e97e3d9;hb=3be1d7e0c5bf60658d34eb6311d4e77c6803578c;hpb=fe8db0c5ee3365a2fc80ee7ebffa238f9a0a2ae2 diff --git a/Makefile.am b/Makefile.am index b7c38b687..fef6d242c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,14 +35,20 @@ SUBDIRS = . po # Keep the test-suite.log .PRECIOUS: $(TEST_SUITE_LOG) Makefile -LIBUDEV_CURRENT=5 +LIBUDEV_CURRENT=6 LIBUDEV_REVISION=0 -LIBUDEV_AGE=4 +LIBUDEV_AGE=5 LIBGUDEV_CURRENT=2 LIBGUDEV_REVISION=0 LIBGUDEV_AGE=2 +LIBSYSTEMD_CURRENT=3 +LIBSYSTEMD_REVISION=1 +LIBSYSTEMD_AGE=3 + +# 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 +65,6 @@ LIBSYSTEMD_JOURNAL_CURRENT=11 LIBSYSTEMD_JOURNAL_REVISION=5 LIBSYSTEMD_JOURNAL_AGE=11 -LIBSYSTEMD_CURRENT=0 -LIBSYSTEMD_REVISION=1 -LIBSYSTEMD_AGE=0 - # Dirs of external packages dbuspolicydir=@dbuspolicydir@ dbussessionservicedir=@dbussessionservicedir@ @@ -86,7 +88,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 @@ -128,6 +133,7 @@ polkitpolicy_in_files = polkitpolicy_files = dist_udevrules_DATA = nodist_udevrules_DATA = +nodist_pkgsysconf_DATA = dist_pkgsysconf_DATA = dist_pkgdata_DATA = dist_dbuspolicy_DATA = @@ -180,12 +186,17 @@ AM_CPPFLAGS = \ -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \ -DQUOTACHECK=\"$(QUOTACHECK)\" \ -DKEXEC=\"$(KEXEC)\" \ + -DLIBDIR=\"$(libdir)\" \ + -DROOTLIBDIR=\"$(rootlibdir)\" \ -I $(top_srcdir)/src \ -I $(top_builddir)/src/shared \ -I $(top_srcdir)/src/shared \ -I $(top_srcdir)/src/network \ -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_srcdir)/src/systemd \ -I $(top_builddir)/src/core \ -I $(top_srcdir)/src/core \ @@ -207,8 +218,8 @@ define move-to-rootlibdir if test "$(libdir)" != "$(rootlibdir)"; then \ $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \ so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \ - so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \ - $(LN_S) -f $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \ + rm -f $(DESTDIR)$(libdir)/$$libname && \ + $(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \ mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \ fi endef @@ -232,7 +243,6 @@ USER_BUSNAMES_TARGET_WANTS = SYSTEM_UNIT_ALIASES = USER_UNIT_ALIASES = - GENERAL_ALIASES = install-target-wants-hook: @@ -268,9 +278,9 @@ install-aliases-hook: set -- $(SYSTEM_UNIT_ALIASES) && \ dir=$(systemunitdir) && $(install-aliases) set -- $(USER_UNIT_ALIASES) && \ - dir=$(userunitdir) && $(install-aliases) + dir=$(userunitdir) && $(install-relative-aliases) set -- $(GENERAL_ALIASES) && \ - dir= && $(install-aliases) + dir= && $(install-relative-aliases) define install-aliases while [ -n "$$1" ]; do \ @@ -281,10 +291,23 @@ define install-aliases done endef +define install-relative-aliases + while [ -n "$$1" ]; do \ + $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \ + rm -f $(DESTDIR)$$dir/$$2 && \ + $(LN_S) --relative $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \ + shift 2 || exit $$?; \ + 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 # ------------------------------------------------------------------------------ AM_V_M4 = $(AM_V_M4_$(V)) @@ -303,13 +326,18 @@ AM_V_LN = $(AM_V_LN_$(V)) AM_V_LN_ = $(AM_V_LN_$(AM_DEFAULT_VERBOSITY)) AM_V_LN_0 = @echo " LN " $@; +AM_V_RM = $(AM_V_RM_$(V)) +AM_V_RM_ = $(AM_V_RM_$(AM_DEFAULT_VERBOSITY)) +AM_V_RM_0 = @echo " RM " $@; + # ------------------------------------------------------------------------------ rootbin_PROGRAMS = \ systemctl \ systemd-notify \ systemd-ask-password \ systemd-tty-ask-password-agent \ - systemd-machine-id-setup + systemd-machine-id-setup \ + systemd-escape bin_PROGRAMS = \ systemd-cgls \ @@ -318,7 +346,8 @@ bin_PROGRAMS = \ systemd-detect-virt \ systemd-delta \ systemd-analyze \ - systemd-run + systemd-run \ + systemd-path dist_bin_SCRIPTS = \ src/kernel-install/kernel-install @@ -341,19 +370,26 @@ rootlibexec_PROGRAMS = \ systemd-sysctl \ systemd-sleep \ systemd-bus-proxyd \ - systemd-socket-proxyd + systemd-socket-proxyd \ + systemd-update-done 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 \ + shell-completion/bash/systemd-cgtop \ shell-completion/bash/systemd-delta \ + shell-completion/bash/systemd-detect-virt \ + shell-completion/bash/systemd-nspawn \ shell-completion/bash/systemd-run \ shell-completion/bash/udevadm \ shell-completion/bash/kernel-install @@ -376,7 +412,6 @@ dist_sysctl_DATA = \ dist_systemunit_DATA = \ units/graphical.target \ units/multi-user.target \ - units/emergency.service \ units/emergency.target \ units/sysinit.target \ units/basic.target \ @@ -391,6 +426,7 @@ 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 \ @@ -433,7 +469,8 @@ dist_systemunit_DATA = \ units/systemd-udevd-control.socket \ units/systemd-udevd-kernel.socket \ units/system-update.target \ - units/initrd-switch-root.target + units/initrd-switch-root.target \ + units/ldconfig.service nodist_systemunit_DATA = \ units/getty@.service \ @@ -464,12 +501,14 @@ 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 dist_userunit_DATA = \ units/user/basic.target \ @@ -479,6 +518,9 @@ 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 \ @@ -512,7 +554,8 @@ EXTRA_DIST += \ 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 \ @@ -527,6 +570,7 @@ nodist_systemunit_DATA += \ units/halt-local.service systemgenerator_PROGRAMS += \ + systemd-sysv-generator \ systemd-rc-local-generator endif @@ -551,7 +595,10 @@ dist_doc_DATA = \ LICENSE.LGPL2.1 \ LICENSE.GPL2 \ LICENSE.MIT \ - DISTRO_PORTING + DISTRO_PORTING \ + src/libsystemd/sd-bus/PORTING-DBUS1 \ + src/libsystemd/sd-bus/DIFFERENCES \ + src/libsystemd/sd-bus/GVARIANT-SERIALIZATION @INTLTOOL_POLICY_RULE@ @@ -679,6 +726,8 @@ 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/hashmap.c \ src/shared/hashmap.h \ src/shared/siphash24.c \ @@ -715,6 +764,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 \ @@ -733,8 +784,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 \ @@ -758,8 +809,6 @@ libsystemd_shared_la_SOURCES = \ src/shared/ima-util.h \ src/shared/ptyfwd.c \ src/shared/ptyfwd.h \ - src/shared/net-util.c \ - src/shared/net-util.h \ src/shared/errno-list.c \ src/shared/errno-list.h \ src/shared/af-list.c \ @@ -771,7 +820,23 @@ libsystemd_shared_la_SOURCES = \ src/shared/condition-util.c \ src/shared/condition-util.h \ src/shared/bus-label.c \ - src/shared/bus-label.h + src/shared/bus-label.h \ + src/shared/gpt.h \ + src/shared/clean-ipc.h \ + src/shared/clean-ipc.c \ + src/shared/login-shared.c \ + src/shared/login-shared.h \ + src/shared/ring.c \ + src/shared/ring.h \ + src/shared/async.c \ + src/shared/async.h \ + src/shared/eventfd-util.c \ + src/shared/eventfd-util.h \ + src/shared/copy.c \ + src/shared/copy.h \ + src/shared/base-filesystem.c \ + src/shared/base-filesystem.h \ + src/shared/nss-util.h nodist_libsystemd_shared_la_SOURCES = \ src/shared/errno-from-name.h \ @@ -781,7 +846,8 @@ nodist_libsystemd_shared_la_SOURCES = \ libsystemd_shared_la_CFLAGS = \ $(AM_CFLAGS) \ - $(SECCOMP_CFLAGS) + $(SECCOMP_CFLAGS) \ + -pthread # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ @@ -813,7 +879,11 @@ libsystemd_label_la_SOURCES = \ 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/generator.h \ + src/shared/generator.c libsystemd_label_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -969,8 +1039,6 @@ libsystemd_core_la_SOURCES = \ src/core/dbus-kill.h \ src/core/dbus-cgroup.c \ src/core/dbus-cgroup.h \ - src/core/dbus-client-track.c \ - src/core/dbus-client-track.h \ src/core/cgroup.c \ src/core/cgroup.h \ src/core/selinux-access.c \ @@ -995,8 +1063,6 @@ libsystemd_core_la_SOURCES = \ src/core/condition.h \ src/core/namespace.c \ src/core/namespace.h \ - src/core/tcpwrap.c \ - src/core/tcpwrap.h \ src/core/build.h \ src/core/sysfs-show.h \ src/core/switch-root.h \ @@ -1005,8 +1071,8 @@ libsystemd_core_la_SOURCES = \ 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 += \ @@ -1020,7 +1086,6 @@ nodist_libsystemd_core_la_SOURCES = \ libsystemd_core_la_CFLAGS = \ $(AM_CFLAGS) \ - $(LIBWRAP_CFLAGS) \ $(PAM_CFLAGS) \ $(AUDIT_CFLAGS) \ $(CAP_CFLAGS) \ @@ -1036,7 +1101,6 @@ libsystemd_core_la_LIBADD = \ libudev-internal.la \ libsystemd-shared.la \ libsystemd-internal.la \ - $(LIBWRAP_LIBS) \ $(PAM_LIBS) \ $(AUDIT_LIBS) \ $(CAP_LIBS) \ @@ -1073,7 +1137,7 @@ BUILT_SOURCES += \ 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; }' > $@ + $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - < /dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' > $@ src/shared/errno-from-name.gperf: src/shared/errno-list.txt $(AM_V_at)$(MKDIR_P) $(dir $@) @@ -1085,7 +1149,7 @@ src/shared/errno-from-name.h: src/shared/errno-from-name.gperf 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 $@) @@ -1150,9 +1214,16 @@ manual_tests += \ test-hostname \ test-daemon \ test-cgroup \ + test-cgroup-mask \ test-install \ test-watchdog \ - test-log + test-log \ + test-ipcrm + +if HAVE_KMOD +manual_tests += \ + test-rtnl-manual +endif tests += \ test-job-type \ @@ -1166,6 +1237,7 @@ tests += \ test-utf8 \ test-ellipsize \ test-util \ + test-ring \ test-tmpfiles \ test-namespace \ test-date \ @@ -1175,7 +1247,6 @@ tests += \ test-calendarspec \ test-strip-tab-ansi \ test-cgroup-util \ - test-cgroup-mask \ test-prioq \ test-fileio \ test-time \ @@ -1184,7 +1255,13 @@ tests += \ 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 EXTRA_DIST += \ test/sched_idle_bad.service \ @@ -1288,12 +1365,49 @@ test_utf8_SOURCES = \ test_utf8_LDADD = \ libsystemd-shared.la +test_capability_SOURCES = \ + src/test/test-capability.c + +test_capability_LDADD = \ + libsystemd-shared.la \ + libsystemd-capability.la + +test_async_SOURCES = \ + src/test/test-async.c + +test_async_LDADD = \ + libsystemd-shared.la + +test_fdset_SOURCES = \ + src/test/test-fdset.c + +test_fdset_LDADD = \ + libsystemd-core.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 = \ libsystemd-core.la +test_socket_util_SOURCES = \ + src/test/test-socket-util.c + +test_socket_util_LDADD = \ + libsystemd-core.la + +test_ring_SOURCES = \ + src/test/test-ring.c + +test_ring_LDADD = \ + libsystemd-core.la + test_tmpfiles_SOURCES = \ src/test/test-tmpfiles.c @@ -1368,6 +1482,25 @@ test_log_SOURCES = \ test_log_LDADD = \ libsystemd-core.la +test_ipcrm_SOURCES = \ + src/test/test-ipcrm.c + +test_ipcrm_LDADD = \ + libsystemd-shared.la \ + -lrt + +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 \ + $(KMOD_LIBS) + test_ellipsize_SOURCES = \ src/test/test-ellipsize.c @@ -1504,12 +1637,18 @@ 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 + # ------------------------------------------------------------------------------ ## .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 @@ -1571,6 +1710,14 @@ 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-shared.la + # ------------------------------------------------------------------------------ systemd_shutdownd_SOURCES = \ src/shutdownd/shutdownd.c @@ -1630,8 +1777,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 @@ -1660,7 +1807,9 @@ 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 \ + tmpfiles.d/etc.conf if HAVE_SYSV_COMPAT dist_tmpfiles_DATA += \ @@ -1687,6 +1836,71 @@ EXTRA_DIST += \ units/systemd-tmpfiles-setup.service.in \ units/systemd-tmpfiles-clean.service.in +# ------------------------------------------------------------------------------ +if ENABLE_SYSUSERS +systemd_sysusers_SOURCES = \ + src/sysusers/sysusers.c + +systemd_sysusers_LDADD = \ + libsystemd-units.la \ + libsystemd-label.la \ + libsystemd-capability.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 + +# ------------------------------------------------------------------------------ +if ENABLE_FIRSTBOOT +systemd_firstboot_SOURCES = \ + src/firstboot/firstboot.c + +systemd_firstboot_LDADD = \ + libsystemd-units.la \ + libsystemd-label.la \ + libsystemd-capability.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 \ @@ -1736,9 +1950,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 @@ -1757,6 +1968,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 \ @@ -1815,7 +2034,8 @@ systemgenerator_PROGRAMS += \ systemd-gpt-auto-generator systemd_gpt_auto_generator_SOURCES = \ - src/gpt-auto-generator/gpt-auto-generator.c + src/gpt-auto-generator/gpt-auto-generator.c \ + src/shared/blkid-util.h systemd_gpt_auto_generator_LDADD = \ libsystemd-label.la \ @@ -1844,7 +2064,8 @@ systemd_dbus1_generator_LDADD = \ dbus1-generator-install-hook: $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir) - $(AM_V_LN)$(LN_S) -f $(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator + $(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator + $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator dbus1-generator-uninstall-hook: rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator @@ -1853,6 +2074,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 @@ -1880,6 +2110,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 @@ -1900,6 +2137,14 @@ 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 @@ -1920,6 +2165,7 @@ systemd_cgls_SOURCES = \ src/cgls/cgls.c systemd_cgls_LDADD = \ + libsystemd-internal.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -1939,14 +2185,16 @@ systemd_nspawn_SOURCES = \ systemd_nspawn_CFLAGS = \ $(AM_CFLAGS) \ - $(SECCOMP_CFLAGS) + $(SECCOMP_CFLAGS) \ + $(BLKID_CFLAGS) systemd_nspawn_LDADD = \ libsystemd-label.la \ libsystemd-capability.la \ libsystemd-internal.la \ libudev-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + $(BLKID_LIBS) if HAVE_SECCOMP systemd_nspawn_LDADD += \ @@ -1966,15 +2214,19 @@ systemd_run_LDADD = \ # ------------------------------------------------------------------------------ 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-capability.la \ libsystemd-internal.la \ libsystemd-shared.la bus-proxyd-install-hook: $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir) - $(AM_V_LN)$(LN_S) -f ../lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge + $(AM_V_RM)rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge + $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge bus-proxyd-uninstall-hook: rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge @@ -2018,6 +2270,7 @@ 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/libsystemd/sd-bus/sd-bus.c \ src/libsystemd/sd-bus/bus-control.c \ src/libsystemd/sd-bus/bus-control.h \ @@ -2050,8 +2303,12 @@ libsystemd_internal_la_SOURCES = \ src/libsystemd/sd-bus/bus-gvariant.c \ src/libsystemd/sd-bus/bus-gvariant.h \ src/libsystemd/sd-bus/bus-convenience.c \ + src/libsystemd/sd-bus/bus-track.c \ + 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 \ @@ -2061,15 +2318,16 @@ libsystemd_internal_la_SOURCES = \ 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-resolve/sd-resolve.c \ - src/libsystemd/sd-resolve/resolve-util.h \ + 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/login/sd-login.c \ - src/login/login-shared.c \ - src/login/login-shared.h + src/libsystemd/sd-login/sd-login.c \ + src/libsystemd/sd-path/sd-path.c nodist_libsystemd_internal_la_SOURCES = \ src/libsystemd/libsystemd.sym \ @@ -2082,8 +2340,20 @@ libsystemd_internal_la_CFLAGS = \ libsystemd_internal_la_LIBADD = \ $(RT_LIBS) +libsystemd_resolve_la_SOURCES = \ + src/libsystemd/sd-resolve/sd-resolve.c \ + src/libsystemd/sd-resolve/resolve-util.h + +libsystemd_resolve_la_CFLAGS = \ + $(AM_CFLAGS) \ + -pthread + +libsystemd_resolve_la_LIBADD = \ + -lresolv + noinst_LTLIBRARIES += \ - libsystemd-internal.la + libsystemd-internal.la \ + libsystemd-resolve.la libsystemd_dump_la_SOURCES = \ src/libsystemd/sd-bus/bus-dump.c \ @@ -2112,6 +2382,7 @@ BUILT_SOURCES += \ libsystemd_la_SOURCES = \ $(libsystemd_internal_la_SOURCES) \ + $(libsystemd_resolve_la_SOURCES) \ $(libsystemd_journal_internal_la_SOURCES) nodist_libsystemd_la_SOURCES = \ @@ -2119,6 +2390,7 @@ nodist_libsystemd_la_SOURCES = \ libsystemd_la_CFLAGS = \ $(libsystemd_internal_la_CFLAGS) \ + $(libsystemd_resolve_la_CFLAGS) \ $(libsystemd_journal_internal_la_CFLAGS) libsystemd_la_LDFLAGS = \ @@ -2128,9 +2400,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) @@ -2158,7 +2430,8 @@ pkginclude_HEADERS += \ 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 += \ @@ -2371,13 +2644,12 @@ 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-resolve.la \ libsystemd-internal.la \ - libsystemd-shared.la \ - -lresolv + libsystemd-shared.la test_resolve_CFLAGS = \ $(AM_CFLAGS) \ @@ -2401,23 +2673,52 @@ busctl_CFLAGS = \ 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/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 + src/libsystemd-network/sd-dhcp-lease.c \ + src/libsystemd-network/sd-ipv4ll.c \ + src/libsystemd-network/ipv4ll-network.c \ + src/libsystemd-network/ipv4ll-packet.c \ + src/libsystemd-network/ipv4ll-internal.h \ + src/libsystemd-network/network-internal.c \ + src/libsystemd-network/network-internal.h \ + src/systemd/sd-icmp6-nd.h \ + src/systemd/sd-dhcp6-client.h \ + src/systemd/sd-dhcp6-lease.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 \ @@ -2436,13 +2737,58 @@ test_dhcp_client_SOURCES = \ src/libsystemd-network/test-dhcp-client.c test_dhcp_client_LDADD = \ + libsystemd-network.la \ + libsystemd-label.la \ + 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_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 # ------------------------------------------------------------------------------ if ENABLE_GTK_DOC @@ -2521,8 +2867,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) \ @@ -2535,10 +2880,10 @@ 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/99-systemd.rules \ rules/42-usb-hid-pm.rules \ rules/50-udev-default.rules \ rules/60-drm.rules \ @@ -2555,6 +2900,9 @@ dist_udevrules_DATA += \ rules/80-net-setup-link.rules \ rules/95-udev-late.rules +nodist_udevrules_DATA += \ + rules/99-systemd.rules + dist_udevhwdb_DATA = \ hwdb/20-pci-vendor-model.hwdb \ hwdb/20-pci-classes.hwdb \ @@ -2587,19 +2935,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 @@ -2669,6 +3021,7 @@ libudev_core_la_LIBADD = \ libudev-internal.la \ libsystemd-label.la \ libsystemd-internal.la \ + libsystemd-network.la \ libsystemd-shared.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) @@ -2702,10 +3055,8 @@ if HAVE_ACL libudev_core_la_SOURCES += \ src/udev/udev-builtin-uaccess.c \ src/login/logind-acl.c \ - src/login/sd-login.c \ - src/systemd/sd-login.h \ - src/login/login-shared.c \ - src/login/login-shared.h + src/libsystemd/sd-login/sd-login.c \ + src/systemd/sd-login.h libudev_core_la_LIBADD += \ libsystemd-acl.la @@ -2899,6 +3250,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\ @@ -2942,8 +3294,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 $@) @@ -3079,6 +3432,38 @@ systemd_cat_SOURCES = \ systemd_cat_LDADD = \ libsystemd-journal-core.la +if HAVE_MICROHTTPD +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 + +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 + +systemd_journal_remote_CFLAGS = \ + $(AM_CFLAGS) \ + $(MICROHTTPD_CFLAGS) + +systemd_journal_remote_LDADD += \ + $(MICROHTTPD_LIBS) + +if HAVE_GNUTLS +systemd_journal_remote_LDADD += \ + $(GNUTLS_LIBS) +endif +endif + # using _CFLAGS = in the conditional below would suppress AM_CFLAGS journalctl_CFLAGS = \ $(AM_CFLAGS) @@ -3185,6 +3570,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 \ @@ -3196,6 +3595,8 @@ libsystemd_journal_core_la_SOURCES = \ src/journal/journald-server.h \ src/journal/journald-console.c \ src/journal/journald-console.h \ + src/journal/journald-wall.c \ + src/journal/journald-wall.h \ src/journal/journald-native.c \ src/journal/journald-native.h \ src/journal/journald-rate-limit.c \ @@ -3265,6 +3666,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 \ @@ -3291,15 +3698,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) @@ -3307,6 +3714,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 \ @@ -3336,11 +3748,13 @@ bin_PROGRAMS += \ systemd-cat dist_systemunit_DATA += \ - units/systemd-journald.socket + units/systemd-journald.socket \ + units/systemd-journald-dev-log.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 @@ -3352,14 +3766,18 @@ dist_catalog_DATA = \ catalog/systemd.catalog SOCKETS_TARGET_WANTS += \ - systemd-journald.socket + systemd-journald.socket \ + systemd-journald-dev-log.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 += \ @@ -3384,6 +3802,11 @@ systemd_journal_gatewayd_LDADD = \ libsystemd-shared.la \ $(MICROHTTPD_LIBS) +if HAVE_GNUTLS +systemd_journal_gatewayd_LDADD += \ + $(GNUTLS_LIBS) +endif + systemd_journal_gatewayd_CFLAGS = \ $(AM_CFLAGS) \ $(MICROHTTPD_CFLAGS) @@ -3415,38 +3838,73 @@ 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 \ libsystemd-label.la \ - libsystemd-shared.la \ - libsystemd-internal.la + 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 + +GENERAL_ALIASES += \ + $(bindir)/coredumpctl $(bindir)/systemd-coredumpctl sysctl_DATA = \ sysctl.d/50-coredump.conf @@ -3541,6 +3999,19 @@ nodist_systemunit_DATA += \ units/systemd-readahead-replay.service \ units/systemd-readahead-done.service +manual_tests += \ + test-ssd + +test_ssd_SOURCES = \ + src/readahead/test-ssd.c \ + src/readahead/readahead-common.c \ + src/readahead/readahead-common.h + +test_ssd_LDADD = \ + libsystemd-internal.la \ + libudev-internal.la \ + libsystemd-shared.la + endif EXTRA_DIST += \ @@ -3662,7 +4133,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 @@ -3749,39 +4221,13 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ 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 + units/org.freedesktop.systemd1.busname BUSNAMES_TARGET_WANTS += \ - org.freedesktop.DBus.busname - -nodist_userunit_DATA += \ - units/user/systemd-bus-driverd.service - -USER_BUSNAMES_TARGET_WANTS += \ - org.freedesktop.DBus.busname - -USER_UNIT_ALIASES += \ - $(systemunitdir)/org.freedesktop.DBus.busname org.freedesktop.DBus.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 = \ @@ -3879,10 +4325,6 @@ dist_systemunit_DATA += \ 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 @@ -3912,12 +4354,57 @@ polkitpolicy_in_files += \ EXTRA_DIST += \ units/systemd-timedated.service.in +# ------------------------------------------------------------------------------ +if ENABLE_TIMESYNCD +systemd_timesyncd_SOURCES = \ + src/timesync/timesyncd.c \ + src/timesync/timesyncd.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-capability.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/multi-user.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) \ @@ -3925,7 +4412,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 @@ -3994,7 +4486,8 @@ dist_dbuspolicy_DATA += \ src/machine/org.freedesktop.machine1.conf dist_zshcompletion_DATA += \ - shell-completion/zsh/_machinectl + shell-completion/zsh/_machinectl \ + shell-completion/zsh/_sd_machines SYSTEM_UNIT_ALIASES += \ systemd-machined.service dbus-org.freedesktop.machine1.service @@ -4005,6 +4498,75 @@ 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.h \ + src/resolve/resolved.c \ + src/resolve/resolved-manager.c + +systemd_resolved_CFLAGS = \ + $(AM_CFLAGS) \ + $(KMOD_CFLAGS) + +nodist_systemd_resolved_SOURCES = \ + src/resolve/resolved-gperf.c + +EXTRA_DIST += \ + src/resolve/resolved-gperf.gperf + +CLEANFILES += \ + src/resolve/resolved-gperf.c + +systemd_resolved_LDADD = \ + libsystemd-capability.la \ + libsystemd-network.la \ + libsystemd-label.la \ + libsystemd-internal.la \ + libsystemd-shared.la + +rootlibexec_PROGRAMS += \ + systemd-resolved + +nodist_systemunit_DATA += \ + units/systemd-resolved.service + +EXTRA_DIST += \ + units/systemd-resolved.service.in + +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 + endif # ------------------------------------------------------------------------------ @@ -4016,19 +4578,44 @@ systemd_networkd_SOURCES = \ src/network/networkd.c systemd_networkd_LDADD = \ - libsystemd-networkd-core.la + libsystemd-networkd-core.la \ + libsystemd-capability.la 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-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-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 \ @@ -4041,25 +4628,48 @@ libsystemd_networkd_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-shared.la -nodist_systemunit_DATA += \ - units/systemd-networkd.service +rootlibexec_PROGRAMS += \ + systemd-networkd-wait-online -GENERAL_ALIASES += \ - $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service +systemd_networkd_wait_online_CFLAGS = \ + $(AM_CFLAGS) + +systemd_networkd_wait_online_SOURCES = \ + src/libsystemd-network/network-internal.h \ + src/network/networkd-wait-online.c \ + src/network/networkd-wait-online.h + +systemd_networkd_wait_online_LDADD = \ + libsystemd-network.la \ + libudev-internal.la \ + libsystemd-internal.la \ + libsystemd-shared.la test_network_SOURCES = \ src/network/test-network.c +test_network_CFLAGS = \ + $(AM_CFLAGS) + test_network_LDADD = \ libsystemd-networkd-core.la tests += \ test-network +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 \ @@ -4100,9 +4710,7 @@ libsystemd_logind_core_la_SOURCES = \ src/login/logind-session-dbus.c \ src/login/logind-seat-dbus.c \ src/login/logind-user-dbus.c \ - src/login/logind-acl.h \ - src/login/login-shared.c \ - src/login/login-shared.h + src/login/logind-acl.h libsystemd_logind_core_la_LIBADD = \ libsystemd-label.la \ @@ -4162,7 +4770,7 @@ rootbin_PROGRAMS += \ systemd-inhibit test_login_SOURCES = \ - src/login/test-login.c + src/libsystemd/sd-login/test-login.c test_login_LDADD = \ libsystemd-internal.la \ @@ -4198,7 +4806,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) \ @@ -4211,7 +4820,7 @@ 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 \ @@ -4326,10 +4935,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 \ @@ -4591,6 +5202,7 @@ substitutions = \ '|udevrulesdir=$(udevrulesdir)|' \ '|catalogdir=$(catalogdir)|' \ '|tmpfilesdir=$(tmpfilesdir)|' \ + '|sysusersdir=$(sysusersdir)|' \ '|sysctldir=$(sysctldir)|' \ '|systemgeneratordir=$(systemgeneratordir)|' \ '|usergeneratordir=$(usergeneratordir)|' \ @@ -4618,7 +5230,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 $@) && \ @@ -4646,6 +5267,9 @@ src/%.policy.in: src/%.policy.in.in %.rules: %.rules.in $(SED_PROCESS) +%.conf: %.conf.in + $(SED_PROCESS) + %.sh: %.sh.in $(SED_PROCESS) $(AM_V_GEN)chmod +x $@ @@ -4685,7 +5309,7 @@ CLEANFILES += \ # ------------------------------------------------------------------------------ if ENABLE_MANPAGES -man/custom-entities.ent: +man/custom-entities.ent: configure.ac $(AM_V_GEN)$(MKDIR_P) $(dir $@) $(AM_V_GEN)(echo '' && \ printf '$(subst '|,\n,$(substitutions))))') \ @@ -4777,14 +5401,20 @@ RUNLEVEL4_TARGET_WANTS += \ RUNLEVEL5_TARGET_WANTS += \ systemd-update-utmp-runlevel.service endif + SYSINIT_TARGET_WANTS += \ - systemd-update-utmp.service + systemd-update-utmp.service \ + systemd-update-done.service \ + ldconfig.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 \ @@ -4825,7 +5455,7 @@ 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 \ $(pkgsysconfdir)/user $(sysconfdir)/xdg/systemd/user \ - ../system-services/org.freedesktop.systemd1.service $(dbussessionservicedir)/org.freedesktop.systemd1.service + $(dbussystemservicedir)/org.freedesktop.systemd1.service $(dbussessionservicedir)/org.freedesktop.systemd1.service if HAVE_SYSV_COMPAT INSTALL_DIRS += \ @@ -4894,32 +5524,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: 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: upload -upload: all distcheck - 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/ +.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 + scp systemd-$(VERSION).tar.xz $(www_target) + .PHONY: doc-sync doc-sync: all destdir-sphinx gtkdoc-rebase --html-dir=docs/libudev/html --online @@ -4929,9 +5589,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 "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 @@ -4947,12 +5608,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 $^ > $@ @@ -4972,7 +5633,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 += \ @@ -5009,7 +5670,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: \ @@ -5024,6 +5687,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 @@ -5035,60 +5701,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)