build: move copy of linux headers to private directory

libnl3 contains a private copy of some kernel header files.

Normally, users are expected to install libnl and specify
-I$PREFIX/include/libnl3 as include path. As the private kernel
header files are not installed, this works fine.

However, it can be convenient to build against the libnl source
directory, without installing libnl. In this case, the private kernel
header files shaddow the system provided ones. This is undesired.

Move these files to a different directory to avoid this clash.

http://lists.infradead.org/pipermail/libnl/2014-September/001645.html

Signed-off-by: Thomas Haller <thaller@redhat.com>
Acked-by: Thomas Graf <tgraf@suug.ch>

37 files changed, 35 insertions, 31 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 74bbd5a..82684a1 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -120,37 +120,37 @@ nobase_libnlinclude_HEADERS += \
 endif
 
 noinst_HEADERS = \
-	linux/fib_rules.h \
-	linux/genetlink.h \
-	linux/gen_stats.h \
-	linux/if_addr.h \
-	linux/if_arp.h \
-	linux/if_ether.h \
-	linux/if.h \
-	linux/if_bridge.h \
-	linux/if_link.h \
-	linux/if_tunnel.h \
-	linux/if_vlan.h \
-	linux/ip.h \
-	linux/ip_mp_alg.h \
-	linux/ipv6.h \
-	linux/can/netlink.h \
-	linux/neighbour.h \
-	linux/netfilter.h \
-	linux/netfilter/nf_conntrack_common.h \
-	linux/netfilter/nfnetlink_compat.h \
-	linux/netfilter/nfnetlink_conntrack.h \
-	linux/netfilter/nfnetlink.h \
-	linux/netfilter/nfnetlink_log.h \
-	linux/netfilter/nfnetlink_queue.h \
-	linux/netlink.h \
-	linux/pkt_cls.h \
-	linux/tc_act/tc_mirred.h \
-	linux/pkt_sched.h \
-	linux/rtnetlink.h \
-	linux/snmp.h \
-	linux/xfrm.h \
-	linux/tc_ematch/tc_em_meta.h \
+	linux-private/linux/fib_rules.h \
+	linux-private/linux/genetlink.h \
+	linux-private/linux/gen_stats.h \
+	linux-private/linux/if_addr.h \
+	linux-private/linux/if_arp.h \
+	linux-private/linux/if_ether.h \
+	linux-private/linux/if.h \
+	linux-private/linux/if_bridge.h \
+	linux-private/linux/if_link.h \
+	linux-private/linux/if_tunnel.h \
+	linux-private/linux/if_vlan.h \
+	linux-private/linux/ip.h \
+	linux-private/linux/ip_mp_alg.h \
+	linux-private/linux/ipv6.h \
+	linux-private/linux/can/netlink.h \
+	linux-private/linux/neighbour.h \
+	linux-private/linux/netfilter.h \
+	linux-private/linux/netfilter/nf_conntrack_common.h \
+	linux-private/linux/netfilter/nfnetlink_compat.h \
+	linux-private/linux/netfilter/nfnetlink_conntrack.h \
+	linux-private/linux/netfilter/nfnetlink.h \
+	linux-private/linux/netfilter/nfnetlink_log.h \
+	linux-private/linux/netfilter/nfnetlink_queue.h \
+	linux-private/linux/netlink.h \
+	linux-private/linux/pkt_cls.h \
+	linux-private/linux/tc_act/tc_mirred.h \
+	linux-private/linux/pkt_sched.h \
+	linux-private/linux/rtnetlink.h \
+	linux-private/linux/snmp.h \
+	linux-private/linux/xfrm.h \
+	linux-private/linux/tc_ematch/tc_em_meta.h \
 	netlink-private/genl.h \
 	netlink-private/netlink.h \
 	netlink-private/socket.h \
