networkd: netdev - log when loading a .netdev file

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 90b9b93c63c7f78a445253490a7c1578f8f79e7f..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 $@)
 
 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 $@)
 
 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 $@)
 
 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 $@)
 
 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
 
        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 \
 tests += \
        test-dhcp-option \

-       test-dhcp-client
+       test-dhcp-client \
+       test-ipv4ll

 
 # ------------------------------------------------------------------------------
 if ENABLE_GTK_DOC
 
 # ------------------------------------------------------------------------------
 if ENABLE_GTK_DOC


@@ -3862,41 +3874,13 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 if ENABLE_KDBUS
 
 # ------------------------------------------------------------------------------
 if ENABLE_KDBUS

-systemd_bus_driverd_SOURCES = \
-       src/bus-driverd/bus-driverd.c
-
-systemd_bus_driverd_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la
-
-rootlibexec_PROGRAMS += \
-       systemd-bus-driverd
-
-nodist_systemunit_DATA += \
-       units/systemd-bus-driverd.service
-

 dist_systemunit_DATA += \
 dist_systemunit_DATA += \

-       units/org.freedesktop.DBus.busname \

        units/org.freedesktop.systemd1.busname
 
 BUSNAMES_TARGET_WANTS += \
        units/org.freedesktop.systemd1.busname
 
 BUSNAMES_TARGET_WANTS += \

-       org.freedesktop.DBus.busname \

        org.freedesktop.systemd1.busname
        org.freedesktop.systemd1.busname

-
-nodist_userunit_DATA += \
-       units/user/systemd-bus-driverd.service
-
-USER_BUSNAMES_TARGET_WANTS += \
-       org.freedesktop.DBus.busname
-
-USER_UNIT_ALIASES += \
-       $(systemunitdir)/org.freedesktop.DBus.busname org.freedesktop.DBus.busname

 endif
 
 endif
 

-EXTRA_DIST += \
-       units/systemd-bus-driverd.service.in \
-       units/user/systemd-bus-driverd.service.in
-

 # ------------------------------------------------------------------------------
 if ENABLE_LOCALED
 systemd_localed_SOURCES = \
 # ------------------------------------------------------------------------------
 if ENABLE_LOCALED
 systemd_localed_SOURCES = \


@@ -4162,6 +4146,7 @@ noinst_LTLIBRARIES += \
        libsystemd-networkd-core.la
 
 libsystemd_networkd_core_la_SOURCES = \
        libsystemd-networkd-core.la
 
 libsystemd_networkd_core_la_SOURCES = \

+       src/libsystemd-network/network-internal.h \

        src/network/networkd.h \
        src/network/networkd-link.c \
        src/network/networkd-netdev.c \
        src/network/networkd.h \
        src/network/networkd-link.c \
        src/network/networkd-netdev.c \


@@ -4182,16 +4167,20 @@ libsystemd_networkd_core_la_LIBADD = \
        libsystemd-shared.la
 
 nodist_systemunit_DATA += \
        libsystemd-shared.la
 
 nodist_systemunit_DATA += \

-       units/systemd-networkd.service
+       units/systemd-networkd.service \
+       units/systemd-networkd-wait-online.service

 
 GENERAL_ALIASES += \
 
 GENERAL_ALIASES += \

-       $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service
+       $(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

 
 rootlibexec_PROGRAMS += \
        systemd-networkd-wait-online
 
 systemd_networkd_wait_online_SOURCES = \
 
 rootlibexec_PROGRAMS += \
        systemd-networkd-wait-online
 
 systemd_networkd_wait_online_SOURCES = \

-       src/network/networkd-wait-online.c
+       src/libsystemd-network/network-internal.h \
+       src/network/networkd-wait-online.c \
+       src/network/networkd-wait-online.h

 
 systemd_networkd_wait_online_LDADD = \
        libsystemd-internal.la \
 
 systemd_networkd_wait_online_LDADD = \
        libsystemd-internal.la \