# 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
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@
polkitpolicy_files =
dist_udevrules_DATA =
nodist_udevrules_DATA =
-nodist_pkgsysconf_DATA =
dist_pkgsysconf_DATA =
+nodist_pkgsysconf_DATA =
dist_pkgdata_DATA =
dist_dbuspolicy_DATA =
dist_dbussystemservice_DATA =
-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\" \
-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 \
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))
systemd-notify \
systemd-ask-password \
systemd-tty-ask-password-agent \
- systemd-machine-id-setup
+ systemd-machine-id-setup \
+ systemd-escape
bin_PROGRAMS = \
systemd-cgls \
systemd-detect-virt \
systemd-delta \
systemd-analyze \
- systemd-run
+ systemd-run \
+ systemd-path
dist_bin_SCRIPTS = \
src/kernel-install/kernel-install
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/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 \
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 \
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 \
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 \
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/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 \
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 \
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 \
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 \
+ src/shared/nss-util.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-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 \
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
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
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
dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
tmpfiles.d/systemd-nologin.conf \
+ tmpfiles.d/systemd-remote.conf \
tmpfiles.d/tmp.conf \
tmpfiles.d/x11.conf \
- tmpfiles.d/var.conf
+ tmpfiles.d/var.conf \
+ tmpfiles.d/etc.conf
if HAVE_SYSV_COMPAT
dist_tmpfiles_DATA += \
libsystemd-internal.la \
libsystemd-shared.la
-rootlibexec_PROGRAMS += \
+rootbin_PROGRAMS += \
systemd-sysusers
-nodist_sysusers_DATA = \
+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 += \
- sysusers.d/systemd.conf.in
+ 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 \
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 \
libsystemd-shared.la
# ------------------------------------------------------------------------------
+systemd_escape_SOURCES = \
+ src/escape/escape.c
+
+systemd_escape_LDADD = \
+ libsystemd-shared.la
+
+# -----------------------------------------------------------------------------
systemctl_SOURCES = \
src/systemctl/systemctl.c
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-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 \
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 += \
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/ipv4ll-packet.c \
src/libsystemd-network/ipv4ll-internal.h \
src/libsystemd-network/network-internal.c \
- src/libsystemd-network/network-internal.h
+ 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-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 \
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-ipv4ll
+ test-dhcp-server \
+ test-ipv4ll \
+ test-icmp6-rs \
+ test-dhcp6-client
# ------------------------------------------------------------------------------
if ENABLE_GTK_DOC
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
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 $@)
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) \
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-core.la \
+ 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
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 \
-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
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 \
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)
$(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 \
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
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 += \
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 \
units/systemd-journal-gatewayd.service
dist_gatewayddocumentroot_DATA = \
- src/journal/browse.html
+ src/journal-remote/browse.html
endif
# ------------------------------------------------------------------------------
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-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
systemd-cryptsetup-generator
dist_systemunit_DATA += \
- units/cryptsetup.target
+ units/cryptsetup.target \
+ units/cryptsetup-pre.target
systemd_cryptsetup_SOURCES = \
src/cryptsetup/cryptsetup.c
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
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
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) \
-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 \
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
# ------------------------------------------------------------------------------
systemd_resolved_SOURCES = \
src/resolve/resolved.h \
src/resolve/resolved.c \
- src/resolve/resolved-manager.c
-
-systemd_resolved_CFLAGS = \
- $(AM_CFLAGS) \
- $(KMOD_CFLAGS)
+ src/resolve/resolved-manager.c \
+ src/resolve/resolved-bus.c \
+ src/resolve/resolved-link.h \
+ src/resolve/resolved-link.c \
+ src/resolve/resolved-dns-domain.h \
+ src/resolve/resolved-dns-domain.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-scope.h \
+ src/resolve/resolved-dns-scope.c \
+ src/resolve/resolved-dns-server.h \
+ src/resolve/resolved-dns-server.c \
+ src/resolve/resolved-dns-rr.h \
+ src/resolve/resolved-dns-rr.c
nodist_systemd_resolved_SOURCES = \
src/resolve/resolved-gperf.c
nodist_systemunit_DATA += \
units/systemd-resolved.service
+dist_systemunit_DATA += \
+ 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
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-capability.la \
+ libsystemd-network.la \
+ libsystemd-label.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la
+
+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
+
endif
# ------------------------------------------------------------------------------
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-tunnel.c \
- src/network/networkd-veth.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 \
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 \
'|sysctldir=$(sysctldir)|' \
'|systemgeneratordir=$(systemgeneratordir)|' \
'|usergeneratordir=$(usergeneratordir)|' \
+ '|CERTIFICATEROOT=$(CERTIFICATEROOT)|' \
'|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
'|PACKAGE_NAME=$(PACKAGE_NAME)|' \
'|PACKAGE_URL=$(PACKAGE_URL)|' \
'|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 $@) && \
%.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)
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 \
--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 += \
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: \
~ianmdlvl / elogind.git / blobdiff