]> git.ipfire.org Git - thirdparty/systemd.git/blobdiff - Makefile.am
projects / thirdparty / systemd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
sd-dhcp: fix namespacing
[thirdparty/systemd.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index c2973c0a67d7ea81e9178c461ac94933f527e775..5b1431c866cad43f564f589994ad7bd0453f55e2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,9 +42,9 @@ LIBUDEV_CURRENT=7
 LIBUDEV_REVISION=4
 LIBUDEV_AGE=6
 
-LIBSYSTEMD_CURRENT=10
-LIBSYSTEMD_REVISION=2
-LIBSYSTEMD_AGE=10
+LIBSYSTEMD_CURRENT=11
+LIBSYSTEMD_REVISION=0
+LIBSYSTEMD_AGE=11
 
 # The following four libraries only exist for compatibility reasons,
 # their version info should not be bumped anymore
@@ -155,6 +155,7 @@ noinst_PROGRAMS =
 TESTS =
 endif
 udevlibexec_PROGRAMS =
+gperf_gperf_sources =
 
 in_files = $(filter %.in,$(EXTRA_DIST))
 in_in_files = $(filter %.in.in, $(in_files))
@@ -220,6 +221,7 @@ AM_CPPFLAGS = \
        -I $(top_builddir)/src/journal \
        -I $(top_srcdir)/src/timedate \
        -I $(top_srcdir)/src/timesync \
+       -I $(top_srcdir)/src/nspawn \
        -I $(top_srcdir)/src/resolve \
        -I $(top_builddir)/src/resolve \
        -I $(top_srcdir)/src/systemd \
@@ -472,6 +474,7 @@ dist_systemunit_DATA = \
        units/getty.target \
        units/halt.target \
        units/kexec.target \
+       units/exit.target \
        units/local-fs.target \
        units/local-fs-pre.target \
        units/initrd.target \
@@ -548,6 +551,7 @@ nodist_systemunit_DATA = \
        units/systemd-poweroff.service \
        units/systemd-reboot.service \
        units/systemd-kexec.service \
+       units/systemd-exit.service \
        units/systemd-fsck@.service \
        units/systemd-fsck-root.service \
        units/systemd-machine-id-commit.service \
@@ -599,6 +603,7 @@ EXTRA_DIST += \
        units/systemd-poweroff.service.in \
        units/systemd-reboot.service.in \
        units/systemd-kexec.service.in \
+       units/systemd-exit.service.in \
        units/user/systemd-exit.service.in \
        units/systemd-fsck@.service.in \
        units/systemd-fsck-root.service.in \
@@ -863,8 +868,6 @@ libbasic_la_SOURCES = \
        src/basic/xml.h \
        src/basic/json.c \
        src/basic/json.h \
-       src/basic/ring.c \
-       src/basic/ring.h \
        src/basic/barrier.c \
        src/basic/barrier.h \
        src/basic/async.c \
@@ -952,8 +955,6 @@ libshared_la_SOURCES = \
        src/shared/ima-util.h \
        src/shared/ptyfwd.c \
        src/shared/ptyfwd.h \
-       src/shared/pty.c \
-       src/shared/pty.h \
        src/shared/base-filesystem.c \
        src/shared/base-filesystem.h \
        src/shared/uid-range.c \
@@ -1369,7 +1370,9 @@ manual_tests += \
        test-watchdog \
        test-log \
        test-ipcrm \
-       test-btrfs
+       test-btrfs \
+       test-acd \
+       test-ipv4ll-manual
 
 if HAVE_LIBIPTC
 manual_tests += \
@@ -1400,9 +1403,7 @@ tests += \
        test-process-util \
        test-terminal-util \
        test-path-lookup \
-       test-ring \
        test-barrier \
-       test-pty \
        test-tmpfiles \
        test-namespace \
        test-date \
@@ -1719,24 +1720,12 @@ test_socket_util_SOURCES = \
 test_socket_util_LDADD = \
        libshared.la
 
-test_ring_SOURCES = \
-       src/test/test-ring.c
-
-test_ring_LDADD = \
-       libshared.la
-
 test_barrier_SOURCES = \
        src/test/test-barrier.c
 
 test_barrier_LDADD = \
        libshared.la
 
-test_pty_SOURCES = \
-       src/test/test-pty.c
-
-test_pty_LDADD = \
-       libcore.la
-
 test_tmpfiles_SOURCES = \
        src/test/test-tmpfiles.c
 
@@ -2776,11 +2765,31 @@ systemd_cgtop_LDADD = \
 # ------------------------------------------------------------------------------
 systemd_nspawn_SOURCES = \
        src/nspawn/nspawn.c \
+       src/nspawn/nspawn-settings.c \
+       src/nspawn/nspawn-settings.h \
+       src/nspawn/nspawn-mount.c \
+       src/nspawn/nspawn-mount.h \
+       src/nspawn/nspawn-network.c \
+       src/nspawn/nspawn-network.h \
+       src/nspawn/nspawn-expose-ports.c \
+       src/nspawn/nspawn-expose-ports.h \
+       src/nspawn/nspawn-cgroup.c \
+       src/nspawn/nspawn-cgroup.h \
+       src/nspawn/nspawn-register.c \
+       src/nspawn/nspawn-register.h \
+       src/nspawn/nspawn-setuid.c \
+       src/nspawn/nspawn-setuid.h \
        src/core/mount-setup.c \
        src/core/mount-setup.h \
        src/core/loopback-setup.c \
        src/core/loopback-setup.h
 
+nodist_systemd_nspawn_SOURCES = \
+       src/nspawn/nspawn-gperf.c
+
+gperf_gperf_sources += \
+       src/nspawn/nspawn-gperf.gperf
+
 systemd_nspawn_CFLAGS = \
        $(AM_CFLAGS) \
        $(BLKID_CFLAGS) \
@@ -3194,6 +3203,7 @@ libsystemd_network_la_SOURCES = \
        src/systemd/sd-dhcp-server.h \
        src/systemd/sd-dhcp-lease.h \
        src/systemd/sd-ipv4ll.h \
+       src/systemd/sd-ipv4acd.h \
        src/systemd/sd-icmp6-nd.h \
        src/systemd/sd-dhcp6-client.h \
        src/systemd/sd-dhcp6-lease.h \
@@ -3210,9 +3220,9 @@ libsystemd_network_la_SOURCES = \
        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/sd-ipv4acd.c \
+       src/libsystemd-network/arp-util.h \
+       src/libsystemd-network/arp-util.c \
        src/libsystemd-network/sd-pppoe.c \
        src/libsystemd-network/network-internal.c \
        src/libsystemd-network/network-internal.h \
@@ -3269,13 +3279,29 @@ test_dhcp_server_LDADD = \
 
 test_ipv4ll_SOURCES = \
        src/systemd/sd-ipv4ll.h \
-       src/libsystemd-network/ipv4ll-internal.h \
+       src/libsystemd-network/arp-util.h \
        src/libsystemd-network/test-ipv4ll.c
 
 test_ipv4ll_LDADD = \
        libsystemd-network.la \
        libshared.la
 
+test_ipv4ll_manual_SOURCES = \
+       src/systemd/sd-ipv4ll.h \
+       src/libsystemd-network/test-ipv4ll-manual.c
+
+test_ipv4ll_manual_LDADD = \
+       libsystemd-network.la \
+       libshared.la
+
+test_acd_SOURCES = \
+       src/systemd/sd-ipv4acd.h \
+       src/libsystemd-network/test-acd.c
+
+test_acd_LDADD = \
+       libsystemd-network.la \
+       libshared.la
+
 test_pppoe_SOURCES = \
        src/systemd/sd-pppoe.h \
        src/libsystemd-network/test-pppoe.c
@@ -3486,7 +3512,7 @@ nodist_libudev_core_la_SOURCES = \
        src/udev/keyboard-keys-to-name.h \
        src/udev/net/link-config-gperf.c
 
-gperf_gperf_sources = \
+gperf_gperf_sources += \
        src/udev/net/link-config-gperf.gperf
 
 libudev_core_la_CFLAGS = \
@@ -5167,41 +5193,48 @@ libnetworkd_core_la_SOURCES = \
        src/libsystemd-network/network-internal.h \
        src/network/networkd.h \
        src/network/networkd-link.h \
+       src/network/networkd-link.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-ipvlan.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.h \
        src/network/networkd-netdev-tunnel.c \
+       src/network/networkd-netdev-veth.h \
        src/network/networkd-netdev-veth.c \
+       src/network/networkd-netdev-vxlan.h \
        src/network/networkd-netdev-vxlan.c \
+       src/network/networkd-netdev-vlan.h \
        src/network/networkd-netdev-vlan.c \
+       src/network/networkd-netdev-macvlan.h \
        src/network/networkd-netdev-macvlan.c \
+       src/network/networkd-netdev-ipvlan.h \
        src/network/networkd-netdev-ipvlan.c \
+       src/network/networkd-netdev-dummy.h \
        src/network/networkd-netdev-dummy.c \
+       src/network/networkd-netdev-tuntap.h \
        src/network/networkd-netdev-tuntap.c \
+       src/network/networkd-netdev-bond.h \
        src/network/networkd-netdev-bond.c \
+       src/network/networkd-netdev-bridge.h \
        src/network/networkd-netdev-bridge.c \
-       src/network/networkd-link.c \
        src/network/networkd-link-bus.c \
        src/network/networkd-ipv4ll.c \
        src/network/networkd-dhcp4.c \
        src/network/networkd-dhcp6.c \
+       src/network/networkd-network.h \
        src/network/networkd-network.c \
        src/network/networkd-network-bus.c \
+       src/network/networkd-address.h \
        src/network/networkd-address.c \
+       src/network/networkd-route.h \
        src/network/networkd-route.c \
        src/network/networkd-manager.c \
        src/network/networkd-manager-bus.c \
+       src/network/networkd-fdb.h \
        src/network/networkd-fdb.c \
-       src/network/networkd-address-pool.c
+       src/network/networkd-address-pool.h \
+       src/network/networkd-address-pool.c \
+       src/network/networkd-util.h \
+       src/network/networkd-util.c
 
 nodist_libnetworkd_core_la_SOURCES = \
        src/network/networkd-network-gperf.c \
@@ -6081,7 +6114,7 @@ doc-sync: all
        rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
 
 .PHONY: gardel
-gardel: upload
+gardel:
        scp man/*.html gardel:public/systemd-man/
 
 .PHONY: lennart-fedora
Unnamed repository; edit this file 'description' to name the repository.