X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=85b23250b16d6cd4379dd0a3da77699b2b6d546c;hp=22389a6b9069734520cd53e9761fab0da86b4673;hb=3fc047f43cd4e4a7cc6e7e49e12f1e2fd858b815;hpb=af6f0d422c521374ee6a2dd92df5935a5a476ae5

diff --git a/Makefile.am b/Makefile.am
index 22389a6b9..85b23250b 100644
--- 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
-linkdir=$(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)
@@ -619,6 +620,27 @@ EXTRA_DIST += \
 	make-directive-index.py \
 	xml_helper.py
 
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+	libsystemd-rtnl.la
+
+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-util.h \
+	src/libsystemd-rtnl/rtnl-util.c
+
+test_rtnl_SOURCES = \
+	src/libsystemd-rtnl/test-rtnl.c
+
+test_rtnl_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-rtnl.la
+
+tests += test-rtnl
+
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
 	libsystemd-shared.la
@@ -2195,6 +2217,9 @@ INSTALL_DIRS += \
 	$(sysconfdir)/udev/rules.d \
 	$(sysconfdir)/udev/hwdb.d
 
+dist_network_DATA = \
+	network/99-default.link
+
 dist_udevrules_DATA += \
 	rules/99-systemd.rules \
 	rules/42-usb-hid-pm.rules \
@@ -2209,7 +2234,6 @@ dist_udevrules_DATA += \
 	rules/75-net-description.rules \
 	rules/75-tty-description.rules \
 	rules/78-sound-card.rules \
-	rules/80-net-name-slot.rules \
 	rules/85-net-configure-link.rules \
 	rules/95-udev-late.rules
 
@@ -2291,11 +2315,14 @@ 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.c \
+	src/udev/net/link-config-parse.c \
+	src/udev/net/ethtool-util.h \
+	src/udev/net/ethtool-util.c
 
 nodist_libudev_core_la_SOURCES = \
 	src/udev/keyboard-keys-from-name.h \
@@ -2323,6 +2350,8 @@ libudev_core_la_LIBADD = \
 	libsystemd-label.la \
 	libsystemd-daemon-internal.la \
 	libsystemd-shared.la \
+	libsystemd-rtnl.la \
+	libsystemd-id128-internal.la \
 	$(BLKID_LIBS) \
 	$(KMOD_LIBS)
 
@@ -4467,8 +4496,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 \