LIBUDEV_REVISION=0
LIBUDEV_AGE=4
-LIBGUDEV_CURRENT=1
-LIBGUDEV_REVISION=3
-LIBGUDEV_AGE=1
+LIBGUDEV_CURRENT=2
+LIBGUDEV_REVISION=0
+LIBGUDEV_AGE=2
LIBSYSTEMD_LOGIN_CURRENT=9
-LIBSYSTEMD_LOGIN_REVISION=2
+LIBSYSTEMD_LOGIN_REVISION=3
LIBSYSTEMD_LOGIN_AGE=9
LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=11
+LIBSYSTEMD_DAEMON_REVISION=12
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=27
+LIBSYSTEMD_ID128_REVISION=28
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_JOURNAL_CURRENT=11
-LIBSYSTEMD_JOURNAL_REVISION=4
+LIBSYSTEMD_JOURNAL_REVISION=5
LIBSYSTEMD_JOURNAL_AGE=11
-LIBSYSTEMD_CURRENT=0
+LIBSYSTEMD_CURRENT=1
LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=0
+LIBSYSTEMD_AGE=1
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
userpresetdir=$(prefix)/lib/systemd/user-preset
tmpfilesdir=$(prefix)/lib/tmpfiles.d
sysctldir=$(prefix)/lib/sysctl.d
-networkdir=$(prefix)/lib/systemd/network
+networkdir=$(rootprefix)/lib/systemd/network
pkgincludedir=$(includedir)/systemd
systemgeneratordir=$(rootlibexecdir)/system-generators
usergeneratordir=$(prefix)/lib/systemd/user-generators
-I $(top_srcdir)/src/network \
-I $(top_srcdir)/src/login \
-I $(top_srcdir)/src/journal \
+ -I $(top_srcdir)/src/timedate \
-I $(top_srcdir)/src/systemd \
-I $(top_builddir)/src/core \
-I $(top_srcdir)/src/core \
-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 \
$(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
SYSTEM_UNIT_ALIASES =
USER_UNIT_ALIASES =
-
GENERAL_ALIASES =
install-target-wants-hook:
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_EXEC_HOOKS += \
install-target-wants-hook \
install-directories-hook \
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 \
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
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 \
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@
tools/make-man-index.py \
tools/make-directive-index.py \
tools/make-man-rules.py \
- tools/xml_helper.py \
- man/less-variables.xml
+ tools/xml_helper.py
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
src/shared/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/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/af-list.h \
src/shared/audit.c \
src/shared/audit.h \
src/shared/xml.c \
- src/shared/xml.h
+ 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/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
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
- src/shared/errno-to-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) \
+ $(SECCOMP_CFLAGS)
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
# ------------------------------------------------------------------------------
if HAVE_SECCOMP
-
noinst_LTLIBRARIES += \
libsystemd-seccomp.la
libsystemd_seccomp_la_LIBADD = \
$(SECCOMP_LIBS)
-
endif
# ------------------------------------------------------------------------------
src/core/dbus-kill.h \
src/core/dbus-cgroup.c \
src/core/dbus-cgroup.h \
- src/core/dbus-client-track.c \
- src/core/dbus-client-track.h \
src/core/cgroup.c \
src/core/cgroup.h \
src/core/selinux-access.c \
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/audit-fd.c \
src/core/audit-fd.h \
src/core/async.c \
- src/core/async.h
+ src/core/async.h \
+ src/core/show-status.c \
+ src/core/show-status.h
if HAVE_KMOD
libsystemd_core_la_SOURCES += \
libsystemd_core_la_CFLAGS = \
$(AM_CFLAGS) \
- $(LIBWRAP_CFLAGS) \
$(PAM_CFLAGS) \
$(AUDIT_CFLAGS) \
$(CAP_CFLAGS) \
$(KMOD_CFLAGS) \
+ $(APPARMOR_CFLAGS) \
$(SECCOMP_CFLAGS) \
-pthread
libudev-internal.la \
libsystemd-shared.la \
libsystemd-internal.la \
- $(LIBWRAP_LIBS) \
$(PAM_LIBS) \
$(AUDIT_LIBS) \
$(CAP_LIBS) \
$(KMOD_LIBS) \
+ $(APPARMOR_LIBS) \
$(SECCOMP_LIBS)
if HAVE_SECCOMP
src/core/load-fragment-gperf.c \
src/core/load-fragment-gperf-nulstr.c \
src/shared/errno-list.txt \
- src/shared/errno-from-name.gperf
+ src/shared/errno-from-name.gperf \
+ src/shared/af-list.txt \
+ src/shared/af-from-name.gperf
BUILT_SOURCES += \
src/shared/errno-from-name.h \
- src/shared/errno-to-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_at)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
+src/shared/af-list.txt:
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(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/shared/af-from-name.gperf: src/shared/af-list.txt
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(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/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_af -H hash_af_name -p -C < $< > $@
+
+src/shared/af-to-name.h: src/shared/af-list.txt
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(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 = \
src/core/main.c
+systemd_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
systemd_LDADD = \
libsystemd-core.la \
$(RT_LIBS)
test-cgroup \
test-install \
test-watchdog \
- test-log
+ test-log \
+ test-ipcrm \
+ test-rtnl-manual
tests += \
test-job-type \
test-list \
test-tables \
test-device-nodes \
- test-xml
+ test-xml \
+ test-architecture
EXTRA_DIST += \
test/sched_idle_bad.service \
test_engine_SOURCES = \
src/test/test-engine.c
+test_engine_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
test_engine_LDADD = \
libsystemd-core.la \
$(RT_LIBS)
test_job_type_SOURCES = \
src/test/test-job-type.c
+test_job_type_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
test_job_type_LDADD = \
libsystemd-core.la \
$(RT_LIBS)
test_ns_SOURCES = \
src/test/test-ns.c
+test_ns_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
test_ns_LDADD = \
libsystemd-core.la
test_unit_name_SOURCES = \
src/test/test-unit-name.c
+test_unit_name_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
test_unit_name_LDADD = \
libsystemd-core.la \
$(RT_LIBS)
test_unit_file_SOURCES = \
src/test/test-unit-file.c
+test_unit_file_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
test_unit_file_LDADD = \
libsystemd-core.la \
$(RT_LIBS)
src/test/test-tables.c \
src/shared/test-tables.h
+test_tables_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
test_tables_LDADD = \
libsystemd-logs.la \
libsystemd-journal-internal.la \
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_LDADD = \
+ libsystemd-internal.la \
+ libsystemd-shared.la \
+ -lkmod
+
test_ellipsize_SOURCES = \
src/test/test-ellipsize.c
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
$(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_install_LDADD = \
libsystemd-units.la \
libsystemd-label.la \
- libsystemd-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-internal.la
test_watchdog_SOURCES = \
src/test/test-watchdog.c
$(AM_CPPFLAGS) \
-DTEST_DIR=\"$(abs_top_srcdir)/test\"
+test_sched_prio_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
test_sched_prio_LDADD = \
libsystemd-core.la \
$(RT_LIBS)
bin_PROGRAMS += \
bootctl
+dist_bashcompletion_DATA += \
+ shell-completion/bash/bootctl
+
dist_zshcompletion_DATA += \
shell-completion/zsh/_bootctl
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_LN)$(LN_S) -f $(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
+ $(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
systemd_nspawn_CFLAGS = \
$(AM_CFLAGS) \
- $(SECCOMP_CFLAGS)
+ $(SECCOMP_CFLAGS) \
+ $(BLKID_CFLAGS)
systemd_nspawn_LDADD = \
libsystemd-label.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 = \
bus-proxyd-install-hook:
$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir)
- $(AM_V_LN)$(LN_S) -f ../lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
+ $(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
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-protocol.h \
src/libsystemd/sd-rtnl/rtnl-message.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 \
$(AM_CFLAGS) \
-pthread
+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
+
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 = \
$(RT_LIBS) \
-lresolv
+libsystemd-install-hook:
+ libname=libsystemd.so && $(move-to-rootlibdir)
+
+libsystemd-uninstall-hook:
+ rm -f $(DESTDIR)$(rootlibdir)/libsystemd.so*
+
+INSTALL_EXEC_HOOKS += libsystemd-install-hook
+UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook
+
pkgconfiglib_DATA += \
src/libsystemd/libsystemd.pc
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
src/libsystemd/sd-bus/test-bus-introspect.c
test_bus_introspect_LDADD = \
- libsystemd-shared.la \
- libsystemd-internal.la
+ libsystemd-internal.la \
+ libsystemd-shared.la
test_event_SOURCES = \
src/libsystemd/sd-event/test-event.c
test_resolve_LDADD = \
libsystemd-internal.la \
+ libsystemd-resolve.la \
libsystemd-shared.la \
-lresolv
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
- libsystemd-dhcp.la
+ libsystemd-network.la
-libsystemd_dhcp_la_SOURCES = \
+libsystemd_network_la_SOURCES = \
+ src/systemd/sd-network.h \
src/systemd/sd-dhcp-client.h \
- src/libsystemd-dhcp/sd-dhcp-client.c \
- src/libsystemd-dhcp/dhcp-lease.h \
- src/libsystemd-dhcp/dhcp-lease.c \
- src/libsystemd-dhcp/dhcp-network.c \
- src/libsystemd-dhcp/dhcp-option.c \
- src/libsystemd-dhcp/dhcp-packet.c \
- src/libsystemd-dhcp/dhcp-internal.h \
- src/libsystemd-dhcp/dhcp-protocol.h
-
-libsystemd_dhcp_la_LIBADD = \
+ 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-network.c \
+ src/libsystemd-network/dhcp-option.c \
+ src/libsystemd-network/dhcp-packet.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-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 = \
+ libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
test_dhcp_option_SOURCES = \
- src/libsystemd-dhcp/dhcp-protocol.h \
- src/libsystemd-dhcp/dhcp-internal.h \
- src/libsystemd-dhcp/test-dhcp-option.c
+ src/libsystemd-network/dhcp-protocol.h \
+ src/libsystemd-network/dhcp-internal.h \
+ src/libsystemd-network/test-dhcp-option.c
test_dhcp_option_LDADD = \
- libsystemd-dhcp.la \
+ libsystemd-network.la \
libsystemd-internal.la \
libsystemd-shared.la
test_dhcp_client_SOURCES = \
src/systemd/sd-dhcp-client.h \
- src/libsystemd-dhcp/dhcp-protocol.h \
- src/libsystemd-dhcp/dhcp-internal.h \
- src/libsystemd-dhcp/test-dhcp-client.c
+ src/libsystemd-network/dhcp-protocol.h \
+ src/libsystemd-network/dhcp-internal.h \
+ src/libsystemd-network/test-dhcp-client.c
test_dhcp_client_LDADD = \
- libsystemd-dhcp.la \
+ libsystemd-network.la \
+ libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
$(sysconfdir)/udev/hwdb.d
dist_network_DATA = \
- network/99-default.link
+ network/99-default.link \
+ network/80-container-host0.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 \
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 \
noinst_LTLIBRARIES += \
libsystemd-journal-core.la
-# ------------------------------------------------------------------------------
+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/
+
+journal-uninstall-hook:
+ -rmdir $(DESTDIR)/var/log/journal/
+
+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:
libsystemd-shared.la \
$(MICROHTTPD_LIBS)
+if HAVE_GNUTLS
+systemd_journal_gatewayd_LDADD += \
+ $(GNUTLS_LIBS)
+endif
+
systemd_journal_gatewayd_CFLAGS = \
$(AM_CFLAGS) \
$(MICROHTTPD_CFLAGS)
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-bus-driverd.service
dist_systemunit_DATA += \
- units/org.freedesktop.DBus.busname
+ units/org.freedesktop.DBus.busname \
+ units/org.freedesktop.systemd1.busname
BUSNAMES_TARGET_WANTS += \
- org.freedesktop.DBus.busname
+ org.freedesktop.DBus.busname \
+ org.freedesktop.systemd1.busname
nodist_userunit_DATA += \
units/user/systemd-bus-driverd.service
# ------------------------------------------------------------------------------
if ENABLE_TIMEDATED
+libsystemd_timedated_core_la_SOURCES = \
+ src/timedate/timedate-sntp.c \
+ src/timedate/timedate-sntp.h
+
+libsystemd_timedated_core_la_LIBADD = \
+ libsystemd-label.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la \
+ -lm
+
+noinst_LTLIBRARIES += \
+ libsystemd-timedated-core.la
+
systemd_timedated_SOURCES = \
src/timedate/timedated.c
systemd_timedated_LDADD = \
- libsystemd-label.la \
- libsystemd-internal.la \
- libsystemd-shared.la
+ libsystemd-timedated-core.la
rootlibexec_PROGRAMS += \
systemd-timedated
dist_zshcompletion_DATA += \
shell-completion/zsh/_timedatectl
+
+test_timedate_sntp_SOURCES = \
+ src/timedate/test-timedate-sntp.c
+
+test_timedate_sntp_LDADD = \
+ libsystemd-timedated-core.la
+
+manual_tests += \
+ test-timedate-sntp
endif
polkitpolicy_in_files += \
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
systemd-networkd
systemd_networkd_SOURCES = \
+ src/network/networkd.c
+
+systemd_networkd_LDADD = \
+ libsystemd-networkd-core.la
+
+noinst_LTLIBRARIES += \
+ libsystemd-networkd-core.la
+
+libsystemd_networkd_core_la_SOURCES = \
src/network/networkd.h \
- src/network/networkd.c \
src/network/networkd-link.c \
src/network/networkd-netdev.c \
src/network/networkd-network.c \
src/network/networkd-route.c \
src/network/networkd-manager.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-internal.la \
- libsystemd-dhcp.la \
+ libsystemd-network.la \
libsystemd-label.la \
libsystemd-shared.la
nodist_systemunit_DATA += \
units/systemd-networkd.service
-MULTI_USER_TARGET_WANTS += \
- 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_SOURCES = \
+ src/network/networkd-wait-online.c
+
+systemd_networkd_wait_online_LDADD = \
+ libsystemd-internal.la \
+ libsystemd-network.la
test_network_SOURCES = \
- src/network/test-network.c \
- src/network/networkd.h \
- src/network/networkd-link.c \
- src/network/networkd-netdev.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
+ src/network/test-network.c
test_network_LDADD = \
- libudev-internal.la \
- libsystemd-internal.la \
- libsystemd-dhcp.la \
- libsystemd-label.la \
- libsystemd-shared.la
+ libsystemd-networkd-core.la
tests += \
test-network
EXTRA_DIST += \
- src/network/networkd-gperf.gperf \
+ src/network/networkd-network-gperf.gperf \
+ src/network/networkd-netdev-gperf.gperf \
units/systemd-networkd.service.in
CLEANFILES += \
- src/network/networkd-gperf.c
+ src/network/networkd-network-gperf.c \
+ src/network/networkd-netdev-gperf.c
endif
# ------------------------------------------------------------------------------
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 \
id128_la_LIBADD = \
$(PYTHON_DEVEL_LIBS) \
+ libsystemd-shared.la \
libsystemd.la
_daemon_la_SOURCES = \
_daemon_la_LIBADD = \
$(PYTHON_DEVEL_LIBS) \
+ libsystemd-shared.la \
libsystemd.la
_reader_la_SOURCES = \
_reader_la_LIBADD = \
$(PYTHON_DEVEL_LIBS) \
- libsystemd.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd.la
login_la_SOURCES = \
src/python-systemd/login.c \
login_la_LIBADD = \
$(PYTHON_DEVEL_LIBS) \
- libsystemd.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd.la
dist_pkgpyexec_PYTHON = \
src/python-systemd/journal.py \
# ------------------------------------------------------------------------------
if ENABLE_COMPAT_LIBS
+EXTRA_DIST += \
+ src/compat-libs/linkwarning.h
-define generate-fake-lib
+libsystemd-%.c: src/compat-libs/libsystemd-%.sym
$(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_GEN)sed -r -n 's/^ +(sd_.*);/void new_\1(void);\n__asm__(".symver new_\1,\1@LIBSYSTEMD_209");\nstatic void (*resolve_\1(void)) (void) {\n\treturn new_\1;\n}\nvoid \1(void) __attribute__((ifunc("resolve_\1")));\nobsolete_lib(\1,$(notdir $(basename $<)));\n/p' <$< >$@
-endef
+ $(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_CFLAGS = \
+libsystemd_journal_la_CPPFLAGS = \
$(AM_CFLAGS) \
- -fvisibility=default \
- -imacros $(top_srcdir)/src/compat-libs/linkwarning.h \
- -fno-lto
+ -imacros$(top_srcdir)/src/compat-libs/linkwarning.h
libsystemd_journal_la_LDFLAGS = \
$(AM_LDFLAGS) \
-Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-journal.sym
libsystemd_journal_la_LIBADD = \
- libsystemd.la
+ 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_CFLAGS = \
+libsystemd_login_la_CPPFLAGS = \
$(AM_CFLAGS) \
- -fvisibility=default \
- -imacros $(top_srcdir)/src/compat-libs/linkwarning.h \
- -fno-lto
+ -imacros$(top_srcdir)/src/compat-libs/linkwarning.h
libsystemd_login_la_LDFLAGS = \
$(AM_LDFLAGS) \
-Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-login.sym
libsystemd_login_la_LIBADD = \
- libsystemd.la
+ libsystemd-internal.la \
+ libsystemd-shared.la
libsystemd_id128_la_SOURCES = \
libsystemd-id128.c \
src/compat-libs/libsystemd-id128.sym
-libsystemd_id128_la_CFLAGS = \
- $(libsystemd_login_la_CFLAGS)
+libsystemd_id128_la_CPPFLAGS = \
+ $(AM_CFLAGS) \
+ -imacros$(top_srcdir)/src/compat-libs/linkwarning.h
libsystemd_id128_la_LDFLAGS = \
$(AM_LDFLAGS) \
-Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-id128.sym
libsystemd_id128_la_LIBADD = \
- libsystemd.la
+ libsystemd-internal.la \
+ libsystemd-shared.la
libsystemd_daemon_la_SOURCES = \
libsystemd-daemon.c \
src/compat-libs/libsystemd-daemon.sym
-libsystemd_daemon_la_CFLAGS = \
- $(libsystemd_login_la_CFLAGS)
+libsystemd_daemon_la_CPPFLAGS = \
+ $(AM_CFLAGS) \
+ -imacros$(top_srcdir)/src/compat-libs/linkwarning.h
libsystemd_daemon_la_LDFLAGS = \
$(AM_LDFLAGS) \
-Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-daemon.sym
libsystemd_daemon_la_LIBADD = \
- libsystemd.la
-
-BUILT_SOURCES += \
- libsystemd-journal.c \
- libsystemd-login.c \
- libsystemd-id128.c \
- libsystemd-daemon.c
-
-libsystemd-%.c: src/compat-libs/libsystemd-%.sym
- $(generate-fake-lib)
+ libsystemd-internal.la \
+ libsystemd-shared.la
lib_LTLIBRARIES += \
libsystemd-journal.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
# ------------------------------------------------------------------------------
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))))') \
$(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 += \
wget -N https://d-bus.googlecode.com/git/kdbus.h )
.PHONY: upload
-upload: all distcheck
+upload: all check dist
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 "v$(VERSION)" -m "systemd $(VERSION)"
+ git tag -s "v$(VERSION)" -m "systemd $(VERSION)"
.PHONY: install-tree
install-tree: all
$(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)printf '#include <stdio.h>\n' > $@
# 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
~ianmdlvl / elogind.git / blobdiff