X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=a06a79b958759f2e43ab659c28be3c8959457385;hb=276fc0668fdfd22ec3b38533e311e14969d42293;hp=2acd22beff57a1abcdd8e3034c7c169563c08cb2;hpb=16b9b87aeee9353b5b8dae6089a69752422a5b09;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 2acd22bef..a06a79b95 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
@@ -2214,8 +2214,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 +2312,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,7 +2348,7 @@ libudev_core_la_LIBADD = \
 	libsystemd-daemon-internal.la \
 	libsystemd-shared.la \
 	libsystemd-rtnl.la \
-	libsystemd-id128.la \
+	libsystemd-id128-internal.la \
 	$(BLKID_LIBS) \
 	$(KMOD_LIBS)
 
@@ -4492,8 +4493,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 \