# 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,
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
-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 \
systemd-detect-virt \
systemd-delta \
systemd-analyze \
- systemd-run
+ systemd-run \
+ systemd-path
dist_bin_SCRIPTS = \
src/kernel-install/kernel-install
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/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
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
libsystemd_shared_la_CFLAGS = \
$(AM_CFLAGS) \
- $(SECCOMP_CFLAGS)
+ $(SECCOMP_CFLAGS) \
+ -pthread
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
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) \
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 \
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
.PHONY: coverage lcov-run lcov-report coverage-sync
# run lcov from scratch, always
-coverage:
+coverage: all
$(MAKE) lcov-run
$(MAKE) lcov-report
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)
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
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 \
src/libsystemd/sd-rtnl/rtnl-util.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 \
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 += \
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\
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 $@)
test_catalog_LDADD = \
libsystemd-journal-core.la
+if HAVE_XZ
+test_compress_SOURCES = \
+ src/journal/test-compress.c
+
+test_compress_LDADD = \
+ libsystemd-journal-internal.la \
+ libsystemd-shared.la
+endif
+
libsystemd_journal_core_la_SOURCES = \
src/journal/journald-kmsg.c \
src/journal/journald-kmsg.h \
test-mmap-cache \
test-catalog
+if HAVE_XZ
+tests += test-compress
+endif
+
pkginclude_HEADERS += \
src/systemd/sd-journal.h \
src/systemd/sd-messages.h \
# ------------------------------------------------------------------------------
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 \
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
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
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-network.c \
src/network/networkd-address.c \
src/network/networkd-route.c \
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) \
-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 \
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 \
'|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 $@) && \
$(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
--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:
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 $^ > $@
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 += \
~ianmdlvl / elogind.git / blobdiff