X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=85b23250b16d6cd4379dd0a3da77699b2b6d546c;hp=bb182173f71202638d11a325c72bc13892874c19;hb=ae7bed3f2d1823e82984e757872b3b753d5c869b;hpb=3716e8c99c25e7f65d7eff3a131cc459f66ec4eb

diff --git a/Makefile.am b/Makefile.am
index bb182173f..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
-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 \
@@ -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
 
@@ -4492,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 \