linux-gen: include only ODP defines in autogenerated header files

The config.h file has been split into three parts:

  autoheader_build.h: should NOT be included by ANY source file

  autoheader_external.h: can be included by any source file, including
public headers

  autoheader_internal.h: can be included by any internal source file, but
NOT by public headers

autoheader_external.h and autoheader_internal.h are generated based on
matching template files (*.in) and include only ODP defines.
autoheader_build.h includes all build defines and should not be included
by any source file.

Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>

12 files changed, 14 insertions, 12 deletions

diff --git a/platform/linux-generic/include/odp_debug_internal.h b/platform/linux-generic/include/odp_debug_internal.h
index 2ef5a24a8..e1395c19f 100644
--- a/platform/linux-generic/include/odp_debug_internal.h
+++ b/platform/linux-generic/include/odp_debug_internal.h
@@ -16,7 +16,7 @@
 #ifndef ODP_DEBUG_INTERNAL_H_
 #define ODP_DEBUG_INTERNAL_H_
 
-#include <odp/config.h>
+#include <odp/autoheader_external.h>
 #include <odp/api/debug.h>
 #include <odp_global_data.h>
 
diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h
index b36000d78..00b0fca36 100644
--- a/platform/linux-generic/include/odp_packet_io_internal.h
+++ b/platform/linux-generic/include/odp_packet_io_internal.h
@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#include <odp/config.h>
+#include <odp/autoheader_internal.h>
 
 #include <odp/api/packet_io.h>
 #include <odp/api/plat/pktio_inlines.h>
diff --git a/platform/linux-generic/odp_impl.c b/platform/linux-generic/odp_impl.c
index 855f29358..421766a30 100644
--- a/platform/linux-generic/odp_impl.c
+++ b/platform/linux-generic/odp_impl.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/config.h>
+#include <odp/autoheader_internal.h>
 #include <odp/api/version.h>
 
 #define ODP_VERSION_IMPL 0
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index d2327cff1..4518706f0 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/config.h>
+#include <odp/autoheader_external.h>
 
 #include <odp/api/packet.h>
 #include <odp/api/plat/packet_inlines.h>
diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c
index 0710b718a..22e9c1b21 100644
--- a/platform/linux-generic/odp_packet_io.c
+++ b/platform/linux-generic/odp_packet_io.c
@@ -7,7 +7,7 @@
 
 #include <odp_posix_extensions.h>
 
-#include <odp/config.h>
+#include <odp/autoheader_internal.h>
 #include <odp/api/packet_io.h>
 #include <odp/api/plat/pktio_inlines.h>
 #include <odp_packet_io_internal.h>
diff --git a/platform/linux-generic/odp_pcapng.c b/platform/linux-generic/odp_pcapng.c
index 09cb91b1d..92fe3933c 100644
--- a/platform/linux-generic/odp_pcapng.c
+++ b/platform/linux-generic/odp_pcapng.c
@@ -5,7 +5,9 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/config.h>
+#include <odp_posix_extensions.h>
+
+#include <odp/autoheader_internal.h>
 
 #if defined(_ODP_PCAPNG) && _ODP_PCAPNG == 1
 
diff --git a/platform/linux-generic/odp_queue_if.c b/platform/linux-generic/odp_queue_if.c
index f9df5c763..720a7f7bc 100644
--- a/platform/linux-generic/odp_queue_if.c
+++ b/platform/linux-generic/odp_queue_if.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/config.h>
+#include <odp/autoheader_internal.h>
 
 #include <odp_queue_if.h>
 #include <odp_init_internal.h>
diff --git a/platform/linux-generic/odp_schedule_if.c b/platform/linux-generic/odp_schedule_if.c
index 083950844..82a712d27 100644
--- a/platform/linux-generic/odp_schedule_if.c
+++ b/platform/linux-generic/odp_schedule_if.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/config.h>
+#include <odp/autoheader_internal.h>
 
 #include <odp_schedule_if.h>
 #include <odp_init_internal.h>
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index 948ffda8f..13052286e 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/config.h>
+#include <odp/autoheader_internal.h>
 
 #ifdef ODP_PKTIO_DPDK
 
diff --git a/platform/linux-generic/pktio/dpdk_parse.c b/platform/linux-generic/pktio/dpdk_parse.c
index 3dee44b87..c7f9d1901 100644
--- a/platform/linux-generic/pktio/dpdk_parse.c
+++ b/platform/linux-generic/pktio/dpdk_parse.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/config.h>
+#include <odp/autoheader_internal.h>
 
 #ifdef ODP_PKTIO_DPDK
 
diff --git a/platform/linux-generic/pktio/io_ops.c b/platform/linux-generic/pktio/io_ops.c
index 9e1ab74ce..e5cffd73a 100644
--- a/platform/linux-generic/pktio/io_ops.c
+++ b/platform/linux-generic/pktio/io_ops.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/config.h>
+#include <odp/autoheader_internal.h>
 #include <odp_packet_io_internal.h>
 
 /* Ops for all implementation of pktio.
diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c
index 9767de2f2..7925c78eb 100644
--- a/platform/linux-generic/pktio/netmap.c
+++ b/platform/linux-generic/pktio/netmap.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/config.h>
+#include <odp/autoheader_internal.h>
 
 #ifdef ODP_NETMAP