X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=f934bb147364b557d9dea52f59a0ca28b05c4e73;hp=bd26780a55bf2cd8d05037a7ca7f561c708dc3f0;hb=ce0f1493c399178a3c7796415bfe5abd105ad610;hpb=09e00c524fd4d21a3508c27d01d265b8a6c9ae30 diff --git a/Makefile.am b/Makefile.am index bd26780a5..f934bb147 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,16 +35,16 @@ SUBDIRS = . po # Keep the test-suite.log .PRECIOUS: $(TEST_SUITE_LOG) Makefile -LIBUDEV_CURRENT=5 -LIBUDEV_REVISION=1 -LIBUDEV_AGE=4 +LIBUDEV_CURRENT=6 +LIBUDEV_REVISION=0 +LIBUDEV_AGE=5 LIBGUDEV_CURRENT=2 LIBGUDEV_REVISION=0 LIBGUDEV_AGE=2 LIBSYSTEMD_CURRENT=3 -LIBSYSTEMD_REVISION=0 +LIBSYSTEMD_REVISION=1 LIBSYSTEMD_AGE=3 # The following four libraries only exist for compatibility reasons, @@ -90,6 +90,8 @@ 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 @@ -104,7 +106,6 @@ udevrulesdir=$(udevlibexecdir)/rules.d udevhwdbdir=$(udevlibexecdir)/hwdb.d catalogdir=$(prefix)/lib/systemd/catalog kernelinstalldir = $(prefix)/lib/kernel/install.d -ntpunitsdir=$(prefix)/lib/systemd/ntp-units.d # And these are the special ones for / rootprefix=@rootprefix@ @@ -185,6 +186,8 @@ 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 \ @@ -333,7 +336,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 \ @@ -342,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 @@ -722,6 +727,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 \ @@ -758,6 +765,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 \ @@ -814,8 +823,6 @@ libsystemd_shared_la_SOURCES = \ 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 \ @@ -827,7 +834,10 @@ libsystemd_shared_la_SOURCES = \ src/shared/eventfd-util.c \ src/shared/eventfd-util.h \ src/shared/copy.c \ - src/shared/copy.h + 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 \ @@ -837,7 +847,8 @@ nodist_libsystemd_shared_la_SOURCES = \ libsystemd_shared_la_CFLAGS = \ $(AM_CFLAGS) \ - $(SECCOMP_CFLAGS) + $(SECCOMP_CFLAGS) \ + -pthread # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ @@ -869,7 +880,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) \ @@ -1244,7 +1259,10 @@ tests += \ test-architecture \ test-socket-util \ test-fdset \ - test-conf-files + test-conf-files \ + test-capability \ + test-async \ + test-ratelimit EXTRA_DIST += \ test/sched_idle_bad.service \ @@ -1348,12 +1366,31 @@ 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 @@ -1612,7 +1649,7 @@ test_conf_files_LDADD = \ .PHONY: coverage lcov-run lcov-report coverage-sync # run lcov from scratch, always -coverage: +coverage: all $(MAKE) lcov-run $(MAKE) lcov-report @@ -1821,17 +1858,50 @@ nodist_systemunit_DATA += \ SYSINIT_TARGET_WANTS += \ systemd-sysusers.service -nodist_sysusers_DATA = \ +dist_sysusers_DATA = \ sysusers.d/systemd.conf +nodist_sysusers_DATA = \ + sysusers.d/basic.conf + EXTRA_DIST += \ units/systemd-sysusers.service.in \ - sysusers.d/systemd.conf.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 \ @@ -2041,6 +2111,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 @@ -2061,6 +2138,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 @@ -2186,6 +2271,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 \ @@ -2237,9 +2323,12 @@ libsystemd_internal_la_SOURCES = \ 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 nodist_libsystemd_internal_la_SOURCES = \ src/libsystemd/libsystemd.sym \ @@ -2342,7 +2431,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 += \ @@ -3161,6 +3251,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\ @@ -3204,8 +3295,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 $@) @@ -3479,6 +3571,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 \ @@ -3561,6 +3667,10 @@ tests += \ test-mmap-cache \ test-catalog +tests += \ + test-compress \ + test-compress-benchmark + pkginclude_HEADERS += \ src/systemd/sd-journal.h \ src/systemd/sd-messages.h \ @@ -3592,10 +3702,10 @@ libsystemd_journal_internal_la_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) @@ -3603,6 +3713,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 \ @@ -3728,7 +3843,9 @@ systemd_socket_proxyd_LDADD = \ # ------------------------------------------------------------------------------ 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 \ @@ -3767,12 +3884,27 @@ coredumpctl_LDADD = \ bin_PROGRAMS += \ 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/coredumpctl dist_zshcompletion_DATA += \ shell-completion/zsh/_coredumpctl +GENERAL_ALIASES += \ + $(bindir)/coredumpctl $(bindir)/systemd-coredumpctl + sysctl_DATA = \ sysctl.d/50-coredump.conf @@ -4192,10 +4324,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 @@ -4255,6 +4383,9 @@ rootlibexec_PROGRAMS += \ 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 @@ -4266,18 +4397,13 @@ EXTRA_DIST += \ CLEANFILES += \ src/timesync/timesyncd.conf - -dist_ntpunits_DATA = \ - src/timesync/90-systemd.list - 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) \ @@ -4285,7 +4411,8 @@ 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 \ @@ -4370,6 +4497,25 @@ 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 # ------------------------------------------------------------------------------ @@ -4448,6 +4594,11 @@ libsystemd_networkd_core_la_SOURCES = \ src/network/networkd-tunnel.c \ src/network/networkd-veth.c \ src/network/networkd-vxlan.c \ + src/network/networkd-vlan.c \ + src/network/networkd-macvlan.c \ + src/network/networkd-dummy.c \ + src/network/networkd-tuntap.c \ + src/network/networkd-bond.c \ src/network/networkd-network.c \ src/network/networkd-address.c \ src/network/networkd-route.c \ @@ -4643,7 +4794,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) \ @@ -4656,7 +4808,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 \ @@ -4771,10 +4923,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 \ @@ -5069,7 +5223,11 @@ substitutions = \ '|DNS_SERVERS=$(DNS_SERVERS)|' \ '|systemuidmax=$(SYSTEM_UID_MAX)|' \ '|systemgidmax=$(SYSTEM_GID_MAX)|' \ - '|TTY_GID=$(TTY_GID)|' + '|TTY_GID=$(TTY_GID)|' \ + '|systemsleepdir=$(systemsleepdir)|' \ + '|systemshutdowndir=$(systemshutdowndir)|' \ + '|binfmtdir=$(binfmtdir)|' \ + '|modulesloaddir=$(modulesloaddir)|' SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ @@ -5121,7 +5279,7 @@ units/user/%: units/%.m4 $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ if ENABLE_POLKIT -nodist_polkitpolicy_DATA = \ +dist_polkitpolicy_DATA = \ $(polkitpolicy_files) \ $(polkitpolicy_in_in_files:.policy.in.in=.policy) endif @@ -5354,11 +5512,34 @@ 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: @@ -5420,7 +5601,7 @@ valgrind-tests: $(TESTS) 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 $^ > $@ @@ -5440,7 +5621,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 += \ @@ -5478,7 +5659,8 @@ test-libsystemd-sym.c: \ src/systemd/sd-login.h \ src/systemd/sd-bus.h \ src/systemd/sd-utf8.h \ - src/systemd/sd-resolve.h + src/systemd/sd-resolve.h \ + src/systemd/sd-path.h $(generate-sym-test) test-libudev-sym.c: \