.PRECIOUS: $(TEST_SUITE_LOG) Makefile
LIBUDEV_CURRENT=5
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=1
LIBUDEV_AGE=4
LIBGUDEV_CURRENT=2
LIBSYSTEMD_JOURNAL_REVISION=5
LIBSYSTEMD_JOURNAL_AGE=11
-LIBSYSTEMD_CURRENT=1
+LIBSYSTEMD_CURRENT=2
LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=1
+LIBSYSTEMD_AGE=2
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
-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 \
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/ring.c \
src/shared/ring.h \
src/shared/async.c \
- src/shared/async.h
+ src/shared/async.h \
+ src/shared/eventfd-util.c \
+ src/shared/eventfd-util.h
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
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_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
src/bus-proxyd/bus-proxyd.c
systemd_bus_proxyd_LDADD = \
+ libsystemd-capability.la \
libsystemd-internal.la \
libsystemd-shared.la
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
test_ipv4ll_SOURCES = \
- src/systemd/sd-ipv4ll.h \
- src/libsystemd-network/ipv4ll-internal.h \
- src/libsystemd-network/test-ipv4ll.c
+ 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
+ libsystemd-network.la \
+ libsystemd-label.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la
tests += \
test-dhcp-option \
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/42-usb-hid-pm.rules \
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 \
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
libsystemd-logs.la \
libsystemd-internal.la \
libsystemd-journal-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-resolve.la
# ------------------------------------------------------------------------------
if ENABLE_COREDUMP
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 \
- libsystemd-resolve.la \
- libsystemd-network.la \
-lm
rootlibexec_PROGRAMS += \
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 += \
systemd_networkd_LDADD = \
libsystemd-networkd-core.la \
- $(KMOD_LIBS)
+ libsystemd-capability.la
noinst_LTLIBRARIES += \
libsystemd-networkd-core.la
libsystemd_networkd_core_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(KMOD_CFLAGS)
+ $(AM_CFLAGS)
libsystemd_networkd_core_la_SOURCES = \
src/libsystemd-network/network-internal.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 \
nodist_libsystemd_networkd_core_la_SOURCES = \
src/network/networkd-network-gperf.c \
- src/network/networkd-netdev-gperf.c \
- src/network/networkd-gperf.c
+ src/network/networkd-netdev-gperf.c
libsystemd_networkd_core_la_LIBADD = \
libudev-internal.la \
systemd-networkd-wait-online
systemd_networkd_wait_online_CFLAGS = \
- $(AM_CFLAGS) \
- $(KMOD_CFLAGS)
+ $(AM_CFLAGS)
systemd_networkd_wait_online_SOURCES = \
src/libsystemd-network/network-internal.h \
libsystemd-network.la \
libudev-internal.la \
libsystemd-internal.la \
- libsystemd-shared.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
- $(KMOD_LIBS)
tests += \
test-network
$(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \
$(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service
-nodist_pkgsysconf_DATA += \
- src/network/networkd.conf
-
EXTRA_DIST += \
src/network/networkd-network-gperf.gperf \
src/network/networkd-netdev-gperf.gperf \
- src/network/networkd-gperf.gperf \
units/systemd-networkd.service.in \
- units/systemd-networkd-wait-online.service.in \
- src/network/networkd.conf.in
+ units/systemd-networkd-wait-online.service.in
CLEANFILES += \
src/network/networkd-network-gperf.c \
- src/network/networkd-netdev-gperf.c \
- src/network/networkd-gperf.c \
- src/network/networkd.conf
+ src/network/networkd-netdev-gperf.c
endif
# ------------------------------------------------------------------------------
'|PYTHON=$(PYTHON)|' \
'|PYTHON_BINARY=$(PYTHON_BINARY)|' \
'|NTP_SERVERS=$(NTP_SERVERS)|' \
- '|DNS_SERVERS=$(DNS_SERVERS)|'
+ '|DNS_SERVERS=$(DNS_SERVERS)|' \
+ '|systemuidmax=$(SYSTEM_UID_MAX)|' \
+ '|systemgidmax=$(SYSTEM_GID_MAX)|'
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
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
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
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)