Move private header files to <netlink-private/*>

This clarifies the seperation between public and private
header files.

Signed-off-by: Thomas Graf <tgraf@suug.ch>

11 files changed, 33 insertions, 53 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 50d1e4e..50f96b7 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -116,12 +116,11 @@ noinst_HEADERS = \
 	linux/rtnetlink.h \
 	linux/snmp.h \
 	linux/tc_ematch/tc_em_meta.h \
-	netlink-generic.h \
-	netlink-local.h \
-	netlink-tc.h \
-	netlink-types.h \
-	netlink/cache-api.h \
-	netlink/object-api.h \
-	netlink/route/link/api.h \
-	netlink/route/link/info-api.h \
-	netlink/route/tc-api.h
+	netlink-private/genl.h \
+	netlink-private/netlink.h \
+	netlink-private/tc.h \
+	netlink-private/types.h \
+	netlink-private/cache-api.h \
+	netlink-private/object-api.h \
+	netlink-private/route/link/api.h \
+	netlink-private/route/tc-api.h
diff --git a/include/netlink/cache-api.h b/include/netlink-private/cache-api.h
index 493a551..5d9b0ad 100644
--- a/include/netlink/cache-api.h
+++ b/include/netlink-private/cache-api.h
@@ -1,12 +1,12 @@
 /*
- * netlink/cache-api.h		Caching API
+ * netlink-private/cache-api.h		Caching API
  *
  *	This library is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Lesser General Public
  *	License as published by the Free Software Foundation version 2.1
  *	of the License.
  *
- * Copyright (c) 2003-2012 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 #ifndef NETLINK_CACHE_API_H_
diff --git a/include/netlink-generic.h b/include/netlink-private/genl.h
index 10aa2f0..0aca6d7 100644
--- a/include/netlink-generic.h
+++ b/include/netlink-private/genl.h
@@ -1,18 +1,18 @@
 /*
- * netlink-generic.h	Local Generic Netlink Interface
+ * netlink-private/genl.h	Local Generic Netlink Interface
  *
  *	This library is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Lesser General Public
  *	License as published by the Free Software Foundation version 2.1
  *	of the License.
  *
- * Copyright (c) 2003-2006 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 #ifndef NETLINK_GENL_PRIV_H_
 #define NETLINK_GENL_PRIV_H_
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 #include <netlink/netlink.h>
 
 #define GENL_HDRSIZE(hdrlen) (GENL_HDRLEN + (hdrlen))
diff --git a/include/netlink-local.h b/include/netlink-private/netlink.h
index c0915f8..6ae6d17 100644
--- a/include/netlink-local.h
+++ b/include/netlink-private/netlink.h
@@ -1,12 +1,12 @@
 /*
- * netlink-local.h		Local Netlink Interface
+ * netlink-private/netlink.h	Local Netlink Interface
  *
  *	This library is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Lesser General Public
  *	License as published by the Free Software Foundation version 2.1
  *	of the License.
  *
- * Copyright (c) 2003-2011 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 #ifndef NETLINK_LOCAL_H_
@@ -63,9 +63,9 @@
 #include <netlink/handlers.h>
 #include <netlink/cache.h>
 #include <netlink/route/tc.h>
-#include <netlink/object-api.h>
-#include <netlink/cache-api.h>
-#include <netlink-types.h>
+#include <netlink-private/object-api.h>
+#include <netlink-private/cache-api.h>
+#include <netlink-private/types.h>
 
 struct trans_tbl {
 	int i;
diff --git a/include/netlink/object-api.h b/include/netlink-private/object-api.h
index ae6180a..f4fd71e 100644
--- a/include/netlink/object-api.h
+++ b/include/netlink-private/object-api.h
@@ -1,12 +1,12 @@
 /*
- * netlink/object-api.c		Object API
+ * netlink-private/object-api.c		Object API
  *
  *	This library is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Lesser General Public
  *	License as published by the Free Software Foundation version 2.1
  *	of the License.
  *
- * Copyright (c) 2003-2007 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 #ifndef NETLINK_OBJECT_API_H_
@@ -14,6 +14,7 @@
 
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
+#include <netlink/object.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink/route/link/api.h b/include/netlink-private/route/link/api.h
index 28f2464..bb98ccc 100644
--- a/include/netlink/route/link/api.h
+++ b/include/netlink-private/route/link/api.h
@@ -1,12 +1,12 @@
 /*
- * netlink/route/link/api.h	Link Modules API
+ * netlink-private/route/link/api.h	Link Modules API
  *
  *	This library is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Lesser General Public
  *	License as published by the Free Software Foundation version 2.1
  *	of the License.
  *
- * Copyright (c) 2003-2010 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 #ifndef NETLINK_LINK_API_H_
diff --git a/include/netlink/route/tc-api.h b/include/netlink-private/route/tc-api.h
index 601a8df..bf0c8a3 100644
--- a/include/netlink/route/tc-api.h
+++ b/include/netlink-private/route/tc-api.h
@@ -1,12 +1,12 @@
 /*
- * netlink/route/tc-api.h	Traffic Control API
+ * netlink-private/route/tc-api.h	Traffic Control API
  *
  *	This library is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Lesser General Public
  *	License as published by the Free Software Foundation version 2.1
  *	of the License.
  *
- * Copyright (c) 2011 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2011-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 #ifndef NETLINK_TC_API_H_
@@ -20,8 +20,6 @@
 extern "C" {
 #endif
 
-#define RTNL_TC_TYPE_MAX (__RTNL_TC_TYPE_MAX - 1)
-
 /**
  * Traffic control object operations
  * @ingroup tc
diff --git a/include/netlink-tc.h b/include/netlink-private/tc.h
index 3e44642..182adaa 100644
--- a/include/netlink-tc.h
+++ b/include/netlink-private/tc.h
@@ -1,18 +1,18 @@
 /*
- * netlink-tc.h		Local Traffic Control Interface
+ * netlink-private/tc.h		Local Traffic Control Interface
  *
  *	This library is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Lesser General Public
  *	License as published by the Free Software Foundation version 2.1
  *	of the License.
  *
- * Copyright (c) 2003-2010 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 #ifndef NETLINK_TC_PRIV_H_
 #define NETLINK_TC_PRIV_H_
 
-#include <netlink-local.h>
+#include <netlink-private/netlink.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/netlink-types.h b/include/netlink-private/types.h
index 46856a3..60a3bce 100644
--- a/include/netlink-types.h
+++ b/include/netlink-private/types.h
@@ -1,12 +1,12 @@
 /*
- * netlink-types.h	Netlink Types (Private)
+ * netlink-private/types.h	Netlink Types (Private)
  *
  *	This library is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Lesser General Public
  *	License as published by the Free Software Foundation version 2.1
  *	of the License.
  *
- * Copyright (c) 2003-2012 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2013 Thomas Graf <tgraf@suug.ch>
  */
 
 #ifndef NETLINK_LOCAL_TYPES_H_
