sd-dhcp-server: fix broadcast of DHCP packets

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bafb80e4db0c9fbfcbb1ba15564302891640d2ef..b48b122f35e18c49b7b8fd1f25c6a8e399206d52 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -371,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 \
@@ -1242,7 +1243,8 @@ tests += \
        test-xml \
        test-architecture \
        test-socket-util \
-       test-fdset
+       test-fdset \
+       test-conf-files
 
 EXTRA_DIST += \
        test/sched_idle_bad.service \
@@ -1599,6 +1601,12 @@ test_sched_prio_LDADD = \
        libsystemd-core.la \
        $(RT_LIBS)
 
+test_conf_files_SOURCES = \
+       src/test/test-conf-files.c
+
+test_conf_files_LDADD = \
+       libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 ## .PHONY so it always rebuilds it
 .PHONY: coverage lcov-run lcov-report coverage-sync
@@ -1820,6 +1828,9 @@ EXTRA_DIST += \
        units/systemd-sysusers.service.in \
        sysusers.d/systemd.conf.in
 
+CLEANFILES += \
+       sysusers.d/systemd.conf
+
 INSTALL_DIRS += \
        $(sysusersdir)
 endif
@@ -1891,6 +1902,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 \
@@ -2602,6 +2621,7 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/sd-icmp6-nd.c \
        src/libsystemd-network/sd-dhcp6-client.c \
        src/libsystemd-network/dhcp6-internal.h \
+       src/libsystemd-network/dhcp6-protocol.h \
        src/libsystemd-network/dhcp6-network.c \
        src/libsystemd-network/dhcp6-option.c \
        src/libsystemd-network/dhcp6-lease-internal.h \
@@ -2657,7 +2677,7 @@ test_ipv4ll_LDADD = \
 
 test_icmp6_rs_SOURCES = \
        src/systemd/sd-dhcp6-client.h \
-       src/libsystemd-network/sd-icmp6-nd.h \
+       src/systemd/sd-icmp6-nd.h \
        src/libsystemd-network/dhcp6-internal.h \
        src/libsystemd-network/test-icmp6-rs.c
 
@@ -2668,7 +2688,6 @@ test_icmp6_rs_LDADD = \
 
 test_dhcp6_client_SOURCES = \
        src/systemd/sd-dhcp6-client.h \
-       src/libsystemd-network/dhcp6-icmp6.h \
        src/libsystemd-network/dhcp6-internal.h \
        src/libsystemd-network/test-dhcp6-client.c
 
@@ -4755,10 +4774,12 @@ _journal_la_LIBADD = \
 
 id128_la_SOURCES = \
        src/python-systemd/id128.c \
-       src/python-systemd/id128-constants.h \
        src/python-systemd/pyutil.c \
        src/python-systemd/pyutil.h
 
+nodist_id128_la_SOURCES = \
+       src/python-systemd/id128-constants.h
+
 id128_la_CFLAGS = \
        $(AM_CFLAGS) \
        -fvisibility=default \
@@ -5338,11 +5359,34 @@ DISTCHECK_CONFIGURE_FLAGS += \
        --with-sysvrcnd-path=
 endif
 
+if HAVE_PYTHON
+DISTCHECK_CONFIGURE_FLAGS += \
+       --with-python
+endif
+
 if ENABLE_GTK_DOC
 DISTCHECK_CONFIGURE_FLAGS += \
        --enable-gtk-doc
 endif
 
+#
+# Require python when making dist
+#
+.PHONY: dist-check-python
+dist-check-python:
+if !HAVE_PYTHON
+       @echo "*** python and python-lxml module must be installed and enabled in order to make dist"
+       @false
+endif
+
+dist-check-compat-libs:
+if !ENABLE_COMPAT_LIBS
+       @echo "*** compat-libs must be enabled in order to make dist"
+       @false
+endif
+
+dist: dist-check-python dist-check-compat-libs
+
 # check "broken" platforms limited toolchains for link breakage before we release
 .PHONY: linkcheck
 linkcheck: