udev: link-config - let udevd set the ifname

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4a96a500575a54faaf5a49e5662e9951dcb14617..bd7f577d4001a1dea48e00c1c85c46ddcc893a4e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,7 +83,7 @@ userunitdir=$(prefix)/lib/systemd/user
 userpresetdir=$(prefix)/lib/systemd/user-preset
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysctldir=$(prefix)/lib/sysctl.d
-linksdir=$(prefix)/lib/net/links
+networkdir=$(prefix)/lib/systemd/network
 pkgincludedir=$(includedir)/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
 usergeneratordir=$(prefix)/lib/systemd/user-generators
@@ -183,6 +183,7 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/udev/net \
        -I $(top_builddir)/src/udev \
        -I $(top_srcdir)/src/libsystemd-bus \
+       -I $(top_srcdir)/src/libsystemd-rtnl \
        $(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
@@ -627,7 +628,9 @@ libsystemd_rtnl_la_SOURCES = \
        src/systemd/sd-rtnl.h \
        src/libsystemd-rtnl/sd-rtnl.c \
        src/libsystemd-rtnl/rtnl-internal.h \
-       src/libsystemd-rtnl/rtnl-message.c
+       src/libsystemd-rtnl/rtnl-message.c \
+       src/libsystemd-rtnl/rtnl-util.h \
+       src/libsystemd-rtnl/rtnl-util.c
 
 test_rtnl_SOURCES = \
        src/libsystemd-rtnl/test-rtnl.c
@@ -2214,8 +2217,8 @@ INSTALL_DIRS += \
        $(sysconfdir)/udev/rules.d \
        $(sysconfdir)/udev/hwdb.d
 
-dist_links_DATA = \
-       links/99-default.link
+dist_network_DATA = \
+       network/99-default.link
 
 dist_udevrules_DATA += \
        rules/99-systemd.rules \
@@ -2231,7 +2234,7 @@ dist_udevrules_DATA += \
        rules/75-net-description.rules \
        rules/75-tty-description.rules \
        rules/78-sound-card.rules \
-       rules/85-net-configure-link.rules \
+       rules/80-net-setup-link.rules \
        rules/95-udev-late.rules
 
 dist_udevhwdb_DATA = \
@@ -2312,11 +2315,12 @@ libudev_core_la_SOURCES = \
        src/udev/udev-builtin-input_id.c \
        src/udev/udev-builtin-keyboard.c \
        src/udev/udev-builtin-net_id.c \
-       src/udev/udev-builtin-net_link.c \
+       src/udev/udev-builtin-net_setup_link.c \
        src/udev/udev-builtin-path_id.c \
        src/udev/udev-builtin-usb_id.c \
        src/udev/net/link-config.h \
        src/udev/net/link-config.c \
+       src/udev/net/link-config-parse.c \
        src/udev/net/ethtool-util.h \
        src/udev/net/ethtool-util.c
 
@@ -2347,6 +2351,7 @@ libudev_core_la_LIBADD = \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        libsystemd-rtnl.la \
+       libsystemd-id128-internal.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)
 
@@ -3687,9 +3692,6 @@ systemd_machined_SOURCES = \
        src/machine/machined.c \
        src/machine/machined.h
 
-systemd_machined_CFLAGS = \
-       $(libsystemd_machine_core_la_CFLAGS)
-
 systemd_machined_LDADD = \
        libsystemd-machine-core.la \
        $(libsystemd_machine_core_la_LIBADD)
@@ -3703,16 +3705,12 @@ libsystemd_machine_core_la_SOURCES = \
        src/machine/machine.h \
        src/machine/machine-dbus.c
 
-libsystemd_machine_core_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 libsystemd_machine_core_la_LIBADD = \
        libsystemd-label.la \
        libsystemd-audit.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
-       libsystemd-dbus.la \
+       libsystemd-bus.la \
        libsystemd-id128-internal.la \
        libudev.la
 
@@ -3728,8 +3726,7 @@ machinectl_CFLAGS = \
 
 machinectl_LDADD = \
        libsystemd-shared.la \
-       libsystemd-dbus.la \
-       libudev.la
+       libsystemd-bus.la
 
 rootbin_PROGRAMS += \
        machinectl
@@ -3737,10 +3734,6 @@ rootbin_PROGRAMS += \
 test_machine_tables_SOURCES = \
        src/machine/test-machine-tables.c
 
-test_machine_tables_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 test_machine_tables_LDADD = \
        libsystemd-machine-core.la
 
@@ -4491,8 +4484,8 @@ endif
 INSTALL_DIRS += \
        $(prefix)/lib/modules-load.d \
        $(sysconfdir)/modules-load.d \
-       $(prefix)/lib/net/links \
-       $(sysconfdir)/net/links \
+       $(prefix)/lib/systemd/network \
+       $(sysconfdir)/systemd/network \
        $(prefix)/lib/sysctl.d \
        $(sysconfdir)/sysctl.d \
        $(prefix)/lib/kernel/install.d \