@@ -17,7 +17,7 @@
 #include <netlink/route/qdisc.h>
 #include <netlink/route/rtnl.h>
 #include <netlink/route/route.h>
-#include <netlink/route/tc-api.h>
+#include <netlink-private/route/tc-api.h>
 
 #define NL_SOCK_BUFSIZE_SET	(1<<0)
 #define NL_SOCK_PASSCRED	(1<<1)
diff --git a/include/netlink/route/link/info-api.h b/include/netlink/route/link/info-api.h
deleted file mode 100644
index 4750e18..0000000
--- a/include/netlink/route/link/info-api.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * netlink/route/link/info-api.h	Link Info API
- *
- *	This library is free software; you can redistribute it and/or
- *	modify it under the terms of the GNU Lesser General Public
- *	License as published by the Free Software Foundation version 2.1
- *	of the License.
- *
- * Copyright (c) 2003-2010 Thomas Graf <tgraf@suug.ch>
- */
-
-#ifndef NETLINK_LINK_INFO_API_H_
-#define NETLINK_LINK_INFO_API_H_
-
-#warning "<netlink/route/link/info-api.h> is obsolete and may be removed in the future."
-#warning "include <netlink/route/link/api.h> instead.
-
-#include <netlink/route/link/api.h>
-
-#endif
diff --git a/include/netlink/route/tc.h b/include/netlink/route/tc.h
index caee60c..836f7b1 100644
--- a/include/netlink/route/tc.h
+++ b/include/netlink/route/tc.h
@@ -30,6 +30,8 @@ enum rtnl_tc_type {
 	__RTNL_TC_TYPE_MAX,
 };
 
+#define RTNL_TC_TYPE_MAX (__RTNL_TC_TYPE_MAX - 1)
+
 /**
  * Compute tc handle based on major and minor parts
  * @ingroup tc