# 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=1
-LIBGUDEV_REVISION=3
-LIBGUDEV_AGE=1
+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=1
+LIBSYSTEMD_LOGIN_REVISION=3
LIBSYSTEMD_LOGIN_AGE=9
LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=10
+LIBSYSTEMD_DAEMON_REVISION=12
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=26
+LIBSYSTEMD_ID128_REVISION=28
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_JOURNAL_CURRENT=11
-LIBSYSTEMD_JOURNAL_REVISION=3
+LIBSYSTEMD_JOURNAL_REVISION=5
LIBSYSTEMD_JOURNAL_AGE=11
-LIBSYSTEMD_BUS_CURRENT=0
-LIBSYSTEMD_BUS_REVISION=0
-LIBSYSTEMD_BUS_AGE=0
-
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
dbussessionservicedir=@dbussessionservicedir@
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
-networkdir=$(prefix)/lib/systemd/network
+binfmtdir=$(prefix)/lib/binfmt.d
+modulesloaddir=$(prefix)/lib/modules-load.d
+networkdir=$(rootprefix)/lib/systemd/network
pkgincludedir=$(includedir)/systemd
systemgeneratordir=$(rootlibexecdir)/system-generators
usergeneratordir=$(prefix)/lib/systemd/user-generators
dist_udevrules_DATA =
nodist_udevrules_DATA =
dist_pkgsysconf_DATA =
+nodist_pkgsysconf_DATA =
dist_pkgdata_DATA =
dist_dbuspolicy_DATA =
dist_dbussystemservice_DATA =
endif
udevlibexec_PROGRAMS =
+.PHONY: $(INSTALL_EXEC_HOOKS) $(UNINSTALL_EXEC_HOOKS) \
+ $(INSTALL_DATA_HOOKS) $(UNINSTALL_DATA_HOOKS) \
+ $(DISTCLEAN_LOCAL_HOOKS) $(CLEAN_LOCAL_HOOKS)
+
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
-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\" \
-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
-DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
-DROOTPREFIX=\"$(rootprefix)\" \
+ -DRANDOM_SEED_DIR=\"$(localstatedir)/lib/systemd/\" \
-DRANDOM_SEED=\"$(localstatedir)/lib/systemd/random-seed\" \
-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
-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 \
-I $(top_srcdir)/src/udev \
-I $(top_srcdir)/src/udev/net \
-I $(top_builddir)/src/udev \
- -I $(top_srcdir)/src/libsystemd-bus \
- -I $(top_srcdir)/src/libsystemd-rtnl \
+ -I $(top_srcdir)/src/libsystemd/sd-bus \
+ -I $(top_srcdir)/src/libsystemd/sd-event \
+ -I $(top_srcdir)/src/libsystemd/sd-rtnl \
+ -I $(top_srcdir)/src/libsystemd-network \
+ -I $(top_srcdir)/src/libsystemd-terminal \
$(OUR_CPPFLAGS)
AM_CFLAGS = $(OUR_CFLAGS)
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
MULTI_USER_TARGET_WANTS =
SYSINIT_TARGET_WANTS =
SOCKETS_TARGET_WANTS =
+BUSNAMES_TARGET_WANTS =
TIMERS_TARGET_WANTS =
+USER_SOCKETS_TARGET_WANTS =
+USER_BUSNAMES_TARGET_WANTS =
SYSTEM_UNIT_ALIASES =
USER_UNIT_ALIASES =
-
GENERAL_ALIASES =
install-target-wants-hook:
- what="$(RUNLEVEL1_TARGET_WANTS)" && wants=runlevel1.target && $(add-wants)
- what="$(RUNLEVEL2_TARGET_WANTS)" && wants=runlevel2.target && $(add-wants)
- what="$(RUNLEVEL3_TARGET_WANTS)" && wants=runlevel3.target && $(add-wants)
- what="$(RUNLEVEL4_TARGET_WANTS)" && wants=runlevel4.target && $(add-wants)
- what="$(RUNLEVEL5_TARGET_WANTS)" && wants=runlevel5.target && $(add-wants)
- what="$(SHUTDOWN_TARGET_WANTS)" && wants=shutdown.target && $(add-wants)
- what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && $(add-wants)
- what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && $(add-wants)
- what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && $(add-wants)
- what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants)
- what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && $(add-wants)
- what="$(SLICES_TARGET_WANTS)" && wants=slices.target && $(add-wants)
+ what="$(RUNLEVEL1_TARGET_WANTS)" && wants=runlevel1.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(RUNLEVEL2_TARGET_WANTS)" && wants=runlevel2.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(RUNLEVEL3_TARGET_WANTS)" && wants=runlevel3.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(RUNLEVEL4_TARGET_WANTS)" && wants=runlevel4.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(RUNLEVEL5_TARGET_WANTS)" && wants=runlevel5.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(SHUTDOWN_TARGET_WANTS)" && wants=shutdown.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(SLICES_TARGET_WANTS)" && wants=slices.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants)
+ what="$(USER_BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(userunitdir) && $(add-wants)
define add-wants
[ -z "$$what" ] || ( \
- dir=$(DESTDIR)$(systemunitdir)/$$wants.wants && \
+ dir=$(DESTDIR)$$dir/$$wants.wants && \
$(MKDIR_P) -m 0755 $$dir && \
cd $$dir && \
rm -f $$what && \
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 \
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))
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 \
systemd-cgtop \
- systemd-stdio-bridge \
systemd-nspawn \
systemd-detect-virt \
systemd-delta \
systemd-analyze \
- systemd-run
+ systemd-run \
+ systemd-path
dist_bin_SCRIPTS = \
src/kernel-install/kernel-install
systemd-ac-power \
systemd-sysctl \
systemd-sleep \
- systemd-socket-proxyd
+ systemd-bus-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
+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/remote-fs.target \
units/remote-fs-pre.target \
units/network.target \
+ units/network-pre.target \
units/network-online.target \
units/nss-lookup.target \
units/nss-user-lookup.target \
units/sigpwr.target \
units/sleep.target \
units/sockets.target \
+ units/busnames.target \
units/timers.target \
units/paths.target \
units/suspend.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 \
units/user/default.target \
units/user/exit.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/systemd-fsck@.service.in \
units/systemd-fsck-root.service.in \
units/user@.service.in \
- units/systemd-udevd.service \
- units/systemd-udev-trigger.service \
- units/systemd-udev-settle.service \
units/debug-shell.service.in \
units/systemd-hibernate.service.in \
units/systemd-hybrid-sleep.service.in \
units/initrd-cleanup.service.in \
units/initrd-udevadm-cleanup-db.service.in \
units/initrd-switch-root.service.in \
- units/systemd-nspawn@.service.in
+ units/systemd-nspawn@.service.in \
+ units/systemd-update-done.service.in
CLEANFILES += \
units/console-shell.service.m4 \
units/console-getty.service.m4 \
units/container-getty@.service.m4 \
- units/rescue.service.m4
+ units/rescue.service.m4 \
+ units/user@.service.m4
if HAVE_SYSV_COMPAT
nodist_systemunit_DATA += \
units/halt-local.service
systemgenerator_PROGRAMS += \
+ systemd-sysv-generator \
systemd-rc-local-generator
endif
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@
include Makefile-man.am
-.PHONY: man
+.PHONY: man update-man-list
man: $(MANPAGES) $(MANPAGES_ALIAS) $(HTML_FILES) $(HTML_ALIAS)
XML_FILES = \
NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
SOURCE_XML_FILES = $(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))
-update-man-list: make-man-rules.py $(XML_GLOB)
+update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB)
$(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp
$(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am
@echo "Makefile-man.am has been regenerated"
-man/systemd.index.xml: make-man-index.py $(NON_INDEX_XML_FILES)
+man/systemd.index.xml: $(top_srcdir)/tools/make-man-index.py $(NON_INDEX_XML_FILES)
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^)
-man/systemd.directives.xml: make-directive-index.py $(SOURCE_XML_FILES)
+man/systemd.directives.xml: $(top_srcdir)/tools/make-directive-index.py $(SOURCE_XML_FILES)
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^)
$(HTML_FILES) \
$(HTML_ALIAS) \
$(man_MANS) \
- make-man-index.py \
- make-directive-index.py \
- xml_helper.py
-
-# ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
- libsystemd-rtnl.la
-
-libsystemd_rtnl_la_SOURCES = \
- src/systemd/sd-rtnl.h \
- src/libsystemd-rtnl/sd-rtnl.c \
- src/libsystemd-rtnl/rtnl-internal.h \
- src/libsystemd-rtnl/rtnl-message.c \
- src/libsystemd-rtnl/rtnl-util.h \
- src/libsystemd-rtnl/rtnl-util.c
-
-test_rtnl_SOURCES = \
- src/libsystemd-rtnl/test-rtnl.c
-
-test_rtnl_LDADD = \
- libsystemd-rtnl.la \
- libsystemd-shared.la
-
-tests += test-rtnl
+ tools/make-man-index.py \
+ tools/make-directive-index.py \
+ tools/make-man-rules.py \
+ tools/xml_helper.py
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
libsystemd_shared_la_SOURCES = \
src/shared/linux/auto_dev-ioctl.h \
src/shared/linux/fanotify.h \
- src/shared/linux/seccomp.h \
- src/shared/linux/seccomp-bpf.h \
+ src/shared/ioprio.h \
src/shared/missing.h \
+ src/shared/initreq.h \
+ src/shared/securebits.h \
+ src/shared/special.h \
src/shared/list.h \
src/shared/macro.h \
src/shared/def.h \
+ src/shared/sparse-endian.h \
+ src/shared/refcnt.h \
+ src/shared/udev-util.h \
+ src/shared/bus-errors.h \
src/shared/device-nodes.c \
src/shared/device-nodes.h \
- src/shared/sparse-endian.h \
src/shared/util.c \
src/shared/util.h \
- src/shared/udev-util.h \
src/shared/virt.c \
src/shared/virt.h \
+ src/shared/architecture.c \
+ src/shared/architecture.h \
src/shared/efivars.c \
src/shared/efivars.h \
src/shared/path-util.c \
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/siphash24.h \
src/shared/set.c \
src/shared/set.h \
src/shared/fdset.c \
src/shared/gunicode.h \
src/shared/pager.c \
src/shared/pager.h \
- src/shared/ioprio.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/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 \
src/shared/fileio.c \
src/shared/fileio.h \
src/shared/output-mode.h \
- src/shared/MurmurHash3.c \
- src/shared/MurmurHash3.h \
+ src/shared/MurmurHash2.c \
+ src/shared/MurmurHash2.h \
src/shared/acpi-fpdt.h \
src/shared/acpi-fpdt.c \
src/shared/boot-timestamps.h \
src/shared/boot-timestamps.c \
- src/shared/refcnt.h \
src/shared/mkdir.c \
src/shared/mkdir.h \
src/shared/smack-util.c \
src/shared/ima-util.h \
src/shared/ptyfwd.c \
src/shared/ptyfwd.h \
- src/shared/net-util.c \
- src/shared/net-util.h
-
-#-------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
- libsystemd-dbus.la
-
-libsystemd_dbus_la_SOURCES = \
- src/shared/dbus-common.c \
- src/shared/dbus-common.h
-
-libsystemd_dbus_la_CFLAGS = \
+ src/shared/errno-list.c \
+ src/shared/errno-list.h \
+ src/shared/af-list.c \
+ src/shared/af-list.h \
+ src/shared/audit.c \
+ src/shared/audit.h \
+ src/shared/xml.c \
+ src/shared/xml.h \
+ src/shared/condition-util.c \
+ src/shared/condition-util.h \
+ src/shared/bus-label.c \
+ src/shared/bus-label.h \
+ src/shared/gpt.h \
+ src/shared/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/barrier.c \
+ src/shared/barrier.h \
+ src/shared/pty.c \
+ src/shared/pty.h \
+ src/shared/async.c \
+ src/shared/async.h \
+ src/shared/copy.c \
+ src/shared/copy.h \
+ src/shared/base-filesystem.c \
+ src/shared/base-filesystem.h \
+ src/shared/nss-util.h
+
+nodist_libsystemd_shared_la_SOURCES = \
+ src/shared/errno-from-name.h \
+ src/shared/errno-to-name.h \
+ src/shared/af-from-name.h \
+ src/shared/af-to-name.h
+
+libsystemd_shared_la_CFLAGS = \
$(AM_CFLAGS) \
- $(DBUS_CFLAGS)
-
-libsystemd_dbus_la_LIBADD = \
- $(DBUS_LIBS)
+ $(SECCOMP_CFLAGS) \
+ -pthread
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
src/shared/specifier.c \
src/shared/specifier.h
-libsystemd_units_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
-
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
libsystemd-label.la
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) \
libsystemd_label_la_LIBADD = \
$(SELINUX_LIBS)
+# ------------------------------------------------------------------------------
+
+if HAVE_SECCOMP
+noinst_LTLIBRARIES += \
+ libsystemd-seccomp.la
+
+libsystemd_seccomp_la_SOURCES = \
+ src/shared/seccomp-util.h \
+ src/shared/seccomp-util.c
+
+libsystemd_seccomp_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
+libsystemd_seccomp_la_LIBADD = \
+ $(SECCOMP_LIBS)
+endif
+
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
libsystemd-logs.la
libsystemd_capability_la_LIBADD = \
$(CAP_LIBS)
-# ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
- libsystemd-audit.la
-
-libsystemd_audit_la_SOURCES = \
- src/shared/audit.c \
- src/shared/audit.h
-
# ------------------------------------------------------------------------------
if HAVE_ACL
noinst_LTLIBRARIES += \
src/core/load-fragment.h \
src/core/service.c \
src/core/service.h \
- src/core/automount.c \
- src/core/automount.h \
- src/core/mount.c \
- src/core/mount.h \
- src/core/swap.c \
- src/core/swap.h \
- src/core/device.c \
- src/core/device.h \
+ src/core/socket.c \
+ src/core/socket.h \
+ src/core/busname.c \
+ src/core/busname.h \
src/core/target.c \
src/core/target.h \
src/core/snapshot.c \
src/core/snapshot.h \
- src/core/socket.c \
- src/core/socket.h \
+ src/core/device.c \
+ src/core/device.h \
+ src/core/mount.c \
+ src/core/mount.h \
+ src/core/automount.c \
+ src/core/automount.h \
+ src/core/swap.c \
+ src/core/swap.h \
src/core/timer.c \
src/core/timer.h \
src/core/path.c \
src/core/dbus-service.h \
src/core/dbus-socket.c \
src/core/dbus-socket.h \
- src/core/dbus-timer.c \
- src/core/dbus-timer.h \
+ src/core/dbus-busname.c \
+ src/core/dbus-busname.h \
src/core/dbus-target.c \
src/core/dbus-target.h \
+ src/core/dbus-snapshot.c \
+ src/core/dbus-snapshot.h \
+ src/core/dbus-device.c \
+ src/core/dbus-device.h \
src/core/dbus-mount.c \
src/core/dbus-mount.h \
src/core/dbus-automount.c \
src/core/dbus-automount.h \
src/core/dbus-swap.c \
src/core/dbus-swap.h \
- src/core/dbus-snapshot.c \
- src/core/dbus-snapshot.h \
- src/core/dbus-device.c \
- src/core/dbus-device.h \
+ src/core/dbus-timer.c \
+ src/core/dbus-timer.h \
src/core/dbus-path.c \
src/core/dbus-path.h \
src/core/dbus-slice.c \
src/core/condition.h \
src/core/namespace.c \
src/core/namespace.h \
- src/core/tcpwrap.c \
- src/core/tcpwrap.h \
- src/core/securebits.h \
- src/core/initreq.h \
- src/core/special.h \
- src/core/bus-errors.h \
src/core/build.h \
src/core/sysfs-show.h \
src/core/switch-root.h \
src/core/switch-root.c \
src/core/killall.h \
src/core/killall.c \
- src/core/syscall-list.c \
- src/core/syscall-list.h \
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 += \
nodist_libsystemd_core_la_SOURCES = \
src/core/load-fragment-gperf.c \
- src/core/load-fragment-gperf-nulstr.c \
- src/core/syscall-from-name.h \
- src/core/syscall-to-name.h
+ src/core/load-fragment-gperf-nulstr.c
libsystemd_core_la_CFLAGS = \
$(AM_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(LIBWRAP_CFLAGS) \
$(PAM_CFLAGS) \
$(AUDIT_CFLAGS) \
+ $(CAP_CFLAGS) \
$(KMOD_CFLAGS) \
+ $(APPARMOR_CFLAGS) \
+ $(SECCOMP_CFLAGS) \
-pthread
libsystemd_core_la_LIBADD = \
libsystemd-capability.la \
libsystemd-units.la \
libsystemd-label.la \
- libsystemd-dbus.la \
- libsystemd-audit.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
libudev-internal.la \
libsystemd-shared.la \
- $(LIBWRAP_LIBS) \
+ libsystemd-internal.la \
$(PAM_LIBS) \
$(AUDIT_LIBS) \
$(CAP_LIBS) \
- $(KMOD_LIBS)
+ $(KMOD_LIBS) \
+ $(APPARMOR_LIBS) \
+ $(SECCOMP_LIBS)
+
+if HAVE_SECCOMP
+libsystemd_core_la_LIBADD += \
+ libsystemd-seccomp.la
+endif
src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
$(AM_V_at)$(MKDIR_P) $(dir $@)
src/core/load-fragment-gperf.gperf \
src/core/load-fragment-gperf.c \
src/core/load-fragment-gperf-nulstr.c \
- src/core/syscall-list.txt \
- src/core/syscall-from-name.gperf
+ src/shared/errno-list.txt \
+ src/shared/errno-from-name.gperf \
+ src/shared/af-list.txt \
+ src/shared/af-from-name.gperf
BUILT_SOURCES += \
- src/core/syscall-from-name.h \
- src/core/syscall-to-name.h
+ src/shared/errno-from-name.h \
+ src/shared/errno-to-name.h \
+ src/shared/af-from-name.h \
+ src/shared/af-to-name.h
+
+src/shared/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]+/ { print $$2; }' > $@
+
+src/shared/errno-from-name.gperf: src/shared/errno-list.txt
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct errno_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' < $< > $@
+
+src/shared/errno-from-name.h: src/shared/errno-from-name.gperf
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_errno -H hash_errno_name -p -C < $< > $@
+
+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[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
-src/core/syscall-list.txt: Makefile
+src/shared/af-list.txt:
$(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9(]/ { sub(/__NR_/, "", $$2); if ($$2 !~ /SYSCALL_BASE/) print $$2; }' > $@
+ $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/socket.h - < /dev/null | grep -v AF_UNSPEC | grep -v AF_MAX | $(AWK) '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $$2; }' > $@
-src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile
+src/shared/af-from-name.gperf: src/shared/af-list.txt
$(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@
+ $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct af_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' < $< > $@
-src/core/syscall-from-name.h: src/core/syscall-from-name.gperf Makefile
+src/shared/af-from-name.h: src/shared/af-from-name.gperf
$(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_syscall -H hash_syscall_name -p -C < $< > $@
+ $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_af -H hash_af_name -p -C < $< > $@
-src/core/syscall-to-name.h: src/core/syscall-list.txt Makefile
+src/shared/af-to-name.h: src/shared/af-list.txt
$(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const syscall_names[] = { "} { printf "[SYSCALL_TO_INDEX(__NR_%s)] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
+ $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const af_names[] = { "} !/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
# ------------------------------------------------------------------------------
systemd_SOURCES = \
systemd_CFLAGS = \
$(AM_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(SECCOMP_CFLAGS)
systemd_LDADD = \
libsystemd-core.la \
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 \
test-utf8 \
test-ellipsize \
test-util \
+ test-ring \
+ test-barrier \
+ test-pty \
+ test-tmpfiles \
test-namespace \
test-date \
test-sleep \
test-hashmap \
test-list \
test-tables \
- test-device-nodes
+ test-device-nodes \
+ test-xml \
+ test-architecture \
+ test-socket-util \
+ test-fdset \
+ test-conf-files \
+ test-capability \
+ test-async \
+ test-ratelimit
EXTRA_DIST += \
test/sched_idle_bad.service \
test/sched_idle_ok.service \
test/sched_rr_bad.service \
test/sched_rr_ok.service \
- test/sched_rr_change.service
+ test/sched_rr_change.service \
+ test/son.service \
+ test/daughter.service \
+ test/parent.slice
EXTRA_DIST += \
src/test/test-helper.h
test_engine_CFLAGS = \
$(AM_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(SECCOMP_CFLAGS)
test_engine_LDADD = \
libsystemd-core.la \
test_job_type_CFLAGS = \
$(AM_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(SECCOMP_CFLAGS)
test_job_type_LDADD = \
libsystemd-core.la \
test_ns_SOURCES = \
src/test/test-ns.c
-test_ns_LDADD = \
- libsystemd-core.la
-
test_ns_CFLAGS = \
$(AM_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(SECCOMP_CFLAGS)
+
+test_ns_LDADD = \
+ libsystemd-core.la
test_loopback_SOURCES = \
src/test/test-loopback.c
test_unit_name_CFLAGS = \
$(AM_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(SECCOMP_CFLAGS)
test_unit_name_LDADD = \
libsystemd-core.la \
test_unit_file_CFLAGS = \
$(AM_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(SECCOMP_CFLAGS)
test_unit_file_LDADD = \
libsystemd-core.la \
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_barrier_SOURCES = \
+ src/test/test-barrier.c
+
+test_barrier_LDADD = \
+ libsystemd-core.la
+
+test_pty_SOURCES = \
+ src/test/test-pty.c
+
+test_pty_LDADD = \
+ libsystemd-core.la
+
+test_tmpfiles_SOURCES = \
+ src/test/test-tmpfiles.c
+
+test_tmpfiles_LDADD = \
+ libsystemd-shared.la
+
test_namespace_SOURCES = \
src/test/test-namespace.c
test_hashmap_LDADD = \
libsystemd-core.la
+test_xml_SOURCES = \
+ src/test/test-xml.c
+
+test_xml_LDADD = \
+ libsystemd-shared.la
+
test_list_SOURCES = \
src/test/test-list.c
test_tables_SOURCES = \
src/test/test-tables.c \
- src/shared/test-tables.h
+ src/shared/test-tables.h \
+ src/bus-proxyd/bus-policy.c \
+ src/bus-proxyd/bus-policy.h \
+ src/journal/journald-server.c \
+ src/journal/journald-server.h
test_tables_CFLAGS = \
$(AM_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(SECCOMP_CFLAGS) \
+ -I$(srcdir)/src/bus-proxyd
test_tables_LDADD = \
libsystemd-logs.la \
libsystemd-journal-internal.la \
libsystemd-core.la \
+ libudev-core.la \
$(RT_LIBS)
test_prioq_SOURCES = \
test_time_LDADD = \
libsystemd-core.la
+test_architecture_SOURCES = \
+ src/test/test-architecture.c
+
+test_architecture_LDADD = \
+ libsystemd-shared.la
+
test_log_SOURCES = \
src/test/test-log.c
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
src/test/test-daemon.c
test_daemon_LDADD = \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
test_cgroup_SOURCES = \
test_cgroup_LDADD = \
libsystemd-label.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-internal.la
+
+test_cgroup_mask_SOURCES = \
+ src/test/test-cgroup-mask.c
+
+test_cgroup_mask_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -DTEST_DIR=\"$(abs_top_srcdir)/test\"
+
+test_cgroup_mask_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
+test_cgroup_mask_LDADD = \
+ libsystemd-core.la \
+ $(RT_LIBS)
test_cgroup_util_SOURCES = \
src/test/test-cgroup-util.c
test_cgroup_util_LDADD = \
libsystemd-label.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
test_env_replace_SOURCES = \
test_strv_LDADD = \
libsystemd-units.la \
- libsystemd-id128-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
test_path_util_SOURCES = \
test_install_SOURCES = \
src/test/test-install.c
-test_install_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
-
test_install_LDADD = \
libsystemd-units.la \
libsystemd-label.la \
- libsystemd-id128-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-internal.la
test_watchdog_SOURCES = \
src/test/test-watchdog.c
test_sched_prio_SOURCES = \
src/test/test-sched-prio.c
+test_sched_prio_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -DTEST_DIR=\"$(abs_top_srcdir)/test\"
+
test_sched_prio_CFLAGS = \
$(AM_CFLAGS) \
- $(DBUS_CFLAGS) \
- -D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)"
+ $(SECCOMP_CFLAGS)
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
+.PHONY: coverage lcov-run lcov-report coverage-sync
# run lcov from scratch, always
-coverage:
+coverage: all
$(MAKE) lcov-run
$(MAKE) lcov-report
src/analyze/analyze.c
systemd_analyze_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
src/initctl/initctl.c
systemd_initctl_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
$(AUDIT_CFLAGS)
systemd_update_utmp_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
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
systemd_shutdownd_LDADD = \
libsystemd-label.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
dist_doc_DATA += \
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
systemd_tmpfiles_SOURCES = \
- src/tmpfiles/tmpfiles.c \
- src/shared/specifier.c \
- src/shared/specifier.h
+ src/tmpfiles/tmpfiles.c
systemd_tmpfiles_LDADD = \
+ libsystemd-units.la \
libsystemd-label.la \
libsystemd-capability.la \
- libsystemd-id128-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
rootbin_PROGRAMS += \
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/x11.conf \
+ tmpfiles.d/var.conf \
+ tmpfiles.d/etc.conf
if HAVE_SYSV_COMPAT
dist_tmpfiles_DATA += \
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 \
systemd_machine_id_setup_LDADD = \
libsystemd-label.la \
- libsystemd-id128-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
src/fsck/fsck.c
systemd_fsck_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libudev-internal.la \
libsystemd-shared.la
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
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 \
bootctl_LDADD = \
libsystemd-shared.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la
+ libsystemd-internal.la
bin_PROGRAMS += \
bootctl
+
+dist_bashcompletion_DATA += \
+ shell-completion/bash/bootctl
+
+dist_zshcompletion_DATA += \
+ shell-completion/zsh/_bootctl
+
endif
# ------------------------------------------------------------------------------
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 \
- libsystemd-id128-internal.la \
+ libsystemd-internal.la \
libudev-internal.la \
libsystemd-shared.la \
$(BLKID_LIBS)
endif
# ------------------------------------------------------------------------------
-systemd_rc_local_generator_SOURCES = \
- src/rc-local-generator/rc-local-generator.c
+if ENABLE_KDBUS
+systemgenerator_PROGRAMS += \
+ systemd-dbus1-generator
-systemd_rc_local_generator_LDADD = \
+systemd_dbus1_generator_SOURCES = \
+ src/dbus1-generator/dbus1-generator.c
+
+systemd_dbus1_generator_LDADD = \
libsystemd-label.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-internal.la
-# ------------------------------------------------------------------------------
+dbus1-generator-install-hook:
+ $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
+ $(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
+
+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
+
+systemd_rc_local_generator_LDADD = \
+ libsystemd-label.la \
+ libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
systemd_remount_fs_SOURCES = \
src/remount-fs/remount-fs.c \
src/core/mount-setup.c \
src/cgroups-agent/cgroups-agent.c
systemd_cgroups_agent_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
+systemd_escape_SOURCES = \
+ src/escape/escape.c
+
+systemd_escape_LDADD = \
+ libsystemd-shared.la
+
+# -----------------------------------------------------------------------------
systemctl_SOURCES = \
src/systemctl/systemctl.c
systemctl_LDADD = \
libsystemd-units.la \
libsystemd-label.la \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-logs.la \
- libsystemd-login-internal.la \
libsystemd-journal-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
src/readahead/sd-readahead.c
systemd_notify_LDADD = \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
+systemd_path_SOURCES = \
+ src/path/path.c
+
+systemd_path_LDADD = \
+ libsystemd-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
src/cgls/cgls.c
systemd_cgls_LDADD = \
+ libsystemd-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
src/core/loopback-setup.c \
src/core/loopback-setup.h
+systemd_nspawn_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS) \
+ $(BLKID_CFLAGS)
+
systemd_nspawn_LDADD = \
libsystemd-label.la \
libsystemd-capability.la \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
- libsystemd-shared.la
+ libsystemd-internal.la \
+ libudev-internal.la \
+ libsystemd-shared.la \
+ $(BLKID_LIBS)
+
+if HAVE_SECCOMP
+systemd_nspawn_LDADD += \
+ libsystemd-seccomp.la \
+ $(SECCOMP_LIBS)
+endif
# ------------------------------------------------------------------------------
systemd_run_SOURCES = \
systemd_run_LDADD = \
libsystemd-label.la \
libsystemd-capability.la \
- libsystemd-bus-internal.la \
- libsystemd-daemon-internal.la \
- libsystemd-id128-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
-systemd_stdio_bridge_SOURCES = \
- src/stdio-bridge/stdio-bridge.c
+systemd_bus_proxyd_SOURCES = \
+ src/bus-proxyd/bus-proxyd.c \
+ src/bus-proxyd/bus-policy.c \
+ src/bus-proxyd/bus-policy.h
-systemd_stdio_bridge_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-daemon-internal.la \
- libsystemd-id128-internal.la \
+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_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
+
+INSTALL_EXEC_HOOKS += bus-proxyd-install-hook
+UNINSTALL_EXEC_HOOKS += bus-proxyd-uninstall-hook
+
+if ENABLE_KDBUS
+nodist_systemunit_DATA += \
+ units/systemd-bus-proxyd@.service
+
+dist_systemunit_DATA += \
+ units/systemd-bus-proxyd.socket
+
+dist_userunit_DATA += \
+ units/user/systemd-bus-proxyd.socket \
+ units/user/systemd-bus-proxyd@.service
+endif
+
+EXTRA_DIST += \
+ units/systemd-bus-proxyd@.service.in
+
# ------------------------------------------------------------------------------
systemd_tty_ask_password_agent_SOURCES = \
src/tty-ask-password-agent/tty-ask-password-agent.c
libsystemd-shared.la
# ------------------------------------------------------------------------------
-libsystemd_daemon_la_SOURCES = \
- src/libsystemd-daemon/sd-daemon.c
+libsystemd_internal_la_SOURCES = \
+ src/systemd/sd-bus.h \
+ src/systemd/sd-bus-protocol.h \
+ src/systemd/sd-bus-vtable.h \
+ src/systemd/sd-memfd.h \
+ src/systemd/sd-utf8.h \
+ src/systemd/sd-event.h \
+ src/systemd/sd-rtnl.h \
+ src/systemd/sd-resolve.h \
+ 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-bus/bus-error.c \
+ src/libsystemd/sd-bus/bus-error.h \
+ src/libsystemd/sd-bus/bus-internal.c \
+ src/libsystemd/sd-bus/bus-internal.h \
+ src/libsystemd/sd-bus/bus-socket.c \
+ src/libsystemd/sd-bus/bus-socket.h \
+ src/libsystemd/sd-bus/bus-kernel.c \
+ src/libsystemd/sd-bus/bus-kernel.h \
+ src/libsystemd/sd-bus/bus-container.c \
+ src/libsystemd/sd-bus/bus-container.h \
+ src/libsystemd/sd-bus/bus-message.c \
+ src/libsystemd/sd-bus/bus-message.h \
+ src/libsystemd/sd-bus/bus-creds.c \
+ src/libsystemd/sd-bus/bus-creds.h \
+ src/libsystemd/sd-bus/bus-signature.c \
+ src/libsystemd/sd-bus/bus-signature.h \
+ src/libsystemd/sd-bus/bus-type.c \
+ src/libsystemd/sd-bus/bus-type.h \
+ src/libsystemd/sd-bus/bus-match.c \
+ src/libsystemd/sd-bus/bus-match.h \
+ src/libsystemd/sd-bus/bus-bloom.c \
+ src/libsystemd/sd-bus/bus-bloom.h \
+ src/libsystemd/sd-bus/bus-introspect.c \
+ src/libsystemd/sd-bus/bus-introspect.h \
+ src/libsystemd/sd-bus/bus-objects.c \
+ src/libsystemd/sd-bus/bus-objects.h \
+ 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 \
+ src/libsystemd/sd-utf8/sd-utf8.c \
+ src/libsystemd/sd-event/sd-event.c \
+ src/libsystemd/sd-event/event-util.h \
+ src/libsystemd/sd-rtnl/sd-rtnl.c \
+ src/libsystemd/sd-rtnl/rtnl-internal.h \
+ src/libsystemd/sd-rtnl/rtnl-message.c \
+ src/libsystemd/sd-rtnl/rtnl-types.h \
+ src/libsystemd/sd-rtnl/rtnl-types.c \
+ src/libsystemd/sd-rtnl/rtnl-util.h \
+ src/libsystemd/sd-rtnl/rtnl-util.c \
+ src/libsystemd/sd-rtnl/local-addresses.h \
+ src/libsystemd/sd-rtnl/local-addresses.c \
+ src/libsystemd/sd-id128/sd-id128.c \
+ src/libsystemd/sd-daemon/sd-daemon.c \
+ src/libsystemd/sd-login/sd-login.c \
+ src/libsystemd/sd-path/sd-path.c
+
+nodist_libsystemd_internal_la_SOURCES = \
+ src/libsystemd/libsystemd.sym \
+ src/libsystemd/sd-bus/bus-error-mapping.c
+
+libsystemd_internal_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ -pthread
-libsystemd_daemon_internal_la_SOURCES = \
- $(libsystemd_daemon_la_SOURCES)
+libsystemd_internal_la_LIBADD = \
+ $(RT_LIBS)
-libsystemd_daemon_internal_la_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -DSD_DAEMON_DISABLE_MQ
+libsystemd_resolve_la_SOURCES = \
+ src/libsystemd/sd-resolve/sd-resolve.c \
+ src/libsystemd/sd-resolve/resolve-util.h
-libsystemd_daemon_la_CFLAGS = \
+libsystemd_resolve_la_CFLAGS = \
$(AM_CFLAGS) \
- -fvisibility=hidden \
- -DSD_EXPORT_SYMBOLS
-
-libsystemd_daemon_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
- -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/libsystemd-daemon.sym
+ -pthread
-libsystemd_daemon_la_LIBADD = \
- $(RT_LIBS)
+libsystemd_resolve_la_LIBADD = \
+ -lresolv
-pkginclude_HEADERS += \
- src/systemd/sd-daemon.h
+noinst_LTLIBRARIES += \
+ libsystemd-internal.la \
+ libsystemd-resolve.la
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libsystemd-daemon-install-hook:
- libname=libsystemd-daemon.so && $(move-to-rootlibdir)
+libsystemd_dump_la_SOURCES = \
+ src/libsystemd/sd-bus/bus-dump.c \
+ src/libsystemd/sd-bus/bus-dump.h
-libsystemd-daemon-uninstall-hook:
- rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
+libsystemd_dump_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(CAP_CFLAGS)
-INSTALL_EXEC_HOOKS += libsystemd-daemon-install-hook
-UNINSTALL_EXEC_HOOKS += libsystemd-daemon-uninstall-hook
+noinst_LTLIBRARIES += \
+ libsystemd-dump.la
-lib_LTLIBRARIES += \
- libsystemd-daemon.la
+EXTRA_DIST += \
+ src/libsystemd/libsystemd.sym.m4 \
+ src/libsystemd/libsystemd.pc.in \
+ src/libsystemd/sd-bus/bus-error-mapping.gperf \
+ src/libsystemd/sd-bus/DIFFERENCES \
+ src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
-noinst_LTLIBRARIES += \
- libsystemd-daemon-internal.la
+CLEANFILES += \
+ src/libsystemd/libsystemd.sym \
+ src/libsystemd/sd-bus/bus-error-mapping.c
-pkgconfiglib_DATA += \
- src/libsystemd-daemon/libsystemd-daemon.pc
+BUILT_SOURCES += \
+ src/libsystemd/libsystemd.sym
-EXTRA_DIST += \
- src/libsystemd-daemon/libsystemd-daemon.pc.in \
- src/libsystemd-daemon/libsystemd-daemon.sym
+libsystemd_la_SOURCES = \
+ $(libsystemd_internal_la_SOURCES) \
+ $(libsystemd_resolve_la_SOURCES) \
+ $(libsystemd_journal_internal_la_SOURCES)
-# ------------------------------------------------------------------------------
-libsystemd_bus_la_SOURCES = \
- src/systemd/sd-bus.h \
- src/systemd/sd-bus-protocol.h \
- src/systemd/sd-bus-vtable.h \
- src/systemd/sd-memfd.h \
- src/systemd/sd-utf8.h \
- src/systemd/sd-event.h \
- src/libsystemd-bus/sd-bus.c \
- src/libsystemd-bus/bus-control.c \
- src/libsystemd-bus/bus-control.h \
- src/libsystemd-bus/bus-error.c \
- src/libsystemd-bus/bus-error.h \
- src/libsystemd-bus/bus-internal.c \
- src/libsystemd-bus/bus-internal.h \
- src/libsystemd-bus/bus-socket.c \
- src/libsystemd-bus/bus-socket.h \
- src/libsystemd-bus/bus-kernel.c \
- src/libsystemd-bus/bus-kernel.h \
- src/libsystemd-bus/bus-container.c \
- src/libsystemd-bus/bus-container.h \
- src/libsystemd-bus/bus-message.c \
- src/libsystemd-bus/bus-message.h \
- src/libsystemd-bus/bus-signature.c \
- src/libsystemd-bus/bus-signature.h \
- src/libsystemd-bus/bus-type.c \
- src/libsystemd-bus/bus-type.h \
- src/libsystemd-bus/bus-match.c \
- src/libsystemd-bus/bus-match.h \
- src/libsystemd-bus/bus-bloom.c \
- src/libsystemd-bus/bus-bloom.h \
- src/libsystemd-bus/bus-introspect.c \
- src/libsystemd-bus/bus-introspect.h \
- src/libsystemd-bus/bus-objects.c \
- src/libsystemd-bus/bus-objects.h \
- src/libsystemd-bus/bus-convenience.c \
- src/libsystemd-bus/kdbus.h \
- src/libsystemd-bus/sd-memfd.c \
- src/libsystemd-bus/bus-util.c \
- src/libsystemd-bus/bus-util.h \
- src/libsystemd-bus/sd-utf8.c \
- src/libsystemd-bus/sd-event.c \
- src/libsystemd-bus/event-util.h
-
-libsystemd_bus_la_LIBADD = \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
- libsystemd-shared.la
+nodist_libsystemd_la_SOURCES = \
+ $(nodist_libsystemd_internal_la_SOURCES)
-libsystemd_bus_la_CFLAGS = \
- $(AM_CFLAGS) \
- -pthread
+libsystemd_la_CFLAGS = \
+ $(libsystemd_internal_la_CFLAGS) \
+ $(libsystemd_resolve_la_CFLAGS) \
+ $(libsystemd_journal_internal_la_CFLAGS)
-libsystemd_bus_la_LDFLAGS = \
+libsystemd_la_LDFLAGS = \
$(AM_LDFLAGS) \
- -version-info $(LIBSYSTEMD_BUS_CURRENT):$(LIBSYSTEMD_BUS_REVISION):$(LIBSYSTEMD_BUS_AGE) \
- -Wl,--version-script=$(top_srcdir)/src/libsystemd-bus/libsystemd-bus.sym
-
-pkgconfiglib_DATA += \
- src/libsystemd-bus/libsystemd-bus.pc
+ -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
+ -Wl,--version-script=$(top_builddir)/src/libsystemd/libsystemd.sym
-EXTRA_DIST += \
- src/libsystemd-bus/libsystemd-bus.pc.in \
- src/libsystemd-bus/libsystemd-bus.sym
+libsystemd_la_LIBADD = \
+ libsystemd-shared.la \
+ $(libsystemd_internal_la_LIBADD) \
+ $(libsystemd_journal_internal_la_LIBADD) \
+ $(libsystemd_resolve_la_LIBADD)
-lib_LTLIBRARIES += \
- libsystemd-bus.la
+libsystemd-install-hook:
+ libname=libsystemd.so && $(move-to-rootlibdir)
-libsystemd_bus_internal_la_SOURCES = \
- $(libsystemd_bus_la_SOURCES)
+libsystemd-uninstall-hook:
+ rm -f $(DESTDIR)$(rootlibdir)/libsystemd.so*
-libsystemd_bus_internal_la_CFLAGS = \
- $(libsystemd_bus_la_CFLAGS)
+INSTALL_EXEC_HOOKS += libsystemd-install-hook
+UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook
-noinst_LTLIBRARIES += \
- libsystemd-bus-internal.la
+pkgconfiglib_DATA += \
+ src/libsystemd/libsystemd.pc
-libsystemd_bus_dump_la_SOURCES = \
- src/libsystemd-bus/bus-dump.c \
- src/libsystemd-bus/bus-dump.h
+pkginclude_HEADERS += \
+ src/systemd/sd-login.h \
+ src/systemd/sd-id128.h \
+ src/systemd/sd-daemon.h
-libsystemd_bus_dump_la_CFLAGS = \
- $(AM_CFLAGS)
- $(CAP_CFLAGS)
+if ENABLE_KDBUS
+pkginclude_HEADERS += \
+ src/systemd/sd-bus.h \
+ src/systemd/sd-bus-protocol.h \
+ src/systemd/sd-bus-vtable.h \
+ src/systemd/sd-memfd.h \
+ src/systemd/sd-utf8.h \
+ src/systemd/sd-event.h \
+ src/systemd/sd-rtnl.h \
+ src/systemd/sd-resolve.h \
+ src/systemd/sd-path.h
+endif
-noinst_LTLIBRARIES += \
- libsystemd-bus-dump.la
+lib_LTLIBRARIES += \
+ libsystemd.la
tests += \
test-bus-marshal \
test-bus-signature \
test-bus-chat \
+ test-bus-cleanup \
test-bus-server \
test-bus-match \
test-bus-kernel \
test-bus-zero-copy \
test-bus-introspect \
test-bus-objects \
- test-event
+ test-bus-error \
+ test-bus-creds \
+ test-bus-gvariant \
+ test-event \
+ test-rtnl \
+ test-resolve
bin_PROGRAMS += \
busctl
test_bus_marshal_SOURCES = \
- src/libsystemd-bus/test-bus-marshal.c
+ src/libsystemd/sd-bus/test-bus-marshal.c
test_bus_marshal_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la \
- libsystemd-bus-dump.la \
+ libsystemd-dump.la \
libsystemd-capability.la \
$(GLIB_LIBS) \
$(DBUS_LIBS) \
$(CAP_CFLAGS)
test_bus_signature_SOURCES = \
- src/libsystemd-bus/test-bus-signature.c
+ src/libsystemd/sd-bus/test-bus-signature.c
test_bus_signature_LDADD = \
libsystemd-shared.la \
- libsystemd-bus-internal.la
+ libsystemd-internal.la
test_bus_chat_SOURCES = \
- src/libsystemd-bus/test-bus-chat.c
+ src/libsystemd/sd-bus/test-bus-chat.c
test_bus_chat_CFLAGS = \
$(AM_CFLAGS) \
-pthread
test_bus_chat_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la
+
+test_bus_cleanup_SOURCES = \
+ src/libsystemd/sd-bus/test-bus-cleanup.c
+
+test_bus_cleanup_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
+test_bus_cleanup_LDADD = \
+ libsystemd-internal.la \
libsystemd-shared.la
test_bus_server_SOURCES = \
- src/libsystemd-bus/test-bus-server.c
+ src/libsystemd/sd-bus/test-bus-server.c
test_bus_server_CFLAGS = \
$(AM_CFLAGS) \
-pthread
test_bus_server_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
test_bus_objects_SOURCES = \
- src/libsystemd-bus/test-bus-objects.c
+ src/libsystemd/sd-bus/test-bus-objects.c
test_bus_objects_CFLAGS = \
$(AM_CFLAGS) \
-pthread
test_bus_objects_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la \
+ libsystemd-dump.la \
+ libsystemd-capability.la \
+ $(CAP_LIBS)
+
+test_bus_error_SOURCES = \
+ src/libsystemd/sd-bus/test-bus-error.c
+
+test_bus_error_LDADD = \
+ libsystemd-internal.la \
+ libsystemd-shared.la
+
+test_bus_gvariant_SOURCES = \
+ src/libsystemd/sd-bus/test-bus-gvariant.c
+
+test_bus_gvariant_LDADD = \
+ libsystemd-internal.la \
libsystemd-shared.la \
- libsystemd-bus-dump.la \
+ libsystemd-dump.la \
libsystemd-capability.la \
+ $(GLIB_LIBS) \
$(CAP_LIBS)
+test_bus_gvariant_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(GLIB_CFLAGS)
+ $(CAP_CFLAGS)
+
+test_bus_creds_SOURCES = \
+ src/libsystemd/sd-bus/test-bus-creds.c
+
+test_bus_creds_LDADD = \
+ libsystemd-internal.la \
+ libsystemd-shared.la \
+ libsystemd-dump.la \
+ libsystemd-capability.la
+
test_bus_match_SOURCES = \
- src/libsystemd-bus/test-bus-match.c
+ src/libsystemd/sd-bus/test-bus-match.c
test_bus_match_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
test_bus_kernel_SOURCES = \
- src/libsystemd-bus/test-bus-kernel.c
+ src/libsystemd/sd-bus/test-bus-kernel.c
test_bus_kernel_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la \
- libsystemd-bus-dump.la \
+ libsystemd-dump.la \
libsystemd-capability.la \
$(CAP_LIBS)
$(CAP_CFLAGS)
test_bus_kernel_bloom_SOURCES = \
- src/libsystemd-bus/test-bus-kernel-bloom.c
+ src/libsystemd/sd-bus/test-bus-kernel-bloom.c
test_bus_kernel_bloom_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
test_bus_kernel_benchmark_SOURCES = \
- src/libsystemd-bus/test-bus-kernel-benchmark.c
+ src/libsystemd/sd-bus/test-bus-kernel-benchmark.c
test_bus_kernel_benchmark_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
test_bus_memfd_SOURCES = \
- src/libsystemd-bus/test-bus-memfd.c
+ src/libsystemd/sd-bus/test-bus-memfd.c
test_bus_memfd_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
test_bus_zero_copy_SOURCES = \
- src/libsystemd-bus/test-bus-zero-copy.c
+ src/libsystemd/sd-bus/test-bus-zero-copy.c
test_bus_zero_copy_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la \
- libsystemd-bus-dump.la \
+ libsystemd-dump.la \
libsystemd-capability.la \
$(CAP_LIBS)
$(CAP_CFLAGS)
test_bus_introspect_SOURCES = \
- src/libsystemd-bus/test-bus-introspect.c
+ src/libsystemd/sd-bus/test-bus-introspect.c
test_bus_introspect_LDADD = \
- libsystemd-shared.la \
- libsystemd-bus-internal.la
+ libsystemd-internal.la \
+ libsystemd-shared.la
test_event_SOURCES = \
- src/libsystemd-bus/test-event.c
+ src/libsystemd/sd-event/test-event.c
test_event_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la
+
+test_rtnl_SOURCES = \
+ src/libsystemd/sd-rtnl/test-rtnl.c
+
+test_rtnl_LDADD = \
+ libsystemd-internal.la \
libsystemd-shared.la
+test_resolve_SOURCES = \
+ src/libsystemd/sd-resolve/test-resolve.c
+
+test_resolve_LDADD = \
+ libsystemd-resolve.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la
+
+test_resolve_CFLAGS = \
+ $(AM_CFLAGS) \
+ -pthread
+
busctl_SOURCES = \
- src/libsystemd-bus/busctl.c
+ src/libsystemd/sd-bus/busctl.c
busctl_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la \
- libsystemd-bus-dump.la \
+ libsystemd-dump.la \
libsystemd-capability.la \
$(CAP_LIBS)
$(AM_CFLAGS) \
$(CAP_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-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 \
+ $(KMOD_LIBS)
+
+test_dhcp_option_SOURCES = \
+ src/libsystemd-network/dhcp-protocol.h \
+ src/libsystemd-network/dhcp-internal.h \
+ src/libsystemd-network/test-dhcp-option.c
+
+test_dhcp_option_LDADD = \
+ libsystemd-network.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la
+
+test_dhcp_client_SOURCES = \
+ src/systemd/sd-dhcp-client.h \
+ src/libsystemd-network/dhcp-protocol.h \
+ src/libsystemd-network/dhcp-internal.h \
+ 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-server \
+ test-ipv4ll \
+ test-icmp6-rs \
+ test-dhcp6-client
+
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+ libsystemd-terminal.la
+
+libsystemd_terminal_la_CFLAGS = \
+ $(AM_CFLAGS)
+
+libsystemd_terminal_la_SOURCES = \
+ src/libsystemd-terminal/term-internal.h \
+ src/libsystemd-terminal/term-page.c \
+ src/libsystemd-terminal/term-wcwidth.c
+
+libsystemd_terminal_la_LIBADD = \
+ libsystemd-internal.la \
+ libsystemd-shared.la
+
+test_term_page_SOURCES = \
+ src/libsystemd-terminal/test-term-page.c
+
+test_term_page_LDADD = \
+ libsystemd-terminal.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la
+
+tests += \
+ test-term-page
+
# ------------------------------------------------------------------------------
if ENABLE_GTK_DOC
SUBDIRS += \
libudev.la
libudev_la_SOURCES =\
+ src/libudev/libudev.sym \
src/libudev/libudev-private.h \
src/libudev/libudev.c \
src/libudev/libudev-list.c \
-Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym
libudev_la_LIBADD = \
- libsystemd-daemon-internal.la \
- libsystemd-id128-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
pkgconfiglib_DATA += \
src/libudev/libudev.pc
EXTRA_DIST += \
- src/libudev/libudev.pc.in \
- src/libudev/libudev.sym
+ src/libudev/libudev.pc.in
CLEANFILES += \
src/libudev/libudev.pc \
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) \
$(sysconfdir)/udev/hwdb.d
dist_network_DATA = \
- network/99-default.link
+ network/99-default.link \
+ 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 \
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 \
hwdb/20-usb-vendor-model.hwdb \
hwdb/20-usb-classes.hwdb \
+ hwdb/20-sdio-vendor-model.hwdb \
+ hwdb/20-sdio-classes.hwdb \
hwdb/20-bluetooth-vendor-product.hwdb \
hwdb/20-acpi-vendor.hwdb \
hwdb/20-OUI.hwdb \
+ hwdb/20-net-ifname.hwdb \
hwdb/60-keyboard.hwdb
udevconfdir = $(sysconfdir)/udev
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
noinst_LTLIBRARIES += \
libudev-core.la
-src/udev/keyboard-keys.txt: Makefile
+src/udev/keyboard-keys.txt:
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
-src/udev/keyboard-keys-from-name.gperf: src/udev/keyboard-keys.txt Makefile
+src/udev/keyboard-keys-from-name.gperf: src/udev/keyboard-keys.txt
$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@
-src/udev/keyboard-keys-from-name.h: src/udev/keyboard-keys-from-name.gperf Makefile
+src/udev/keyboard-keys-from-name.h: src/udev/keyboard-keys-from-name.gperf
$(AM_V_GPERF)$(GPERF) -L ANSI-C -t -N keyboard_lookup_key -H hash_key_name -p -C < $< > $@
-src/udev/keyboard-keys-to-name.h: src/udev/keyboard-keys.txt Makefile
+src/udev/keyboard-keys-to-name.h: src/udev/keyboard-keys.txt
$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
libudev_core_la_SOURCES = \
libudev_core_la_LIBADD = \
libudev-internal.la \
libsystemd-label.la \
- libsystemd-daemon-internal.la \
- libsystemd-rtnl.la \
- libsystemd-id128-internal.la \
+ libsystemd-internal.la \
+ libsystemd-network.la \
libsystemd-shared.la \
$(BLKID_LIBS) \
$(KMOD_LIBS)
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
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 $@)
CLEANFILES += $(gir_DATA) $(typelibs_DATA)
endif # HAVE_INTROSPECTION
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libgudev-install-hook:
- libname=libgudev-1.0.so && $(move-to-rootlibdir)
-
-libgudev-uninstall-hook:
- rm -f $(DESTDIR)$(rootlibdir)/libgudev-1.0.so*
-
-INSTALL_EXEC_HOOKS += libgudev-install-hook
-UNINSTALL_EXEC_HOOKS += libgudev-uninstall-hook
endif
EXTRA_DIST += \
src/udev/mtd_probe/mtd_probe.h \
src/udev/mtd_probe/probe_smartmedia.c
-mtd_probe_CPPFLAGS = \
- $(AM_CPPFLAGS)
-
dist_udevrules_DATA += \
rules/75-probe_mtd.rules
mtd_probe
# ------------------------------------------------------------------------------
-libsystemd_id128_la_SOURCES = \
- src/libsystemd-id128/sd-id128.c
-
-libsystemd_id128_la_CFLAGS = \
- $(AM_CFLAGS) \
- -fvisibility=hidden
-
-libsystemd_id128_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
- -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
-
-libsystemd_id128_la_LIBADD = \
- libsystemd-shared.la
-
-libsystemd_id128_internal_la_SOURCES = \
- $(libsystemd_id128_la_SOURCES)
-
test_id128_SOURCES = \
src/test/test-id128.c
test_id128_LDADD = \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
tests += \
test-id128
-pkginclude_HEADERS += \
- src/systemd/sd-id128.h
-
-lib_LTLIBRARIES += \
- libsystemd-id128.la
-
-noinst_LTLIBRARIES += \
- libsystemd-id128-internal.la
-
-pkgconfiglib_DATA += \
- src/libsystemd-id128/libsystemd-id128.pc
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libsystemd-id128-install-hook:
- libname=libsystemd-id128.so && $(move-to-rootlibdir)
-
-libsystemd-id128-uninstall-hook:
- rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so*
-
-INSTALL_EXEC_HOOKS += libsystemd-id128-install-hook
-UNINSTALL_EXEC_HOOKS += libsystemd-id128-uninstall-hook
-
-EXTRA_DIST += \
- src/libsystemd-id128/libsystemd-id128.pc.in \
- src/libsystemd-id128/libsystemd-id128.sym
-
# ------------------------------------------------------------------------------
rootlibexec_PROGRAMS += \
systemd_activate_LDADD = \
libsystemd-label.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
src/journal/journald-server.h
systemd_journald_LDADD = \
- libsystemd-journal-core.la
+ libsystemd-journal-core.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la
systemd_cat_SOURCES = \
src/journal/cat.c
systemd_cat_LDADD = \
libsystemd-journal-core.la
-# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
-journalctl_CFLAGS = \
- $(AM_CFLAGS)
+if HAVE_MICROHTTPD
+rootlibexec_PROGRAMS += \
+ systemd-journal-remote
+
+systemd_journal_remote_SOURCES = \
+ 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
-journalctl_SOURCES = \
- src/journal/journalctl.c
+systemd_journal_remote_SOURCES += \
+ src/journal-remote/microhttpd-util.h \
+ src/journal-remote/microhttpd-util.c
-journalctl_LDADD = \
- libsystemd-journal-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-logs.la \
+systemd_journal_remote_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(MICROHTTPD_CFLAGS)
+
+systemd_journal_remote_LDADD += \
+ $(MICROHTTPD_LIBS)
+
+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
+journalctl_CFLAGS = \
+ $(AM_CFLAGS)
+
+journalctl_SOURCES = \
+ src/journal/journalctl.c
+
+journalctl_LDADD = \
+ libsystemd-journal-internal.la \
+ libsystemd-internal.la \
+ libsystemd-logs.la \
libsystemd-shared.la
if HAVE_ACL
test_journal_stream_LDADD = \
libsystemd-journal-core.la
+test_journal_flush_SOURCES = \
+ src/journal/test-journal-flush.c
+
+test_journal_flush_LDADD = \
+ libsystemd-journal-core.la
+
test_journal_init_SOURCES = \
src/journal/test-journal-init.c
test_catalog_SOURCES = \
src/journal/test-catalog.c
-test_catalog_CFLAGS = \
- $(AM_CFLAGS) \
+test_catalog_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
-DCATALOG_DIR=\"$(abs_top_srcdir)/catalog\"
test_catalog_LDADD = \
libsystemd-journal-core.la
-libsystemd_journal_la_SOURCES = \
- src/journal/sd-journal.c \
- src/systemd/sd-journal.h \
- src/systemd/_sd-common.h \
- src/journal/journal-file.c \
- src/journal/journal-file.h \
- src/journal/journal-vacuum.c \
- src/journal/journal-vacuum.h \
- src/journal/journal-verify.c \
- src/journal/journal-verify.h \
- src/journal/lookup3.c \
- src/journal/lookup3.h \
- src/journal/journal-send.c \
- src/journal/journal-def.h \
- src/journal/compress.h \
- src/journal/catalog.c \
- src/journal/catalog.h \
- src/journal/mmap-cache.c \
- src/journal/mmap-cache.h
-
-libsystemd_journal_la_CFLAGS = \
- $(AM_CFLAGS) \
- -fvisibility=hidden
-
-libsystemd_journal_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
- -Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym
+test_compress_SOURCES = \
+ src/journal/test-compress.c
-libsystemd_journal_la_LIBADD = \
- libsystemd-label.la \
- libsystemd-daemon-internal.la \
- libsystemd-id128-internal.la \
+test_compress_LDADD = \
+ libsystemd-journal-internal.la \
libsystemd-shared.la
-libsystemd_journal_internal_la_SOURCES = \
- $(libsystemd_journal_la_SOURCES)
-
-# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
-libsystemd_journal_internal_la_CFLAGS = \
- $(AM_CFLAGS)
-
-libsystemd_journal_internal_la_LIBADD =
-
-if HAVE_XZ
-libsystemd_journal_la_SOURCES += \
- src/journal/compress.c
-
-libsystemd_journal_la_CFLAGS += \
- $(XZ_CFLAGS)
-
-libsystemd_journal_la_LIBADD += \
- $(XZ_LIBS)
-
-libsystemd_journal_internal_la_CFLAGS += \
- $(XZ_CFLAGS)
+test_compress_benchmark_SOURCES = \
+ src/journal/test-compress-benchmark.c
-libsystemd_journal_internal_la_LIBADD += \
- $(XZ_LIBS)
-endif
+test_compress_benchmark_LDADD = \
+ libsystemd-journal-internal.la \
+ libsystemd-shared.la
libsystemd_journal_core_la_SOURCES = \
src/journal/journald-kmsg.c \
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 \
libsystemd_journal_core_la_LIBADD = \
libsystemd-journal-internal.la \
libudev-internal.la \
- libsystemd-audit.la \
libsystemd-capability.la \
libsystemd-label.la \
- libsystemd-daemon-internal.la \
- libsystemd-id128-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
-if ENABLE_LOGIND
-libsystemd_journal_core_la_LIBADD += \
- libsystemd-login-internal.la
-endif
-
if HAVE_ACL
libsystemd_journal_core_la_LIBADD += \
libsystemd-acl.la
noinst_LTLIBRARIES += \
libsystemd-journal-core.la
-if HAVE_GCRYPT
-libsystemd_journal_la_SOURCES += \
- src/journal/journal-authenticate.c \
- src/journal/journal-authenticate.h \
- src/journal/fsprg.c \
- src/journal/fsprg.h
-
-libsystemd_journal_la_CFLAGS += \
- $(GCRYPT_CFLAGS) \
- -Wno-pointer-arith
-
-libsystemd_journal_la_LIBADD += \
- $(GCRYPT_LIBS)
-
-libsystemd_journal_internal_la_CFLAGS += \
- $(GCRYPT_CFLAGS) \
- -Wno-pointer-arith
-
-libsystemd_journal_internal_la_LIBADD += \
- $(GCRYPT_LIBS)
-endif
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if
-# needed. Also, grant read access to new journal files to members of
-# "adm" and "wheel".
-libsystemd-journal-install-hook:
- libname=libsystemd-journal.so && $(move-to-rootlibdir)
+journal-install-hook:
-$(MKDIR_P) $(DESTDIR)/var/log/journal
-chown 0:0 $(DESTDIR)/var/log/journal
-chmod 755 $(DESTDIR)/var/log/journal
-setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/
-setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/
-libsystemd-journal-uninstall-hook:
- rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
+journal-uninstall-hook:
+ -rmdir $(DESTDIR)/var/log/journal/remote
+ -rmdir $(DESTDIR)/var/log/journal/
-INSTALL_EXEC_HOOKS += libsystemd-journal-install-hook
-UNINSTALL_EXEC_HOOKS += libsystemd-journal-uninstall-hook
+INSTALL_EXEC_HOOKS += journal-install-hook
+UNINSTALL_EXEC_HOOKS += journal-uninstall-hook
# ------------------------------------------------------------------------------
-
# Update catalog on installation. Do not bother if installing
# in DESTDIR, since this is likely for packaging purposes.
catalog-update-hook:
test-journal-init \
test-journal-verify \
test-journal-interleaving \
+ test-journal-flush \
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/systemd/_sd-common.h
-lib_LTLIBRARIES += \
- libsystemd-journal.la
+libsystemd_journal_internal_la_SOURCES = \
+ src/journal/sd-journal.c \
+ src/systemd/sd-journal.h \
+ src/systemd/_sd-common.h \
+ src/journal/journal-file.c \
+ src/journal/journal-file.h \
+ src/journal/journal-vacuum.c \
+ src/journal/journal-vacuum.h \
+ src/journal/journal-verify.c \
+ src/journal/journal-verify.h \
+ src/journal/lookup3.c \
+ src/journal/lookup3.h \
+ src/journal/journal-send.c \
+ src/journal/journal-def.h \
+ src/journal/compress.h \
+ src/journal/catalog.c \
+ src/journal/catalog.h \
+ src/journal/mmap-cache.c \
+ src/journal/mmap-cache.h
+
+# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
+libsystemd_journal_internal_la_CFLAGS = \
+ $(AM_CFLAGS)
+
+libsystemd_journal_internal_la_LIBADD =
+
+libsystemd_journal_internal_la_SOURCES += \
+ src/journal/compress.c
+
+if HAVE_XZ
+libsystemd_journal_internal_la_CFLAGS += \
+ $(XZ_CFLAGS)
+
+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 \
+ src/journal/journal-authenticate.h \
+ src/journal/fsprg.c \
+ src/journal/fsprg.h
+
+libsystemd_journal_internal_la_LIBADD += \
+ $(GCRYPT_LIBS)
+
+# fsprg.c is a drop-in file using void pointer arithmetic
+libsystemd_journal_internal_la_CFLAGS += \
+ $(GCRYPT_CFLAGS) \
+ -Wno-pointer-arith
+endif
noinst_LTLIBRARIES += \
libsystemd-journal-internal.la
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
-pkgconfiglib_DATA += \
- src/journal/libsystemd-journal.pc
-
dist_catalog_DATA = \
+ catalog/systemd.fr.catalog \
+ catalog/systemd.ru.catalog \
+ catalog/systemd.it.catalog \
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 += \
- src/journal/libsystemd-journal.pc.in \
- src/journal/libsystemd-journal.sym \
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 \
libsystemd-journal-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la \
$(MICROHTTPD_LIBS)
+if HAVE_GNUTLS
+systemd_journal_gatewayd_LDADD += \
+ $(GNUTLS_LIBS)
+endif
+
systemd_journal_gatewayd_CFLAGS = \
$(AM_CFLAGS) \
- -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \
$(MICROHTTPD_CFLAGS)
+systemd_journal_gatewayd_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\"
+
dist_systemunit_DATA += \
units/systemd-journal-gatewayd.socket
units/systemd-journal-gatewayd.service
dist_gatewayddocumentroot_DATA = \
- src/journal/browse.html
+ src/journal-remote/browse.html
endif
systemd_socket_proxyd_LDADD = \
libsystemd-logs.la \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-journal-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-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-internal.la \
libsystemd-shared.la
-if ENABLE_LOGIND
+if HAVE_ELFUTILS
+systemd_coredump_SOURCES += \
+ src/journal/stacktrace.c \
+ src/journal/stacktrace.h
+
systemd_coredump_LDADD += \
- libsystemd-login-internal.la
+ $(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-id128-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
src/readahead/readahead-common.h
systemd_readahead_LDADD = \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libudev-internal.la \
libsystemd-shared.la
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 += \
systemd-cryptsetup-generator
dist_systemunit_DATA += \
- units/cryptsetup.target
+ units/cryptsetup.target \
+ units/cryptsetup-pre.target
systemd_cryptsetup_SOURCES = \
src/cryptsetup/cryptsetup.c
systemd_hostnamed_LDADD = \
libsystemd-label.la \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
rootlibexec_PROGRAMS += \
nodist_systemunit_DATA += \
units/systemd-hostnamed.service
+dist_systemunit_DATA += \
+ units/org.freedesktop.hostname1.busname
+
dist_dbuspolicy_DATA += \
src/hostname/org.freedesktop.hostname1.conf
SYSTEM_UNIT_ALIASES += \
systemd-hostnamed.service dbus-org.freedesktop.hostname1.service
+BUSNAMES_TARGET_WANTS += \
+ org.freedesktop.hostname1.busname
+
hostnamectl_SOURCES = \
src/hostname/hostnamectl.c
hostnamectl_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
bin_PROGRAMS += \
EXTRA_DIST += \
units/systemd-hostnamed.service.in
+# ------------------------------------------------------------------------------
+if ENABLE_KDBUS
+dist_systemunit_DATA += \
+ units/org.freedesktop.systemd1.busname
+
+BUSNAMES_TARGET_WANTS += \
+ org.freedesktop.systemd1.busname
+endif
+
# ------------------------------------------------------------------------------
if ENABLE_LOCALED
systemd_localed_SOURCES = \
systemd_localed_LDADD = \
libsystemd-label.la \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
nodist_systemunit_DATA += \
units/systemd-localed.service
+dist_systemunit_DATA += \
+ units/org.freedesktop.locale1.busname
+
rootlibexec_PROGRAMS += \
systemd-localed
SYSTEM_UNIT_ALIASES += \
systemd-localed.service dbus-org.freedesktop.locale1.service
+BUSNAMES_TARGET_WANTS += \
+ org.freedesktop.locale1.busname
+
dist_pkgdata_DATA += \
src/locale/kbd-model-map
src/locale/generate-kbd-model-map
update-kbd-model-map: src/locale/generate-kbd-model-map
- $PYTHON $< > src/locale/kbd-model-map
+ $PYTHON $< >src/locale/kbd-model-map
localectl_SOURCES = \
src/locale/localectl.c
localectl_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
bin_PROGRAMS += \
endif
+.PHONY: update-kbd-model-map
+
polkitpolicy_in_files += \
src/locale/org.freedesktop.locale1.policy.in
systemd_timedated_LDADD = \
libsystemd-label.la \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
rootlibexec_PROGRAMS += \
nodist_systemunit_DATA += \
units/systemd-timedated.service
+dist_systemunit_DATA += \
+ units/org.freedesktop.timedate1.busname
+
polkitpolicy_files += \
src/timedate/org.freedesktop.timedate1.policy
-INSTALL_DIRS += \
- $(prefix)/lib/systemd/ntp-units.d \
- $(sysconfdir)/systemd/ntp-units.d
-
SYSTEM_UNIT_ALIASES += \
systemd-timedated.service dbus-org.freedesktop.timedate1.service
+BUSNAMES_TARGET_WANTS += \
+ org.freedesktop.timedate1.busname
+
timedatectl_SOURCES = \
src/timedate/timedatectl.c
timedatectl_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
bin_PROGRAMS += \
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) \
-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
libsystemd_machine_core_la_LIBADD = \
libsystemd-label.la \
- libsystemd-audit.la \
- libsystemd-daemon-internal.la \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
+ libsystemd-internal.la \
libudev-internal.la \
libsystemd-shared.la
src/machine/machinectl.c
machinectl_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la
+
+rootbin_PROGRAMS += \
+ machinectl
+
+dist_bashcompletion_DATA += \
+ shell-completion/bash/machinectl
+
+test_machine_tables_SOURCES = \
+ src/machine/test-machine-tables.c
+
+test_machine_tables_LDADD = \
+ libsystemd-machine-core.la
+
+tests += \
+ test-machine-tables
+
+nodist_systemunit_DATA += \
+ units/systemd-machined.service
+
+dist_systemunit_DATA += \
+ units/machine.slice \
+ units/org.freedesktop.machine1.busname
+
+dist_dbussystemservice_DATA += \
+ src/machine/org.freedesktop.machine1.service
+
+dist_dbuspolicy_DATA += \
+ src/machine/org.freedesktop.machine1.conf
+
+dist_zshcompletion_DATA += \
+ shell-completion/zsh/_machinectl \
+ shell-completion/zsh/_sd_machines
+
+SYSTEM_UNIT_ALIASES += \
+ systemd-machined.service dbus-org.freedesktop.machine1.service
+
+BUSNAMES_TARGET_WANTS += \
+ org.freedesktop.machine1.busname
+
+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 \
+ 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
+
+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
-rootbin_PROGRAMS += \
- machinectl
+rootlibexec_PROGRAMS += \
+ systemd-resolved
+
+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
+
+nodist_pkgsysconf_DATA += \
+ src/resolve/resolved.conf
-test_machine_tables_SOURCES = \
- src/machine/test-machine-tables.c
+EXTRA_DIST += \
+ src/resolve/resolved.conf.in
-test_machine_tables_LDADD = \
- libsystemd-machine-core.la
+CLEANFILES += \
+ src/resolve/resolved.conf
tests += \
- test-machine-tables
-
-nodist_systemunit_DATA += \
- units/systemd-machined.service
+ test-dns-domain
-dist_systemunit_DATA += \
- units/machine.slice
+test_dns_domain_SOURCES = \
+ src/resolve/resolved-dns-domain.h \
+ src/resolve/resolved-dns-domain.c \
+ src/resolve/test-dns-domain.c
-dist_dbussystemservice_DATA += \
- src/machine/org.freedesktop.machine1.service
+test_dns_domain_LDADD = \
+ libsystemd-capability.la \
+ libsystemd-network.la \
+ libsystemd-label.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la
-dist_dbuspolicy_DATA += \
- src/machine/org.freedesktop.machine1.conf
+libnss_resolve_la_SOURCES = \
+ src/nss-resolve/nss-resolve.sym \
+ src/nss-resolve/nss-resolve.c
-dist_zshcompletion_DATA += \
- shell-completion/zsh/_machinectl
+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
-SYSTEM_UNIT_ALIASES += \
- systemd-machined.service dbus-org.freedesktop.machine1.service
+libnss_resolve_la_LIBADD = \
+ libsystemd-shared.la \
+ libsystemd-internal.la
-EXTRA_DIST += \
- units/systemd-machined.service.in
+lib_LTLIBRARIES += \
+ libnss_resolve.la
endif
systemd-networkd
systemd_networkd_SOURCES = \
+ src/network/networkd.c
+
+systemd_networkd_LDADD = \
+ 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.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_systemd_networkd_SOURCES = \
- src/network/networkd-gperf.c
+nodist_libsystemd_networkd_core_la_SOURCES = \
+ src/network/networkd-network-gperf.c \
+ src/network/networkd-netdev-gperf.c
-systemd_networkd_LDADD = \
+libsystemd_networkd_core_la_LIBADD = \
libudev-internal.la \
- libsystemd-bus.la \
- libsystemd-rtnl.la \
+ libsystemd-internal.la \
+ libsystemd-network.la \
+ libsystemd-label.la \
libsystemd-shared.la
-nodist_systemunit_DATA += \
- units/systemd-networkd.service
+rootlibexec_PROGRAMS += \
+ systemd-networkd-wait-online
-MULTI_USER_TARGET_WANTS += \
- systemd-networkd.service
+systemd_networkd_wait_online_CFLAGS = \
+ $(AM_CFLAGS)
-test_network_SOURCES = \
- src/network/test-network.c \
- src/network/networkd.h \
- 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-gperf.c
+systemd_networkd_wait_online_SOURCES = \
+ src/libsystemd-network/network-internal.h \
+ src/network/networkd-wait-online.c \
+ src/network/networkd-wait-online.h
-test_network_LDADD = \
+systemd_networkd_wait_online_LDADD = \
+ libsystemd-network.la \
libudev-internal.la \
- libsystemd-bus.la \
- libsystemd-rtnl.la \
+ libsystemd-internal.la \
libsystemd-shared.la
-tests += test-network
+test_network_SOURCES = \
+ src/network/test-network.c
+
+test_network_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_network_LDADD = \
+ libsystemd-networkd-core.la
+
+test_network_tables_SOURCES = \
+ src/network/test-network-tables.c \
+ src/shared/test-tables.h
+
+test_network_tables_LDADD = \
+ libsystemd-networkd-core.la \
+ libudev-core.la
+
+tests += \
+ test-network \
+ test-network-tables
+
+nodist_systemunit_DATA += \
+ units/systemd-networkd.service \
+ units/systemd-networkd-wait-online.service
+
+GENERAL_ALIASES += \
+ $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \
+ $(systemunitdir)/systemd-networkd-wait-online.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service
EXTRA_DIST += \
- src/network/networkd-gperf.gperf \
- units/systemd-networkd.service.in
+ src/network/networkd-network-gperf.gperf \
+ src/network/networkd-netdev-gperf.gperf \
+ units/systemd-networkd.service.in \
+ units/systemd-networkd-wait-online.service.in
CLEANFILES += \
- src/network/networkd-gperf.c
+ src/network/networkd-network-gperf.c \
+ src/network/networkd-netdev-gperf.c
endif
# ------------------------------------------------------------------------------
libsystemd_logind_core_la_SOURCES = \
src/login/logind-core.c \
- src/login/logind-dbus.c \
src/login/logind-device.c \
src/login/logind-device.h \
src/login/logind-button.c \
src/login/logind-user.h \
src/login/logind-inhibit.c \
src/login/logind-inhibit.h \
+ src/login/logind-dbus.c \
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 \
libsystemd-capability.la \
- libsystemd-audit.la \
- libsystemd-daemon-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libudev-internal.la \
libsystemd-shared.la
src/login/sysfs-show.c
loginctl_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libudev-internal.la \
- libsystemd-shared.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la
+ libsystemd-shared.la
rootbin_PROGRAMS += \
loginctl
src/login/inhibit.c
systemd_inhibit_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
rootbin_PROGRAMS += \
systemd-inhibit
test_login_SOURCES = \
- src/login/test-login.c
+ src/libsystemd/sd-login/test-login.c
test_login_LDADD = \
- libsystemd-login-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
test_login_shared_SOURCES = \
src/login/test-login-shared.c
test_login_shared_LDADD = \
- libsystemd-login-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
test_inhibit_SOURCES = \
src/login/test-inhibit.c
test_inhibit_LDADD = \
- libsystemd-bus-internal.la \
- libsystemd-daemon-internal.la \
- libsystemd-id128-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
test_login_tables_SOURCES = \
test-login-tables \
test-login-shared
-libsystemd_login_la_SOURCES = \
- src/login/sd-login.c \
- src/systemd/sd-login.h \
- src/login/login-shared.c \
- src/login/login-shared.h
-
-libsystemd_login_la_CFLAGS = \
- $(AM_CFLAGS) \
- -fvisibility=hidden
-
-libsystemd_login_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
- -Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
-
-libsystemd_login_la_LIBADD = \
- libsystemd-daemon-internal.la \
- libsystemd-shared.la
-
-libsystemd_login_internal_la_SOURCES = \
- $(libsystemd_login_la_SOURCES)
-
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 \
- libsystemd-audit.la \
- libsystemd-bus-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la \
$(PAM_LIBS)
src/login/systemd-user
endif
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libsystemd-login-install-hook:
- libname=libsystemd-login.so && $(move-to-rootlibdir)
-
-libsystemd-login-uninstall-hook:
- rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
-
-INSTALL_EXEC_HOOKS += libsystemd-login-install-hook
-UNINSTALL_EXEC_HOOKS += libsystemd-login-uninstall-hook
-
nodist_systemunit_DATA += \
units/systemd-logind.service \
units/systemd-user-sessions.service
dist_systemunit_DATA += \
- units/user.slice
+ units/user.slice \
+ units/org.freedesktop.login1.busname
dist_dbussystemservice_DATA += \
src/login/org.freedesktop.login1.service
dist_pkgsysconf_DATA += \
src/login/logind.conf
-pkginclude_HEADERS += \
- src/systemd/sd-login.h
-
-lib_LTLIBRARIES += \
- libsystemd-login.la
-
-noinst_LTLIBRARIES += \
- libsystemd-login-internal.la
-
-pkgconfiglib_DATA += \
- src/login/libsystemd-login.pc
-
polkitpolicy_files += \
src/login/org.freedesktop.login1.policy
SYSTEM_UNIT_ALIASES += \
systemd-logind.service dbus-org.freedesktop.login1.service
+BUSNAMES_TARGET_WANTS += \
+ org.freedesktop.login1.busname
+
+if ENABLE_MULTI_SEAT_X
+
systemd_multi_seat_x_SOURCES = \
src/login/multi-seat-x.c
rootlibexec_PROGRAMS += \
systemd-multi-seat-x
+endif
+
dist_udevrules_DATA += \
src/login/70-uaccess.rules \
src/login/70-power-switch.rules
EXTRA_DIST += \
src/login/logind-gperf.gperf \
- src/login/libsystemd-login.pc.in \
- src/login/libsystemd-login.sym \
src/login/71-seat.rules.in \
src/login/73-seat-late.rules.in \
units/systemd-logind.service.in \
_journal_la_LIBADD = \
$(PYTHON_DEVEL_LIBS) \
- libsystemd-journal.la
+ libsystemd.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 \
id128_la_LIBADD = \
$(PYTHON_DEVEL_LIBS) \
- libsystemd-id128.la
+ libsystemd-shared.la \
+ libsystemd.la
_daemon_la_SOURCES = \
src/python-systemd/_daemon.c \
_daemon_la_LIBADD = \
$(PYTHON_DEVEL_LIBS) \
- libsystemd-daemon.la
+ libsystemd-shared.la \
+ libsystemd.la
_reader_la_SOURCES = \
src/python-systemd/_reader.c \
_reader_la_LIBADD = \
$(PYTHON_DEVEL_LIBS) \
- libsystemd-journal.la \
- libsystemd-id128.la \
- libsystemd-daemon-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd.la
login_la_SOURCES = \
src/python-systemd/login.c \
login_la_LIBADD = \
$(PYTHON_DEVEL_LIBS) \
- libsystemd-journal.la \
- libsystemd-login.la \
- libsystemd-daemon-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd.la
dist_pkgpyexec_PYTHON = \
src/python-systemd/journal.py \
src/python-systemd/daemon.py \
src/python-systemd/__init__.py
-src/python-systemd/id128-constants.h: src/systemd/sd-messages.h Makefile
+src/python-systemd/id128-constants.h: src/systemd/sd-messages.h
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)$(SED) -n -r 's/,//g; s/#define (SD_MESSAGE_[A-Z0-9_]+)\s.*/add_id(m, "\1", \1) JOINER/p' <$< >$@
CLEAN_LOCAL_HOOKS += clean-sphinx
+.PHONY: python-shell destdir-sphinx clean-sphinx clean-python
+
clean-sphinx:
-rm -rf docs/html/python-systemd/
-rm -rf src/python-systemd/.libs src/python-systemd/*.l[ao]
-rm -f _daemon.la id128.la _journal.la login.la _reader.la
+# ------------------------------------------------------------------------------
+if ENABLE_COMPAT_LIBS
+EXTRA_DIST += \
+ src/compat-libs/linkwarning.h
+
+libsystemd-%.c: src/compat-libs/libsystemd-%.sym
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_GEN)sed -r -n 's/^ +(sd_.*);/obsolete_lib(\1,$(notdir $(basename $<)));/p' <$< >$@
+
+BUILT_SOURCES += \
+ libsystemd-journal.c \
+ libsystemd-login.c \
+ libsystemd-id128.c \
+ libsystemd-daemon.c
+
+libsystemd_journal_la_SOURCES = \
+ libsystemd-journal.c \
+ src/compat-libs/libsystemd-journal.sym
+
+libsystemd_journal_la_CPPFLAGS = \
+ $(AM_CFLAGS) \
+ -imacros$(top_srcdir)/src/compat-libs/linkwarning.h
+
+libsystemd_journal_la_LDFLAGS = \
+ $(AM_LDFLAGS) \
+ -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
+ -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-journal.sym
+
+libsystemd_journal_la_LIBADD = \
+ libsystemd-journal-internal.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la
+
+libsystemd_login_la_SOURCES = \
+ libsystemd-login.c \
+ src/compat-libs/libsystemd-login.sym
+
+libsystemd_login_la_CPPFLAGS = \
+ $(AM_CFLAGS) \
+ -imacros$(top_srcdir)/src/compat-libs/linkwarning.h
+
+libsystemd_login_la_LDFLAGS = \
+ $(AM_LDFLAGS) \
+ -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
+ -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-login.sym
+
+libsystemd_login_la_LIBADD = \
+ libsystemd-internal.la \
+ libsystemd-shared.la
+
+libsystemd_id128_la_SOURCES = \
+ libsystemd-id128.c \
+ src/compat-libs/libsystemd-id128.sym
+
+libsystemd_id128_la_CPPFLAGS = \
+ $(AM_CFLAGS) \
+ -imacros$(top_srcdir)/src/compat-libs/linkwarning.h
+
+libsystemd_id128_la_LDFLAGS = \
+ $(AM_LDFLAGS) \
+ -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
+ -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-id128.sym
+
+libsystemd_id128_la_LIBADD = \
+ libsystemd-internal.la \
+ libsystemd-shared.la
+
+libsystemd_daemon_la_SOURCES = \
+ libsystemd-daemon.c \
+ src/compat-libs/libsystemd-daemon.sym
+
+libsystemd_daemon_la_CPPFLAGS = \
+ $(AM_CFLAGS) \
+ -imacros$(top_srcdir)/src/compat-libs/linkwarning.h
+
+libsystemd_daemon_la_LDFLAGS = \
+ $(AM_LDFLAGS) \
+ -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
+ -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-daemon.sym
+
+libsystemd_daemon_la_LIBADD = \
+ libsystemd-internal.la \
+ libsystemd-shared.la
+
+lib_LTLIBRARIES += \
+ libsystemd-journal.la \
+ libsystemd-login.la \
+ libsystemd-id128.la \
+ libsystemd-daemon.la
+
+pkgconfiglib_DATA += \
+ src/compat-libs/libsystemd-journal.pc \
+ src/compat-libs/libsystemd-login.pc \
+ src/compat-libs/libsystemd-id128.pc \
+ src/compat-libs/libsystemd-daemon.pc
+
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+compat-lib-install-hook:
+ libname=libsystemd-login.so && $(move-to-rootlibdir)
+ libname=libsystemd-journal.so && $(move-to-rootlibdir)
+ libname=libsystemd-id128.so && $(move-to-rootlibdir)
+ libname=libsystemd-daemon.so && $(move-to-rootlibdir)
+
+compat-lib-uninstall-hook:
+ rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
+ rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
+ rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so*
+ rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
+
+INSTALL_EXEC_HOOKS += compat-lib-install-hook
+UNINSTALL_EXEC_HOOKS += compat-lib-uninstall-hook
+endif
+
+EXTRA_DIST += \
+ src/compat-libs/libsystemd-journal.pc.in \
+ src/compat-libs/libsystemd-login.pc.in \
+ src/compat-libs/libsystemd-id128.pc.in \
+ src/compat-libs/libsystemd-daemon.pc.in
+
# ------------------------------------------------------------------------------
substitutions = \
'|rootlibexecdir=$(rootlibexecdir)|' \
'|udevrulesdir=$(udevrulesdir)|' \
'|catalogdir=$(catalogdir)|' \
'|tmpfilesdir=$(tmpfilesdir)|' \
+ '|sysusersdir=$(sysusersdir)|' \
'|sysctldir=$(sysctldir)|' \
'|systemgeneratordir=$(systemgeneratordir)|' \
'|usergeneratordir=$(usergeneratordir)|' \
+ '|CERTIFICATEROOT=$(CERTIFICATEROOT)|' \
'|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
'|PACKAGE_NAME=$(PACKAGE_NAME)|' \
'|PACKAGE_URL=$(PACKAGE_URL)|' \
+ '|RANDOM_SEED_DIR=$(localstatedir)/lib/systemd/|' \
'|RANDOM_SEED=$(localstatedir)/lib/systemd/random-seed|' \
'|prefix=$(prefix)|' \
'|exec_prefix=$(exec_prefix)|' \
'|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 $@) && \
$(SED) $(subst '|,-e 's|@,$(subst =,\@|,$(subst |',|g',$(substitutions)))) \
< $< > $@
-units/%: units/%.in Makefile
+units/%: units/%.in
+ $(SED_PROCESS)
+
+man/%: man/%.in
+ $(SED_PROCESS)
+
+sysctl.d/%: sysctl.d/%.in
+ $(SED_PROCESS)
+
+%.pc: %.pc.in
$(SED_PROCESS)
-man/%: man/%.in Makefile
+%.conf: %.conf.in
$(SED_PROCESS)
-sysctl.d/%: sysctl.d/%.in Makefile
+src/core/macros.%: src/core/macros.%.in
$(SED_PROCESS)
-%.pc: %.pc.in Makefile
+src/%.policy.in: src/%.policy.in.in
$(SED_PROCESS)
-src/core/macros.%: src/core/macros.%.in Makefile
+shell-completion/%: shell-completion/%.in
$(SED_PROCESS)
-src/%.policy.in: src/%.policy.in.in Makefile
+%.rules: %.rules.in
$(SED_PROCESS)
-%.rules: %.rules.in Makefile
+%.conf: %.conf.in
$(SED_PROCESS)
-%.sh: %.sh.in Makefile
+%.sh: %.sh.in
$(SED_PROCESS)
$(AM_V_GEN)chmod +x $@
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
-units/%: units/%.m4 Makefile
- $(AM_V_M4)$(MKDIR_P) $(dir $@)
+units/%: units/%.m4
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
-units/user/%: units/%.m4 Makefile
- $(AM_V_M4)$(MKDIR_P) $(dir $@)
+units/user/%: units/%.m4
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
if ENABLE_POLKIT
# ------------------------------------------------------------------------------
if ENABLE_MANPAGES
-man/custom-entities.ent: Makefile
+man/custom-entities.ent: configure.ac
$(AM_V_GEN)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)(echo '<?xml version="1.0" encoding="utf-8" ?>' && \
- echo '$(subst '|,<!ENTITY ,$(subst =, ",$(subst |',">,$(substitutions))))') \
+ printf '$(subst '|,<!ENTITY ,$(subst =, ",$(subst |',">\n,$(substitutions))))') \
> $@ # '
DISTCLEANFILES += \
XSLTPROC_FLAGS = \
--nonet \
+ --xinclude \
--stringparam man.output.quietly 1 \
--stringparam funcsynopsis.style ansi \
--stringparam man.authors.section.enabled 0 \
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 \
USER_UNIT_ALIASES += \
$(systemunitdir)/shutdown.target shutdown.target \
$(systemunitdir)/sockets.target sockets.target \
+ $(systemunitdir)/busnames.target busnames.target \
$(systemunitdir)/timers.target timers.target \
$(systemunitdir)/paths.target paths.target \
$(systemunitdir)/bluetooth.target bluetooth.target \
$(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 += \
--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
--with-pamconfdir=$$dc_install_base/$(pamconfdir) \
--with-rootprefix=$$dc_install_base \
- --disable-split-usr
+ --disable-split-usr \
+ --enable-kdbus \
+ --enable-compat-libs
if HAVE_SYSV_COMPAT
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-bus/ && \
+ ( cd $(top_srcdir)/src/libsystemd/sd-bus/ && \
wget -N https://d-bus.googlecode.com/git/kdbus.h )
-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
rsync -rlv --delete docs/libudev/html/ --omit-dir-times $(www_target)/libudev/
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/
-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
rm -rf $(abs_srcdir)/install-tree
$(MAKE) install DESTDIR=$(abs_srcdir)/install-tree
# Let's run all tests of the test suite, but under valgrind. Let's
# exclude the one perl script we have in there
+.PHONY: valgrind-tests
valgrind-tests: $(TESTS)
$(AM_V_GEN)for f in $(filter-out %.pl, $^); do \
- echo "Running $$f"; \
- libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=4194400 --error-exitcode=55 $(builddir)/$$f ; \
+ 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; \
+ x="\n\n"; \
done
-exported: $(lib_LTLIBRARIES)
- $(AM_V_GEN)for f in $(lib_LTLIBRARIES:.la=.so) ; do \
- nm -g --defined-only $(builddir)/.libs/"$$f" 2>&1 /dev/null | grep " T " | cut -d" " -f3 ; \
- done > $@
+exported-%: %
+ $(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 $^ > $@
+
+.PHONY: check-api-docs
check-api-docs: exported man
$(AM_V_GEN)for symbol in `cat exported` ; do \
if test -f $(builddir)/man/$$symbol.html ; then \
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 += \
defined \
undefined
+.PHONY: check-api-unused
check-api-unused: defined undefined exported
( cat exported undefined ) | sort -u | diff -u - defined | grep ^+ | grep -v ^+++ | cut -c2-
-# Stupid test that everything purported to be exported really is
+.PHONY: check-includes
+check-includes: $(top_srcdir)/tools/check-includes.pl
+ $(AM_V_GEN) find * -name '*.[hcS]' -type f -print | sort -u \
+ | xargs $(top_srcdir)/tools/check-includes.pl
+EXTRA_DIST += \
+ $(top_srcdir)/tools/check-includes.pl
+
+# Stupid test that everything purported to be exported really is
define generate-sym-test
$(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_at)echo '#include <stdio.h>' > $@
- $(AM_V_at)for file in $(notdir $(filter %.h, $^)); do \
- echo "#include \"$$file\""; \
- done >> $@
- $(AM_V_at)echo 'void* functions[] = {' >> $@
- $(AM_V_GEN)sed -r -n 's/^( +[a-zA-Z0-9_]+);/\1,/p' $< >> $@
- $(AM_V_at)echo '};' >> $@
- $(AM_V_at)echo 'int main(void) {' >> $@
- $(AM_V_at)echo ' unsigned i; for (i=0;i<sizeof(functions)/sizeof(void*);i++) printf("%p\n", functions[i]);' >> $@
- $(AM_V_at)echo 'return 0; }' >> $@
+ $(AM_V_at)printf '#include <stdio.h>\n' > $@
+ $(AM_V_at)printf '#include "%s"\n' $(notdir $(filter %.h, $^)) >> $@
+ $(AM_V_at)printf 'void* functions[] = {\n' >> $@
+ $(AM_V_GEN)sed -r -n 's/^ +([a-zA-Z0-9_]+);/\1,/p' $< >> $@
+ $(AM_V_at)printf '};\nint main(void) {\n' >> $@
+ $(AM_V_at)printf 'unsigned i; for (i=0;i<sizeof(functions)/sizeof(void*);i++) printf("%%p\\n", functions[i]);\n' >> $@
+ $(AM_V_at)printf 'return 0; }\n' >> $@
endef
-test-libsystemd-bus-sym.c: \
- src/libsystemd-bus/libsystemd-bus.sym \
- src/systemd/sd-bus.h \
- src/systemd/sd-utf8.h \
- Makefile
- $(generate-sym-test)
-
-test-libsystemd-daemon-sym.c: \
- src/libsystemd-daemon/libsystemd-daemon.sym \
- src/systemd/sd-daemon.h \
- Makefile
- $(generate-sym-test)
-
-test-libsystemd-id128-sym.c: \
- src/libsystemd-id128/libsystemd-id128.sym \
- src/systemd/sd-id128.h \
- Makefile
- $(generate-sym-test)
-
-test-libsystemd-journal-sym.c: \
- src/journal/libsystemd-journal.sym \
- src/systemd/sd-journal.h \
- Makefile
- $(generate-sym-test)
-
-test-libsystemd-login-sym.c: \
- src/login/libsystemd-login.sym \
- src/systemd/sd-login.h \
- Makefile
+test-libsystemd-sym.c: \
+ $(top_builddir)/src/libsystemd/libsystemd.sym \
+ src/systemd/sd-journal.h \
+ src/systemd/sd-daemon.h \
+ src/systemd/sd-login.h \
+ src/systemd/sd-bus.h \
+ src/systemd/sd-utf8.h \
+ src/systemd/sd-resolve.h \
+ src/systemd/sd-path.h
$(generate-sym-test)
test-libudev-sym.c: \
- src/libudev/libudev.sym \
- src/udev/udev.h \
- Makefile
+ src/libudev/libudev.sym \
+ src/udev/udev.h
$(generate-sym-test)
-test_libsystemd_bus_sym_SOURCES = \
- test-libsystemd-bus-sym.c
-test_libsystemd_bus_sym_LDADD = \
- libsystemd-bus.la
-
-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
+test_libsystemd_sym_SOURCES = \
+ test-libsystemd-sym.c
+test_libsystemd_sym_LDADD = \
+ libsystemd.la
test_libudev_sym_SOURCES = \
test-libudev-sym.c
+test_libudev_sym_CFLAGS = \
+ $(AM_CFLAGS) \
+ -Wno-deprecated-declarations
test_libudev_sym_LDADD = \
libudev.la
BUILT_SOURCES += \
- $(test_libsystemd_bus_sym_SOURCES) \
- $(test_libsystemd_daemon_sym_SOURCES) \
- $(test_libsystemd_id128_sym_SOURCES) \
- $(test_libsystemd_journal_sym_SOURCES) \
- $(test_libsystemd_login_sym_SOURCES) \
+ $(test_libsystemd_sym_SOURCES) \
$(test_libudev_sym_SOURCES)
tests += \
- test-libsystemd-bus-sym \
- test-libsystemd-daemon-sym \
- test-libsystemd-id128-sym \
- test-libsystemd-journal-sym \
- test-libsystemd-login-sym \
+ test-libsystemd-sym \
test-libudev-sym
+
+.PHONY: cppcheck
+cppcheck:
+ cppcheck --enable=all -q $(top_srcdir)
+
+# Used to extract compile flags for YCM.
+print-%:
+ @echo $($*)
+
+git-contrib:
+ @git shortlog -s `git describe --abbrev=0`.. | cut -c8- | awk '{ print $$0 "," }' | sort -u