chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
macro: add DISABLE_WARNING_SHADOW
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 5158bbc776d51695cc23a382e0ecf7c3b687482b..ec5f04d9e90d15448afd75da16224a20ad6d58d1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,6 +43,12 @@ 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
@@ -59,10 +65,6 @@ LIBSYSTEMD_JOURNAL_CURRENT=11
 LIBSYSTEMD_JOURNAL_REVISION=5
 LIBSYSTEMD_JOURNAL_AGE=11
 
-LIBSYSTEMD_CURRENT=2
-LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=2
-
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
 dbussessionservicedir=@dbussessionservicedir@
@@ -86,6 +88,7 @@ pkgsysconfdir=$(sysconfdir)/systemd
 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
@@ -358,7 +361,8 @@ rootlibexec_PROGRAMS = \
        systemd-sysctl \
        systemd-sleep \
        systemd-bus-proxyd \
-       systemd-socket-proxyd
+       systemd-socket-proxyd \
+       systemd-update-done
 
 systemgenerator_PROGRAMS = \
        systemd-getty-generator \
@@ -413,6 +417,7 @@ dist_systemunit_DATA = \
        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 \
@@ -455,7 +460,8 @@ dist_systemunit_DATA = \
        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 \
@@ -486,12 +492,14 @@ nodist_systemunit_DATA = \
        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 \
@@ -534,7 +542,8 @@ EXTRA_DIST += \
        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 \
@@ -549,6 +558,7 @@ nodist_systemunit_DATA += \
        units/halt-local.service
 
 systemgenerator_PROGRAMS += \
+       systemd-sysv-generator \
        systemd-rc-local-generator
 endif
 
@@ -807,7 +817,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/async.c \
        src/shared/async.h \
        src/shared/eventfd-util.c \
-       src/shared/eventfd-util.h
+       src/shared/eventfd-util.h \
+       src/shared/copy.c \
+       src/shared/copy.h
 
 nodist_libsystemd_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
@@ -1633,6 +1645,14 @@ systemd_update_utmp_LDADD = \
        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
@@ -1722,7 +1742,9 @@ dist_tmpfiles_DATA = \
        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 \
+       tmpfiles.d/etc.conf
 
 if HAVE_SYSV_COMPAT
 dist_tmpfiles_DATA += \
@@ -1749,6 +1771,38 @@ EXTRA_DIST += \
        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
+
+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 \
@@ -1914,6 +1968,15 @@ 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
@@ -2030,9 +2093,12 @@ systemd_run_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
 
@@ -2488,15 +2554,18 @@ libsystemd_network_la_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 \
@@ -2536,6 +2605,14 @@ test_dhcp_client_LDADD = \
        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 \
@@ -2550,6 +2627,7 @@ test_ipv4ll_LDADD = \
 tests += \
        test-dhcp-option \
        test-dhcp-client \
+       test-dhcp-server \
        test-ipv4ll
 
 # ------------------------------------------------------------------------------
@@ -2697,19 +2775,23 @@ CLEANFILES += \
 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
@@ -3479,11 +3561,13 @@ bin_PROGRAMS += \
        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
@@ -3495,14 +3579,18 @@ dist_catalog_DATA = \
        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 += \
@@ -3563,7 +3651,8 @@ systemd_socket_proxyd_LDADD = \
        libsystemd-logs.la \
        libsystemd-internal.la \
        libsystemd-journal-internal.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-resolve.la
 
 # ------------------------------------------------------------------------------
 if ENABLE_COREDUMP
@@ -4215,6 +4304,7 @@ CLEANFILES += \
        src/resolve/resolved-gperf.c
 
 systemd_resolved_LDADD = \
+       libsystemd-capability.la \
        libsystemd-network.la \
        libsystemd-label.la \
        libsystemd-internal.la \
@@ -4253,15 +4343,13 @@ systemd_networkd_SOURCES = \
 
 systemd_networkd_LDADD = \
        libsystemd-networkd-core.la \
-       libsystemd-capability.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 \
@@ -4269,6 +4357,7 @@ libsystemd_networkd_core_la_SOURCES = \
        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 \
@@ -4289,8 +4378,7 @@ rootlibexec_PROGRAMS += \
        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 \
@@ -4307,12 +4395,10 @@ test_network_SOURCES = \
        src/network/test-network.c
 
 test_network_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(KMOD_CFLAGS)
+       $(AM_CFLAGS)
 
 test_network_LDADD = \
        libsystemd-networkd-core.la
-       $(KMOD_LIBS)
 
 tests += \
        test-network
@@ -4323,7 +4409,7 @@ nodist_systemunit_DATA += \
 
 GENERAL_ALIASES += \
        $(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
+       $(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 \
@@ -4859,6 +4945,7 @@ substitutions = \
        '|udevrulesdir=$(udevrulesdir)|' \
        '|catalogdir=$(catalogdir)|' \
        '|tmpfilesdir=$(tmpfilesdir)|' \
+       '|sysusersdir=$(sysusersdir)|' \
        '|sysctldir=$(sysctldir)|' \
        '|systemgeneratordir=$(systemgeneratordir)|' \
        '|usergeneratordir=$(usergeneratordir)|' \
@@ -4890,7 +4977,8 @@ substitutions = \
        '|NTP_SERVERS=$(NTP_SERVERS)|' \
        '|DNS_SERVERS=$(DNS_SERVERS)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
-       '|systemgidmax=$(SYSTEM_GID_MAX)|'
+       '|systemgidmax=$(SYSTEM_GID_MAX)|' \
+       '|TTY_GID=$(TTY_GID)|'
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -5052,14 +5140,20 @@ RUNLEVEL4_TARGET_WANTS += \
 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 \
Unnamed repository; edit this file 'description' to name the repository.