.PRECIOUS: $(TEST_SUITE_LOG) Makefile
LIBUDEV_CURRENT=5
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=1
LIBUDEV_AGE=4
LIBGUDEV_CURRENT=2
LIBGUDEV_REVISION=0
LIBGUDEV_AGE=2
+LIBSYSTEMD_CURRENT=3
+LIBSYSTEMD_REVISION=0
+LIBSYSTEMD_AGE=3
+
+# The following four libraries only exist for compatibility reasons,
+# their version info should not be bumped anymore
LIBSYSTEMD_LOGIN_CURRENT=9
LIBSYSTEMD_LOGIN_REVISION=3
LIBSYSTEMD_LOGIN_AGE=9
LIBSYSTEMD_JOURNAL_REVISION=5
LIBSYSTEMD_JOURNAL_AGE=11
-LIBSYSTEMD_CURRENT=0
-LIBSYSTEMD_REVISION=1
-LIBSYSTEMD_AGE=0
-
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
dbussessionservicedir=@dbussessionservicedir@
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=$(rootprefix)/lib/systemd/network
pkgincludedir=$(includedir)/systemd
udevhwdbdir=$(udevlibexecdir)/hwdb.d
catalogdir=$(prefix)/lib/systemd/catalog
kernelinstalldir = $(prefix)/lib/kernel/install.d
+ntpunitsdir=$(prefix)/lib/systemd/ntp-units.d
# And these are the special ones for /
rootprefix=@rootprefix@
polkitpolicy_files =
dist_udevrules_DATA =
nodist_udevrules_DATA =
+nodist_pkgsysconf_DATA =
dist_pkgsysconf_DATA =
dist_pkgdata_DATA =
dist_dbuspolicy_DATA =
-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 \
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) --relative -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
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-sysctl \
systemd-sleep \
systemd-bus-proxyd \
- systemd-socket-proxyd
+ systemd-socket-proxyd \
+ systemd-update-done
systemgenerator_PROGRAMS = \
systemd-getty-generator \
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 \
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/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/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/halt-local.service
systemgenerator_PROGRAMS += \
+ systemd-sysv-generator \
systemd-rc-local-generator
endif
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/ima-util.h \
src/shared/ptyfwd.c \
src/shared/ptyfwd.h \
- src/shared/net-util.c \
- src/shared/net-util.h \
src/shared/errno-list.c \
src/shared/errno-list.h \
src/shared/af-list.c \
src/shared/condition-util.c \
src/shared/condition-util.h \
src/shared/bus-label.c \
- src/shared/bus-label.h
+ src/shared/bus-label.h \
+ src/shared/gpt.h \
+ src/shared/generator.h \
+ src/shared/generator.c \
+ src/shared/clean-ipc.h \
+ src/shared/clean-ipc.c \
+ src/shared/login-shared.c \
+ src/shared/login-shared.h \
+ src/shared/ring.c \
+ src/shared/ring.h \
+ src/shared/async.c \
+ src/shared/async.h \
+ src/shared/eventfd-util.c \
+ src/shared/eventfd-util.h \
+ src/shared/copy.c \
+ src/shared/copy.h
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
src/core/condition.h \
src/core/namespace.c \
src/core/namespace.h \
- src/core/tcpwrap.c \
- src/core/tcpwrap.h \
src/core/build.h \
src/core/sysfs-show.h \
src/core/switch-root.h \
src/core/killall.c \
src/core/audit-fd.c \
src/core/audit-fd.h \
- src/core/async.c \
- src/core/async.h \
src/core/show-status.c \
src/core/show-status.h
libsystemd_core_la_CFLAGS = \
$(AM_CFLAGS) \
- $(LIBWRAP_CFLAGS) \
$(PAM_CFLAGS) \
$(AUDIT_CFLAGS) \
$(CAP_CFLAGS) \
libudev-internal.la \
libsystemd-shared.la \
libsystemd-internal.la \
- $(LIBWRAP_LIBS) \
$(PAM_LIBS) \
$(AUDIT_LIBS) \
$(CAP_LIBS) \
src/shared/errno-list.txt:
$(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - < /dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+[0-9]/ { print $$2; }' > $@
+ $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - < /dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' > $@
src/shared/errno-from-name.gperf: src/shared/errno-list.txt
$(AM_V_at)$(MKDIR_P) $(dir $@)
src/shared/errno-to-name.h: src/shared/errno-list.txt
$(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
+ $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
src/shared/af-list.txt:
$(AM_V_at)$(MKDIR_P) $(dir $@)
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-tmpfiles \
test-namespace \
test-date \
test-calendarspec \
test-strip-tab-ansi \
test-cgroup-util \
- test-cgroup-mask \
test-prioq \
test-fileio \
test-time \
test_util_LDADD = \
libsystemd-core.la
+test_ring_SOURCES = \
+ src/test/test-ring.c
+
+test_ring_LDADD = \
+ libsystemd-core.la
+
test_tmpfiles_SOURCES = \
src/test/test-tmpfiles.c
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
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
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
tmpfiles.d/systemd.conf \
tmpfiles.d/systemd-nologin.conf \
tmpfiles.d/tmp.conf \
- tmpfiles.d/x11.conf
+ tmpfiles.d/x11.conf \
+ tmpfiles.d/var.conf
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
+
+rootlibexec_PROGRAMS += \
+ systemd-sysusers
+
+nodist_systemunit_DATA += \
+ units/systemd-sysusers.service
+
+SYSINIT_TARGET_WANTS += \
+ systemd-sysusers.service
+
+nodist_sysusers_DATA = \
+ sysusers.d/systemd.conf
+
+EXTRA_DIST += \
+ units/systemd-sysusers.service.in \
+ sysusers.d/systemd.conf.in
+
+INSTALL_DIRS += \
+ $(sysusersdir)
+endif
+
# ------------------------------------------------------------------------------
systemd_machine_id_setup_SOURCES = \
src/machine-id-setup/machine-id-setup-main.c \
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
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 \
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:
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
src/cgls/cgls.c
systemd_cgls_LDADD = \
+ libsystemd-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_nspawn_CFLAGS = \
$(AM_CFLAGS) \
- $(SECCOMP_CFLAGS)
+ $(SECCOMP_CFLAGS) \
+ $(BLKID_CFLAGS)
systemd_nspawn_LDADD = \
libsystemd-label.la \
libsystemd-capability.la \
libsystemd-internal.la \
libudev-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ $(BLKID_LIBS)
if HAVE_SECCOMP
systemd_nspawn_LDADD += \
# ------------------------------------------------------------------------------
systemd_bus_proxyd_SOURCES = \
- src/bus-proxyd/bus-proxyd.c
+ src/bus-proxyd/bus-proxyd.c \
+ src/bus-proxyd/bus-policy.c \
+ src/bus-proxyd/bus-policy.h
systemd_bus_proxyd_LDADD = \
+ libsystemd-capability.la \
libsystemd-internal.la \
libsystemd-shared.la
bus-proxyd-install-hook:
$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir)
+ $(AM_V_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:
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-rtnl/sd-rtnl.c \
src/libsystemd/sd-rtnl/rtnl-internal.h \
src/libsystemd/sd-rtnl/rtnl-message.c \
+ src/libsystemd/sd-rtnl/rtnl-types.h \
+ src/libsystemd/sd-rtnl/rtnl-types.c \
src/libsystemd/sd-rtnl/rtnl-util.h \
src/libsystemd/sd-rtnl/rtnl-util.c \
- src/libsystemd/sd-resolve/sd-resolve.c \
- src/libsystemd/sd-resolve/resolve-util.h \
src/libsystemd/sd-id128/sd-id128.c \
src/libsystemd/sd-daemon/sd-daemon.c \
- src/login/sd-login.c \
- src/login/login-shared.c \
- src/login/login-shared.h
+ src/libsystemd/sd-login/sd-login.c
nodist_libsystemd_internal_la_SOURCES = \
src/libsystemd/libsystemd.sym \
libsystemd_internal_la_LIBADD = \
$(RT_LIBS)
+libsystemd_resolve_la_SOURCES = \
+ src/libsystemd/sd-resolve/sd-resolve.c \
+ src/libsystemd/sd-resolve/resolve-util.h
+
+libsystemd_resolve_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ -pthread
+
+libsystemd_resolve_la_LIBADD = \
+ -lresolv
+
noinst_LTLIBRARIES += \
- libsystemd-internal.la
+ libsystemd-internal.la \
+ libsystemd-resolve.la
libsystemd_dump_la_SOURCES = \
src/libsystemd/sd-bus/bus-dump.c \
libsystemd_la_SOURCES = \
$(libsystemd_internal_la_SOURCES) \
+ $(libsystemd_resolve_la_SOURCES) \
$(libsystemd_journal_internal_la_SOURCES)
nodist_libsystemd_la_SOURCES = \
libsystemd_la_CFLAGS = \
$(libsystemd_internal_la_CFLAGS) \
+ $(libsystemd_resolve_la_CFLAGS) \
$(libsystemd_journal_internal_la_CFLAGS)
libsystemd_la_LDFLAGS = \
libsystemd_la_LIBADD = \
libsystemd-shared.la \
+ $(libsystemd_internal_la_LIBADD) \
$(libsystemd_journal_internal_la_LIBADD) \
- $(RT_LIBS) \
- -lresolv
+ $(libsystemd_resolve_la_LIBADD)
libsystemd-install-hook:
libname=libsystemd.so && $(move-to-rootlibdir)
libsystemd-shared.la
test_resolve_SOURCES = \
- src/systemd/sd-resolve.h \
src/libsystemd/sd-resolve/test-resolve.c
test_resolve_LDADD = \
+ libsystemd-resolve.la \
libsystemd-internal.la \
- libsystemd-shared.la \
- -lresolv
+ libsystemd-shared.la
test_resolve_CFLAGS = \
$(AM_CFLAGS) \
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-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/dhcp-internal.h \
src/libsystemd-network/dhcp-protocol.h \
src/libsystemd-network/dhcp-lease-internal.h \
- src/libsystemd-network/sd-dhcp-lease.c
+ src/libsystemd-network/sd-dhcp-lease.c \
+ src/libsystemd-network/sd-ipv4ll.c \
+ src/libsystemd-network/ipv4ll-network.c \
+ src/libsystemd-network/ipv4ll-packet.c \
+ src/libsystemd-network/ipv4ll-internal.h \
+ src/libsystemd-network/network-internal.c \
+ src/libsystemd-network/network-internal.h
libsystemd_network_la_LIBADD = \
+ libudev-internal.la \
+ libsystemd-label.la \
libsystemd-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ $(KMOD_LIBS)
test_dhcp_option_SOURCES = \
src/libsystemd-network/dhcp-protocol.h \
test_dhcp_client_LDADD = \
libsystemd-network.la \
+ libsystemd-label.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
tests += \
test-dhcp-option \
- test-dhcp-client
+ test-dhcp-client \
+ test-ipv4ll
# ------------------------------------------------------------------------------
if ENABLE_GTK_DOC
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) \
dist_network_DATA = \
network/99-default.link \
- network/80-container-host0.network
+ network/80-container-host0.network \
+ network/80-container-ve.network
dist_udevrules_DATA += \
- rules/99-systemd.rules \
rules/42-usb-hid-pm.rules \
rules/50-udev-default.rules \
rules/60-drm.rules \
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 \
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
libudev-internal.la \
libsystemd-label.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
systemd_cat_LDADD = \
libsystemd-journal-core.la
+if HAVE_MICROHTTPD
+rootlibexec_PROGRAMS += \
+ systemd-journal-remote
+
+systemd_journal_remote_SOURCES = \
+ src/journal/journal-remote-parse.h \
+ src/journal/journal-remote-parse.c \
+ src/journal/journal-remote-write.h \
+ src/journal/journal-remote-write.c \
+ src/journal/journal-remote.c
+
+systemd_journal_remote_LDADD = \
+ libsystemd-internal.la \
+ libsystemd-journal-core.la
+
+systemd_journal_remote_SOURCES += \
+ src/journal/microhttpd-util.h \
+ src/journal/microhttpd-util.c
+
+systemd_journal_remote_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(MICROHTTPD_CFLAGS)
+
+systemd_journal_remote_LDADD += \
+ $(MICROHTTPD_LIBS)
+
+if HAVE_GNUTLS
+systemd_journal_remote_LDADD += \
+ $(GNUTLS_LIBS)
+endif
+endif
+
# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
journalctl_CFLAGS = \
$(AM_CFLAGS)
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 \
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
catalog/systemd.catalog
SOCKETS_TARGET_WANTS += \
- systemd-journald.socket
+ systemd-journald.socket \
+ systemd-journald-dev-log.socket
+
SYSINIT_TARGET_WANTS += \
systemd-journald.service \
- systemd-journal-flush.service
+ systemd-journal-flush.service \
+ systemd-journal-catalog-update.service
EXTRA_DIST += \
units/systemd-journald.service.in \
units/systemd-journal-flush.service.in \
+ units/systemd-journal-catalog-update.service.in \
src/journal/journald-gperf.gperf
CLEANFILES += \
libsystemd-shared.la \
$(MICROHTTPD_LIBS)
+if HAVE_GNUTLS
+systemd_journal_gatewayd_LDADD += \
+ $(GNUTLS_LIBS)
+endif
+
systemd_journal_gatewayd_CFLAGS = \
$(AM_CFLAGS) \
$(MICROHTTPD_CFLAGS)
libsystemd-logs.la \
libsystemd-internal.la \
libsystemd-journal-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-resolve.la
# ------------------------------------------------------------------------------
if ENABLE_COREDUMP
systemd_coredump_LDADD = \
libsystemd-journal-internal.la \
libsystemd-label.la \
- libsystemd-shared.la \
- libsystemd-internal.la
+ libsystemd-internal.la \
+ libsystemd-shared.la
rootlibexec_PROGRAMS += \
systemd-coredump
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 += \
# ------------------------------------------------------------------------------
if ENABLE_KDBUS
-systemd_bus_driverd_SOURCES = \
- src/bus-driverd/bus-driverd.c
-
-systemd_bus_driverd_LDADD = \
- libsystemd-internal.la \
- libsystemd-shared.la
-
-rootlibexec_PROGRAMS += \
- systemd-bus-driverd
-
-nodist_systemunit_DATA += \
- units/systemd-bus-driverd.service
-
dist_systemunit_DATA += \
- units/org.freedesktop.DBus.busname
+ units/org.freedesktop.systemd1.busname
BUSNAMES_TARGET_WANTS += \
- org.freedesktop.DBus.busname
-
-nodist_userunit_DATA += \
- units/user/systemd-bus-driverd.service
-
-USER_BUSNAMES_TARGET_WANTS += \
- org.freedesktop.DBus.busname
-
-USER_UNIT_ALIASES += \
- $(systemunitdir)/org.freedesktop.DBus.busname org.freedesktop.DBus.busname
+ org.freedesktop.systemd1.busname
endif
-EXTRA_DIST += \
- units/systemd-bus-driverd.service.in \
- units/user/systemd-bus-driverd.service.in
-
# ------------------------------------------------------------------------------
if ENABLE_LOCALED
systemd_localed_SOURCES = \
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
+
+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
+
+dist_ntpunits_DATA = \
+ src/timesync/90-systemd.list
+
+endif
+
# ------------------------------------------------------------------------------
if HAVE_MYHOSTNAME
libnss_myhostname_la_SOURCES = \
-shared \
-shrext .so.2
+libnss_myhostname_la_LIBADD = \
+ libsystemd-shared.la \
+ libsystemd-internal.la
+
lib_LTLIBRARIES += \
libnss_myhostname.la
endif
src/machine/org.freedesktop.machine1.conf
dist_zshcompletion_DATA += \
- shell-completion/zsh/_machinectl
+ shell-completion/zsh/_machinectl \
+ shell-completion/zsh/_sd_machines
SYSTEM_UNIT_ALIASES += \
systemd-machined.service dbus-org.freedesktop.machine1.service
endif
+# ------------------------------------------------------------------------------
+if ENABLE_RESOLVED
+systemd_resolved_SOURCES = \
+ src/resolve/resolved.h \
+ src/resolve/resolved.c \
+ src/resolve/resolved-manager.c
+
+systemd_resolved_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(KMOD_CFLAGS)
+
+nodist_systemd_resolved_SOURCES = \
+ src/resolve/resolved-gperf.c
+
+EXTRA_DIST += \
+ src/resolve/resolved-gperf.gperf
+
+CLEANFILES += \
+ src/resolve/resolved-gperf.c
+
+systemd_resolved_LDADD = \
+ libsystemd-capability.la \
+ libsystemd-network.la \
+ libsystemd-label.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la
+
+rootlibexec_PROGRAMS += \
+ systemd-resolved
+
+nodist_systemunit_DATA += \
+ units/systemd-resolved.service
+
+EXTRA_DIST += \
+ units/systemd-resolved.service.in
+
+GENERAL_ALIASES += \
+ $(systemunitdir)/systemd-resolved.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-resolved.service
+
+nodist_pkgsysconf_DATA += \
+ src/resolve/resolved.conf
+
+EXTRA_DIST += \
+ src/resolve/resolved.conf.in
+
+CLEANFILES += \
+ src/resolve/resolved.conf
+
+endif
+
# ------------------------------------------------------------------------------
if ENABLE_NETWORKD
rootlibexec_PROGRAMS += \
src/network/networkd.c
systemd_networkd_LDADD = \
- libsystemd-networkd-core.la
+ libsystemd-networkd-core.la \
+ libsystemd-capability.la
noinst_LTLIBRARIES += \
libsystemd-networkd-core.la
+libsystemd_networkd_core_la_CFLAGS = \
+ $(AM_CFLAGS)
+
libsystemd_networkd_core_la_SOURCES = \
+ src/libsystemd-network/network-internal.h \
src/network/networkd.h \
src/network/networkd-link.c \
src/network/networkd-netdev.c \
+ src/network/networkd-tunnel.c \
+ src/network/networkd-veth.c \
src/network/networkd-network.c \
src/network/networkd-address.c \
src/network/networkd-route.c \
libsystemd-label.la \
libsystemd-shared.la
-nodist_systemunit_DATA += \
- units/systemd-networkd.service
-
-GENERAL_ALIASES += \
- $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service
-
rootlibexec_PROGRAMS += \
systemd-networkd-wait-online
+systemd_networkd_wait_online_CFLAGS = \
+ $(AM_CFLAGS)
+
systemd_networkd_wait_online_SOURCES = \
- src/network/networkd-wait-online.c
+ src/libsystemd-network/network-internal.h \
+ src/network/networkd-wait-online.c \
+ src/network/networkd-wait-online.h
systemd_networkd_wait_online_LDADD = \
+ libsystemd-network.la \
+ libudev-internal.la \
libsystemd-internal.la \
- libsystemd-network.la
+ libsystemd-shared.la
test_network_SOURCES = \
src/network/test-network.c
+test_network_CFLAGS = \
+ $(AM_CFLAGS)
+
test_network_LDADD = \
libsystemd-networkd-core.la
tests += \
test-network
+nodist_systemunit_DATA += \
+ units/systemd-networkd.service \
+ units/systemd-networkd-wait-online.service
+
+GENERAL_ALIASES += \
+ $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \
+ $(systemunitdir)/systemd-networkd-wait-online.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service
+
EXTRA_DIST += \
src/network/networkd-network-gperf.gperf \
src/network/networkd-netdev-gperf.gperf \
- units/systemd-networkd.service.in
+ units/systemd-networkd.service.in \
+ units/systemd-networkd-wait-online.service.in
CLEANFILES += \
src/network/networkd-network-gperf.c \
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 \
systemd-inhibit
test_login_SOURCES = \
- src/login/test-login.c
+ src/libsystemd/sd-login/test-login.c
test_login_LDADD = \
libsystemd-internal.la \
'|udevrulesdir=$(udevrulesdir)|' \
'|catalogdir=$(catalogdir)|' \
'|tmpfilesdir=$(tmpfilesdir)|' \
+ '|sysusersdir=$(sysusersdir)|' \
'|sysctldir=$(sysctldir)|' \
'|systemgeneratordir=$(systemgeneratordir)|' \
'|usergeneratordir=$(usergeneratordir)|' \
'|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)|'
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
%.rules: %.rules.in
$(SED_PROCESS)
+%.conf: %.conf.in
+ $(SED_PROCESS)
+
%.sh: %.sh.in
$(SED_PROCESS)
$(AM_V_GEN)chmod +x $@
# ------------------------------------------------------------------------------
if ENABLE_MANPAGES
-man/custom-entities.ent:
+man/custom-entities.ent: configure.ac
$(AM_V_GEN)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)(echo '<?xml version="1.0" encoding="utf-8" ?>' && \
printf '$(subst '|,<!ENTITY ,$(subst =, ",$(subst |',">\n,$(substitutions))))') \
RUNLEVEL5_TARGET_WANTS += \
systemd-update-utmp-runlevel.service
endif
+
SYSINIT_TARGET_WANTS += \
- systemd-update-utmp.service
+ systemd-update-utmp.service \
+ systemd-update-done.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 \
--enable-gtk-doc
endif
+# check "broken" platforms limited toolchains for link breakage before we release
+.PHONY: linkcheck
+linkcheck:
+ $(MAKE) CFLAGS='-fno-lto' LDFLAGS='-Wl,-fuse-ld=gold -Wl,--as-needed -Wl,--no-gc-sections' distcheck
+
.PHONY: hwdb-update
hwdb-update:
( cd $(top_srcdir)/hwdb && \
wget -N http://www.linux-usb.org/usb.ids \
- http://pci-ids.ucw.cz/v2.2/pci.ids \
- http://standards.ieee.org/develop/regauth/oui/oui.txt \
- http://standards.ieee.org/develop/regauth/iab/iab.txt && \
+ http://pci-ids.ucw.cz/v2.2/pci.ids \
+ http://standards.ieee.org/develop/regauth/oui/oui.txt \
+ http://standards.ieee.org/develop/regauth/iab/iab.txt && \
./ids-update.pl )
.PHONY: kdbus-update
kdbus-update:
- ( cd $(top_srcdir)/src/libsystemd/ && \
+ ( cd $(top_srcdir)/src/libsystemd/sd-bus/ && \
wget -N https://d-bus.googlecode.com/git/kdbus.h )
-.PHONY: upload
-upload: all distcheck
- cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
- scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
- scp man/*.html tango:public/systemd-man/
+.PHONY: git-tag
+git-tag:
+ git tag -s "v$(VERSION)" -m "systemd $(VERSION)"
www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
+.PHONY: upload
+upload: all check dist
+ scp systemd-$(VERSION).tar.xz $(www_target)
+
.PHONY: doc-sync
doc-sync: all destdir-sphinx
gtkdoc-rebase --html-dir=docs/libudev/html --online
rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
rsync -rlv --delete --omit-dir-times docs/html/python-systemd/ $(www_target)/python-systemd/
-.PHONY: git-tag
-git-tag:
- git tag "v$(VERSION)" -m "systemd $(VERSION)"
+.PHONY: tango
+tango: upload
+ cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
+ scp man/*.html tango:public/systemd-man/
.PHONY: install-tree
install-tree: all
if file $$f | grep -q shell; then \
echo -e "$${x}Skipping non-binary $$f"; else \
echo -e "$${x}Running $$f"; \
- libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
+ libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
x="\n\n"; \
done
src/systemd/sd-daemon.h \
src/systemd/sd-login.h \
src/systemd/sd-bus.h \
- src/systemd/sd-utf8.h
+ src/systemd/sd-utf8.h \
+ src/systemd/sd-resolve.h
$(generate-sym-test)
test-libudev-sym.c: \
test_libudev_sym_SOURCES = \
test-libudev-sym.c
+test_libudev_sym_CFLAGS = \
+ $(AM_CFLAGS) \
+ -Wno-deprecated-declarations
test_libudev_sym_LDADD = \
libudev.la
test-libsystemd-sym \
test-libudev-sym
-if ENABLE_COMPAT_LIBS
-test-libsystemd-daemon-sym.c: \
- src/compat-libs/libsystemd-daemon.sym \
- src/systemd/sd-daemon.h
- $(generate-sym-test)
-
-test-libsystemd-id128-sym.c: \
- src/compat-libs/libsystemd-id128.sym \
- src/systemd/sd-id128.h
- $(generate-sym-test)
-
-test-libsystemd-journal-sym.c: \
- src/compat-libs/libsystemd-journal.sym \
- src/systemd/sd-journal.h
- $(generate-sym-test)
-
-test-libsystemd-login-sym.c: \
- src/compat-libs/libsystemd-login.sym \
- src/systemd/sd-login.h
- $(generate-sym-test)
-
-test_libsystemd_daemon_sym_SOURCES = \
- test-libsystemd-daemon-sym.c
-test_libsystemd_daemon_sym_LDADD = \
- libsystemd-daemon.la
-
-test_libsystemd_id128_sym_SOURCES = \
- test-libsystemd-id128-sym.c
-test_libsystemd_id128_sym_LDADD = \
- libsystemd-id128.la
-
-test_libsystemd_journal_sym_SOURCES = \
- test-libsystemd-journal-sym.c
-test_libsystemd_journal_sym_LDADD = \
- libsystemd-journal.la
-
-test_libsystemd_login_sym_SOURCES = \
- test-libsystemd-login-sym.c
-test_libsystemd_login_sym_LDADD = \
- libsystemd-login.la
-
-BUILT_SOURCES += \
- $(test_libsystemd_journal_sym_SOURCES) \
- $(test_libsystemd_login_sym_SOURCES) \
- $(test_libsystemd_id128_sym_SOURCES) \
- $(test_libsystemd_daemon_sym_SOURCES)
-
-tests += \
- test-libsystemd-journal-sym \
- test-libsystemd-login-sym \
- test-libsystemd-id128-sym \
- test-libsystemd-daemon-sym
-endif
-
.PHONY: cppcheck
cppcheck:
cppcheck --enable=all -q $(top_srcdir)
~ianmdlvl / elogind.git / blobdiff