networkd: netdev - log when loading a .netdev file

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f261c476daa73783b2a2ed9f3c8e7b93b9454166..5fc14d91ae8918fd60e5cb7fa7c4b82650b9bcda 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1095,7 +1095,7 @@ BUILT_SOURCES += \
 
 src/shared/errno-list.txt:
        $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - < /dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+[0-9]/ { print $$2; }'  > $@
+       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - < /dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }'  > $@
 
 src/shared/errno-from-name.gperf: src/shared/errno-list.txt
        $(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -1107,7 +1107,7 @@ src/shared/errno-from-name.h: src/shared/errno-from-name.gperf
 
 src/shared/errno-to-name.h: src/shared/errno-list.txt
        $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
+       $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
 
 src/shared/af-list.txt:
        $(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -2514,9 +2514,21 @@ test_dhcp_client_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
+test_ipv4ll_SOURCES = \
+        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
+
 tests += \
        test-dhcp-option \
-       test-dhcp-client
+       test-dhcp-client \
+       test-ipv4ll
 
 # ------------------------------------------------------------------------------
 if ENABLE_GTK_DOC
@@ -4170,9 +4182,6 @@ systemd_networkd_wait_online_SOURCES = \
        src/network/networkd-wait-online.c \
        src/network/networkd-wait-online.h
 
-nodist_systemd_networkd_wait_online_SOURCES = \
-       src/network/networkd-wait-online-gperf.c
-
 systemd_networkd_wait_online_LDADD = \
        libsystemd-internal.la \
        libsystemd-network.la
@@ -4186,19 +4195,14 @@ test_network_LDADD = \
 tests += \
        test-network
 
-dist_pkgsysconf_DATA += \
-       src/network/networkd-wait-online.conf
-
 EXTRA_DIST += \
        src/network/networkd-network-gperf.gperf \
        src/network/networkd-netdev-gperf.gperf \
-       src/network/networkd-wait-online-gperf.gperf \
        units/systemd-networkd.service.in
 
 CLEANFILES += \
        src/network/networkd-network-gperf.c \
-       src/network/networkd-netdev-gperf.c \
-       src/network/networkd-wait-online-gperf.c
+       src/network/networkd-netdev-gperf.c
 endif
 
 # ------------------------------------------------------------------------------