route: move "include/netlink-private/route/nexthop-encap.h" to lib/route

8 files changed, 9 insertions, 7 deletions

diff --git a/Makefile.am b/Makefile.am
index e07796e..996a876 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -275,7 +275,6 @@ noinst_HEADERS = \
 	include/netlink-private/netlink.h \
 	include/netlink-private/object-api.h \
 	include/netlink-private/route/link/sriov.h \
-	include/netlink-private/route/nexthop-encap.h \
 	include/netlink-private/socket.h \
 	include/netlink-private/types.h \
 	include/nl-aux-core/nl-core.h \
@@ -436,6 +435,7 @@ lib_libnl_route_3_la_SOURCES = \
 	lib/route/neigh.c \
 	lib/route/neightbl.c \
 	lib/route/netconf.c \
+	lib/route/nexthop-encap.h \
 	lib/route/nexthop.c \
 	lib/route/nexthop_encap.c \
 	lib/route/nh.c \
diff --git a/include/netlink-private/types.h b/include/netlink-private/types.h
index bb31c44..141801e 100644
--- a/include/netlink-private/types.h
+++ b/include/netlink-private/types.h
@@ -17,7 +17,6 @@
 #include <netlink-private/object-api.h>
 #include <netlink-private/route/link/sriov.h>
 #include <netlink/route/nh.h>
-#include <netlink-private/route/nexthop-encap.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 #include <linux/genetlink.h>
diff --git a/include/netlink-private/route/nexthop-encap.h b/lib/route/nexthop-encap.h
index dde1bfb..dde1bfb 100644
--- a/include/netlink-private/route/nexthop-encap.h
+++ b/lib/route/nexthop-encap.h
diff --git a/lib/route/nexthop.c b/lib/route/nexthop.c
index 37f2f4d..92c3b0b 100644
--- a/lib/route/nexthop.c
+++ b/lib/route/nexthop.c
@@ -10,12 +10,13 @@
  */
 
 #include <netlink-private/netlink.h>
-#include <netlink-private/route/nexthop-encap.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/route.h>
 
+#include "nexthop-encap.h"
+
 /** @cond SKIP */
 #define NH_ATTR_FLAGS   0x000001
 #define NH_ATTR_WEIGHT  0x000002
diff --git a/lib/route/nexthop_encap.c b/lib/route/nexthop_encap.c
index 2382886..7251432 100644
--- a/lib/route/nexthop_encap.c
+++ b/lib/route/nexthop_encap.c
@@ -2,9 +2,10 @@
 
 #include <netlink-private/netlink.h>
 #include <netlink-private/types.h>
-#include <netlink-private/route/nexthop-encap.h>
 #include <linux/lwtunnel.h>
 
+#include "nexthop-encap.h"
+
 static struct lwtunnel_encap_type {
 	const char *name;
 	struct nh_encap_ops *ops;
diff --git a/lib/route/nh_encap_mpls.c b/lib/route/nh_encap_mpls.c
index d30acc2..fb13641 100644
--- a/lib/route/nh_encap_mpls.c
+++ b/lib/route/nh_encap_mpls.c
@@ -2,11 +2,12 @@
 
 #include <netlink-private/netlink.h>
 #include <netlink-private/types.h>
-#include <netlink-private/route/nexthop-encap.h>
 #include <netlink/route/nexthop.h>
 #include <linux/mpls_iptunnel.h>
 #include <linux/lwtunnel.h>
 
+#include "nexthop-encap.h"
+
 struct mpls_iptunnel_encap {
 	struct nl_addr *dst;
 	uint8_t ttl;
diff --git a/lib/route/route_obj.c b/lib/route/route_obj.c
index 594d446..5330bf8 100644
--- a/lib/route/route_obj.c
+++ b/lib/route/route_obj.c
@@ -27,7 +27,6 @@
 #include <linux/in_route.h>
 
 #include <netlink-private/netlink.h>
-#include <netlink-private/route/nexthop-encap.h>
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/utils.h>
@@ -39,6 +38,7 @@
 #include <netlink/route/nexthop.h>
 
 #include "nl-aux-route/nl-route.h"
+#include "nexthop-encap.h"
 
 /** @cond SKIP */
 #define ROUTE_ATTR_FAMILY    0x000001
diff --git a/tools/clang-format.sh b/tools/clang-format.sh
index 00f9137..673cbeb 100755
--- a/tools/clang-format.sh
+++ b/tools/clang-format.sh
@@ -18,7 +18,6 @@ EXCLUDE_PATHS_TOPLEVEL+=(
     "include/netlink-private/netlink.h"
     "include/netlink-private/object-api.h"
     "include/netlink-private/route/link/sriov.h"
-    "include/netlink-private/route/nexthop-encap.h"
     "include/netlink-private/socket.h"
     "include/netlink-private/types.h"
     "include/netlink/addr.h"
@@ -245,6 +244,7 @@ EXCLUDE_PATHS_TOPLEVEL+=(
     "lib/route/mdb.c"
     "lib/route/neigh.c"
     "lib/route/netconf.c"
+    "lib/route/nexthop-encap.h"
     "lib/route/nexthop.c"
     "lib/route/nexthop_encap.c"
     "lib/route/nh_encap_mpls.c"