diff --git a/include/linux/can/netlink.h b/include/linux-private/linux/can/netlink.h
index 14966dd..14966dd 100644
--- a/include/linux/can/netlink.h
+++ b/include/linux-private/linux/can/netlink.h
diff --git a/include/linux/fib_rules.h b/include/linux-private/linux/fib_rules.h
index ed4504a..ed4504a 100644
--- a/include/linux/fib_rules.h
+++ b/include/linux-private/linux/fib_rules.h
diff --git a/include/linux/gen_stats.h b/include/linux-private/linux/gen_stats.h
index 552c8a0..552c8a0 100644
--- a/include/linux/gen_stats.h
+++ b/include/linux-private/linux/gen_stats.h
diff --git a/include/linux/genetlink.h b/include/linux-private/linux/genetlink.h
index b834ef6..b834ef6 100644
--- a/include/linux/genetlink.h
+++ b/include/linux-private/linux/genetlink.h
diff --git a/include/linux/if.h b/include/linux-private/linux/if.h
index 238cf43..238cf43 100644
--- a/include/linux/if.h
+++ b/include/linux-private/linux/if.h
diff --git a/include/linux/if_addr.h b/include/linux-private/linux/if_addr.h
index 7d4de85..7d4de85 100644
--- a/include/linux/if_addr.h
+++ b/include/linux-private/linux/if_addr.h
diff --git a/include/linux/if_arp.h b/include/linux-private/linux/if_arp.h
index e04cd2c..e04cd2c 100644
--- a/include/linux/if_arp.h
+++ b/include/linux-private/linux/if_arp.h
diff --git a/include/linux/if_bridge.h b/include/linux-private/linux/if_bridge.h
index 5db2975..5db2975 100644
--- a/include/linux/if_bridge.h
+++ b/include/linux-private/linux/if_bridge.h
diff --git a/include/linux/if_ether.h b/include/linux-private/linux/if_ether.h
index a6af32d..a6af32d 100644
--- a/include/linux/if_ether.h
+++ b/include/linux-private/linux/if_ether.h
diff --git a/include/linux/if_link.h b/include/linux-private/linux/if_link.h
index ff95760..ff95760 100644
--- a/include/linux/if_link.h
+++ b/include/linux-private/linux/if_link.h
diff --git a/include/linux/if_tunnel.h b/include/linux-private/linux/if_tunnel.h
index aee73d0..aee73d0 100644
--- a/include/linux/if_tunnel.h
+++ b/include/linux-private/linux/if_tunnel.h
diff --git a/include/linux/if_vlan.h b/include/linux-private/linux/if_vlan.h
index 67affd1..67affd1 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux-private/linux/if_vlan.h
diff --git a/include/linux/ip.h b/include/linux-private/linux/ip.h
index 4119594..4119594 100644
--- a/include/linux/ip.h
+++ b/include/linux-private/linux/ip.h
diff --git a/include/linux/ip_mp_alg.h b/include/linux-private/linux/ip_mp_alg.h
index e234e20..e234e20 100644
--- a/include/linux/ip_mp_alg.h
+++ b/include/linux-private/linux/ip_mp_alg.h
diff --git a/include/linux/ipv6.h b/include/linux-private/linux/ipv6.h
index f16349d..f16349d 100644
--- a/include/linux/ipv6.h
+++ b/include/linux-private/linux/ipv6.h
diff --git a/include/linux/neighbour.h b/include/linux-private/linux/neighbour.h
index a7003b7..a7003b7 100644
--- a/include/linux/neighbour.h
+++ b/include/linux-private/linux/neighbour.h
diff --git a/include/linux/netfilter.h b/include/linux-private/linux/netfilter.h
index 7999885..7999885 100644
--- a/include/linux/netfilter.h
+++ b/include/linux-private/linux/netfilter.h
diff --git a/include/linux/netfilter/nf_conntrack_common.h b/include/linux-private/linux/netfilter/nf_conntrack_common.h
index 1644cdd..1644cdd 100644
--- a/include/linux/netfilter/nf_conntrack_common.h
+++ b/include/linux-private/linux/netfilter/nf_conntrack_common.h
diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux-private/linux/netfilter/nfnetlink.h
index 4a4efaf..4a4efaf 100644
--- a/include/linux/netfilter/nfnetlink.h
+++ b/include/linux-private/linux/netfilter/nfnetlink.h
diff --git a/include/linux/netfilter/nfnetlink_compat.h b/include/linux-private/linux/netfilter/nfnetlink_compat.h
index ffb9503..ffb9503 100644
--- a/include/linux/netfilter/nfnetlink_compat.h
+++ b/include/linux-private/linux/netfilter/nfnetlink_compat.h
diff --git a/include/linux/netfilter/nfnetlink_conntrack.h b/include/linux-private/linux/netfilter/nfnetlink_conntrack.h
index 43bfe3e..43bfe3e 100644
--- a/include/linux/netfilter/nfnetlink_conntrack.h
+++ b/include/linux-private/linux/netfilter/nfnetlink_conntrack.h
diff --git a/include/linux/netfilter/nfnetlink_log.h b/include/linux-private/linux/netfilter/nfnetlink_log.h
index 2cfbf13..2cfbf13 100644
--- a/include/linux/netfilter/nfnetlink_log.h
+++ b/include/linux-private/linux/netfilter/nfnetlink_log.h
diff --git a/include/linux/netfilter/nfnetlink_queue.h b/include/linux-private/linux/netfilter/nfnetlink_queue.h
index 95af967..95af967 100644
--- a/include/linux/netfilter/nfnetlink_queue.h
+++ b/include/linux-private/linux/netfilter/nfnetlink_queue.h
diff --git a/include/linux/netlink.h b/include/linux-private/linux/netlink.h
index 3925254..3925254 100644
--- a/include/linux/netlink.h
+++ b/include/linux-private/linux/netlink.h
diff --git a/include/linux/pkt_cls.h b/include/linux-private/linux/pkt_cls.h
index defbde2..defbde2 100644
--- a/include/linux/pkt_cls.h
+++ b/include/linux-private/linux/pkt_cls.h
diff --git a/include/linux/pkt_sched.h b/include/linux-private/linux/pkt_sched.h
index a0837a0..a0837a0 100644
--- a/include/linux/pkt_sched.h
+++ b/include/linux-private/linux/pkt_sched.h
diff --git a/include/linux/rtnetlink.h b/include/linux-private/linux/rtnetlink.h
index 2363c18..2363c18 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux-private/linux/rtnetlink.h
diff --git a/include/linux/snmp.h b/include/linux-private/linux/snmp.h
index 1bdb4a3..1bdb4a3 100644
--- a/include/linux/snmp.h
+++ b/include/linux-private/linux/snmp.h
diff --git a/include/linux/tc_act/tc_mirred.h b/include/linux-private/linux/tc_act/tc_mirred.h
index 7561750..7561750 100644
--- a/include/linux/tc_act/tc_mirred.h
+++ b/include/linux-private/linux/tc_act/tc_mirred.h
diff --git a/include/linux/tc_ematch/tc_em_meta.h b/include/linux-private/linux/tc_ematch/tc_em_meta.h
index fe815e2..fe815e2 100644
--- a/include/linux/tc_ematch/tc_em_meta.h
+++ b/include/linux-private/linux/tc_ematch/tc_em_meta.h
diff --git a/include/linux/veth.h b/include/linux-private/linux/veth.h
index 3354c1e..3354c1e 100644
--- a/include/linux/veth.h
+++ b/include/linux-private/linux/veth.h
diff --git a/include/linux/xfrm.h b/include/linux-private/linux/xfrm.h
index 0aa3805..0aa3805 100644
--- a/include/linux/xfrm.h
+++ b/include/linux-private/linux/xfrm.h
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 2567323..f7e5a93 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,6 +2,7 @@
 
 AM_CPPFLAGS  =			 	\
 	-Wall \
+	-I${top_srcdir}/include/linux-private \
 	-I${top_srcdir}/include \
 	-I${top_builddir}/include \
 	-I${builddir}/route \
diff --git a/src/Makefile.am b/src/Makefile.am
index ea4bf45..624046f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,7 @@
 SUBDIRS = lib
 
 AM_CPPFLAGS  = \
+	-I${top_srcdir}/include/linux-private \
 	-I${top_srcdir}/include \
 	-I${top_builddir}/include \
 	-D_GNU_SOURCE \
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 4b9b4a9..27c74fd 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,6 +1,7 @@
 # -*- Makefile -*-
 
 AM_CPPFLAGS  = \
+	-I${top_srcdir}/include/linux-private \
 	-I${top_srcdir}/include \
 	-I${top_builddir}/include \
 	-D_GNU_SOURCE \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c016bb8..8d1da59 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -7,6 +7,7 @@ if ENABLE_UNIT_TESTS
 
 AM_CPPFLAGS = \
 	-Wall \
+	-I${top_srcdir}/include/linux-private \
 	-I${top_srcdir}/include \
 	-I${top_builddir}/include \
 	-D_GNU_SOURCE \