sd-dhcp6-client: fix path of sd-icmp6-nd.h in Makefile.am

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 479f7e2c0e501b21ee7425e7035281598b5ebd52..caee5c93df93da5af5dd5d9f241372cbb839b012 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -297,10 +297,14 @@ define install-relative-aliases
        done
 endef
 
+install-touch-usr-hook:
+       touch -c $(DESTDIR)/$(prefix)
+
 INSTALL_EXEC_HOOKS += \
        install-target-wants-hook \
        install-directories-hook \
-       install-aliases-hook
+       install-aliases-hook \
+       install-touch-usr-hook
 
 # ------------------------------------------------------------------------------
 AM_V_M4 = $(AM_V_M4_$(V))
@@ -367,7 +371,8 @@ rootlibexec_PROGRAMS = \
 systemgenerator_PROGRAMS = \
        systemd-getty-generator \
        systemd-fstab-generator \
-       systemd-system-update-generator
+       systemd-system-update-generator \
+       systemd-debug-generator
 
 dist_bashcompletion_DATA = \
        shell-completion/bash/busctl \
@@ -509,6 +514,9 @@ dist_userunit_DATA = \
 nodist_userunit_DATA = \
        units/user/systemd-exit.service
 
+dist_systempreset_DATA = \
+       system-preset/90-systemd.preset
+
 EXTRA_DIST += \
        units/getty@.service.m4 \
        units/serial-getty@.service.m4 \
@@ -1233,7 +1241,9 @@ tests += \
        test-tables \
        test-device-nodes \
        test-xml \
-       test-architecture
+       test-architecture \
+       test-socket-util \
+       test-fdset
 
 EXTRA_DIST += \
        test/sched_idle_bad.service \
@@ -1337,12 +1347,24 @@ test_utf8_SOURCES = \
 test_utf8_LDADD = \
        libsystemd-shared.la
 
+test_fdset_SOURCES = \
+       src/test/test-fdset.c
+
+test_fdset_LDADD = \
+       libsystemd-core.la
+
 test_util_SOURCES = \
        src/test/test-util.c
 
 test_util_LDADD = \
        libsystemd-core.la
 
+test_socket_util_SOURCES = \
+       src/test/test-socket-util.c
+
+test_socket_util_LDADD = \
+       libsystemd-core.la
+
 test_ring_SOURCES = \
        src/test/test-ring.c
 
@@ -1870,6 +1892,14 @@ systemd_getty_generator_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la
 
+# ------------------------------------------------------------------------------
+systemd_debug_generator_SOURCES = \
+       src/debug-generator/debug-generator.c
+
+systemd_debug_generator_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 systemd_fstab_generator_SOURCES = \
        src/fstab-generator/fstab-generator.c \
@@ -2574,7 +2604,17 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/ipv4ll-packet.c \
        src/libsystemd-network/ipv4ll-internal.h \
        src/libsystemd-network/network-internal.c \
-       src/libsystemd-network/network-internal.h
+       src/libsystemd-network/network-internal.h \
+       src/systemd/sd-icmp6-nd.h \
+       src/systemd/sd-dhcp6-client.h \
+       src/systemd/sd-dhcp6-lease.h \
+       src/libsystemd-network/sd-icmp6-nd.c \
+       src/libsystemd-network/sd-dhcp6-client.c \
+       src/libsystemd-network/dhcp6-internal.h \
+       src/libsystemd-network/dhcp6-network.c \
+       src/libsystemd-network/dhcp6-option.c \
+       src/libsystemd-network/dhcp6-lease-internal.h \
+       src/libsystemd-network/sd-dhcp6-lease.c
 
 libsystemd_network_la_LIBADD = \
        libudev-internal.la \
@@ -2624,11 +2664,34 @@ test_ipv4ll_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
+test_icmp6_rs_SOURCES = \
+       src/systemd/sd-dhcp6-client.h \
+       src/systemd/sd-icmp6-nd.h \
+       src/libsystemd-network/dhcp6-internal.h \
+       src/libsystemd-network/test-icmp6-rs.c
+
+test_icmp6_rs_LDADD = \
+       libsystemd-network.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
+test_dhcp6_client_SOURCES = \
+       src/systemd/sd-dhcp6-client.h \
+       src/libsystemd-network/dhcp6-internal.h \
+       src/libsystemd-network/test-dhcp6-client.c
+
+test_dhcp6_client_LDADD = \
+       libsystemd-network.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
 tests += \
        test-dhcp-option \
        test-dhcp-client \
        test-dhcp-server \
-       test-ipv4ll
+       test-ipv4ll \
+       test-icmp6-rs \
+       test-dhcp6-client
 
 # ------------------------------------------------------------------------------
 if ENABLE_GTK_DOC
@@ -3516,7 +3579,7 @@ libsystemd_journal_internal_la_SOURCES = \
        src/journal/mmap-cache.h
 
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
-libsystemd_journal_internal_la_CFLAGS =
+libsystemd_journal_internal_la_CFLAGS = \
        $(AM_CFLAGS)
 
 libsystemd_journal_internal_la_LIBADD =
@@ -3665,25 +3728,42 @@ systemd_coredump_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
+if HAVE_ELFUTILS
+systemd_coredump_SOURCES += \
+       src/journal/stacktrace.c \
+       src/journal/stacktrace.h
+
+systemd_coredump_LDADD += \
+       $(ELFUTILS_LIBS)
+endif
+
 rootlibexec_PROGRAMS += \
        systemd-coredump
 
-systemd_coredumpctl_SOURCES = \
+dist_pkgsysconf_DATA += \
+       src/journal/coredump.conf
+
+if HAVE_ACL
+systemd_coredump_LDADD += \
+       libsystemd-acl.la
+endif
+
+coredumpctl_SOURCES = \
        src/journal/coredumpctl.c
 
-systemd_coredumpctl_LDADD = \
+coredumpctl_LDADD = \
        libsystemd-journal-internal.la \
        libsystemd-internal.la \
        libsystemd-shared.la
 
 bin_PROGRAMS += \
-       systemd-coredumpctl
+       coredumpctl
 
 dist_bashcompletion_DATA += \
-       shell-completion/bash/systemd-coredumpctl
+       shell-completion/bash/coredumpctl
 
 dist_zshcompletion_DATA += \
-       shell-completion/zsh/_systemd-coredumpctl
+       shell-completion/zsh/_coredumpctl
 
 sysctl_DATA = \
        sysctl.d/50-coredump.conf
@@ -3912,7 +3992,8 @@ systemgenerator_PROGRAMS += \
        systemd-cryptsetup-generator
 
 dist_systemunit_DATA += \
-       units/cryptsetup.target
+       units/cryptsetup.target \
+       units/cryptsetup-pre.target
 
 systemd_cryptsetup_SOURCES = \
        src/cryptsetup/cryptsetup.c
@@ -4362,7 +4443,8 @@ libsystemd_networkd_core_la_SOURCES = \
        src/network/networkd-network.c \
        src/network/networkd-address.c \
        src/network/networkd-route.c \
-       src/network/networkd-manager.c
+       src/network/networkd-manager.c \
+       src/network/networkd-address-pool.c
 
 nodist_libsystemd_networkd_core_la_SOURCES = \
        src/network/networkd-network-gperf.c \