From 623f13d8198b83df890f014b1d27255f4d78f35b Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Fri, 21 Oct 2016 03:00:49 -0400
Subject: wip

---
 src/grp-udev/libudev-core/net/Makefile             |  5 +++-
 src/grp-udev/libudev-core/net/ethtool-util.c       | 10 +++----
 src/grp-udev/libudev-core/net/ethtool-util.h       |  2 +-
 .../libudev-core/net/link-config-gperf.gperf       |  2 +-
 src/grp-udev/libudev-core/net/link-config.c        | 32 +++++++++++-----------
 src/grp-udev/libudev-core/net/link-config.h        |  4 +--
 6 files changed, 29 insertions(+), 26 deletions(-)

(limited to 'src/grp-udev/libudev-core/net')

diff --git a/src/grp-udev/libudev-core/net/Makefile b/src/grp-udev/libudev-core/net/Makefile
index 5ccbd00002..5094fa6050 100644
--- a/src/grp-udev/libudev-core/net/Makefile
+++ b/src/grp-udev/libudev-core/net/Makefile
@@ -24,7 +24,10 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-sd.CPPFLAGS += $(libshared.CPPFLAGS)
+sd.CPPFLAGS += $(libsystemd-internal.CPPFLAGS)
+sd.CPPFLAGS += $(libsystemd-basic.CPPFLAGS)
 sd.CPPFLAGS += $(libsystemd-network.CPPFLAGS)
+sd.CPPFLAGS += $(libsystemd-shared.CPPFLAGS)
+sd.CPPFLAGS += $(libsystemd-staging.CPPFLAGS)
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/libudev-core/net/ethtool-util.c b/src/grp-udev/libudev-core/net/ethtool-util.c
index b381284a6b..9c67e807ff 100644
--- a/src/grp-udev/libudev-core/net/ethtool-util.c
+++ b/src/grp-udev/libudev-core/net/ethtool-util.c
@@ -23,11 +23,11 @@
 #include <linux/ethtool.h>
 #include <linux/sockios.h>
 
-#include "basic/log.h"
-#include "basic/string-table.h"
-#include "basic/strxcpyx.h"
-#include "basic/util.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/strxcpyx.h"
+#include "systemd-basic/util.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "ethtool-util.h"
 
diff --git a/src/grp-udev/libudev-core/net/ethtool-util.h b/src/grp-udev/libudev-core/net/ethtool-util.h
index 7d103d9f2f..61699d4225 100644
--- a/src/grp-udev/libudev-core/net/ethtool-util.h
+++ b/src/grp-udev/libudev-core/net/ethtool-util.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/macro.h"
+#include "systemd-basic/macro.h"
 
 /* we can't use DUPLEX_ prefix, as it
  * clashes with <linux/ethtool.h> */
diff --git a/src/grp-udev/libudev-core/net/link-config-gperf.gperf b/src/grp-udev/libudev-core/net/link-config-gperf.gperf
index c84f4599ce..a75f6f8358 100644
--- a/src/grp-udev/libudev-core/net/link-config-gperf.gperf
+++ b/src/grp-udev/libudev-core/net/link-config-gperf.gperf
@@ -1,8 +1,8 @@
 %{
 #include <stddef.h>
 
-#include "shared/conf-parser.h"
 #include "systemd-network/network-internal.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "ethtool-util.h"
 #include "link-config.h"
diff --git a/src/grp-udev/libudev-core/net/link-config.c b/src/grp-udev/libudev-core/net/link-config.c
index f6803e00df..df06447e6c 100644
--- a/src/grp-udev/libudev-core/net/link-config.c
+++ b/src/grp-udev/libudev-core/net/link-config.c
@@ -19,25 +19,25 @@
 
 #include <netinet/ether.h>
 
-#include "basic/alloc-util.h"
-#include "basic/conf-files.h"
-#include "basic/fd-util.h"
-#include "basic/log.h"
-#include "basic/missing.h"
-#include "basic/parse-util.h"
-#include "basic/path-util.h"
-#include "basic/proc-cmdline.h"
-#include "basic/random-util.h"
-#include "basic/stat-util.h"
-#include "basic/string-table.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/util.h"
 #include "libudev-private.h"
 #include "sd-netlink/netlink-util.h"
-#include "sd-netlink/sd-netlink.h"
-#include "shared/conf-parser.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/conf-files.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/parse-util.h"
+#include "systemd-basic/path-util.h"
+#include "systemd-basic/proc-cmdline.h"
+#include "systemd-basic/random-util.h"
+#include "systemd-basic/stat-util.h"
+#include "systemd-basic/string-table.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/util.h"
 #include "systemd-network/network-internal.h"
+#include "systemd-shared/conf-parser.h"
+#include "systemd-staging/sd-netlink.h"
 
 #include "ethtool-util.h"
 #include "link-config.h"
diff --git a/src/grp-udev/libudev-core/net/link-config.h b/src/grp-udev/libudev-core/net/link-config.h
index ad5211610a..3fedc60f51 100644
--- a/src/grp-udev/libudev-core/net/link-config.h
+++ b/src/grp-udev/libudev-core/net/link-config.h
@@ -21,8 +21,8 @@
 
 #include <libudev.h>
 
-#include "basic/list.h"
-#include "shared/condition.h"
+#include "systemd-basic/list.h"
+#include "systemd-shared/condition.h"
 
 #include "ethtool-util.h"
 
-- 
cgit v1.2.3-54-g00ecf