aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore8
-rw-r--r--configure.ac2
-rw-r--r--helper/include/odp/helper/odph_debug.h2
-rw-r--r--helper/test/debug.c2
-rw-r--r--include/Makefile.am2
-rw-r--r--include/odp/autoheader_external.h.in17
-rw-r--r--include/odp/autoheader_internal.h.in29
-rw-r--r--platform/linux-generic/include/odp_debug_internal.h2
-rw-r--r--platform/linux-generic/include/odp_packet_io_internal.h2
-rw-r--r--platform/linux-generic/odp_impl.c2
-rw-r--r--platform/linux-generic/odp_packet.c2
-rw-r--r--platform/linux-generic/odp_packet_io.c2
-rw-r--r--platform/linux-generic/odp_pcapng.c4
-rw-r--r--platform/linux-generic/odp_queue_if.c2
-rw-r--r--platform/linux-generic/odp_schedule_if.c2
-rw-r--r--platform/linux-generic/pktio/dpdk.c2
-rw-r--r--platform/linux-generic/pktio/dpdk_parse.c2
-rw-r--r--platform/linux-generic/pktio/io_ops.c2
-rw-r--r--platform/linux-generic/pktio/netmap.c2
19 files changed, 69 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore
index b5856a50c..772c551f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,9 +38,11 @@ depcomp
doc/output
dpdk/
install-sh
-include/odp/config.h.in
-include/odp/config.h
-include/odp/stamp-h1
+include/odp/autoheader_build.h.in
+include/odp/autoheader_build.h
+include/odp/autoheader_external.h
+include/odp/autoheader_internal.h
+include/odp/stamp-h*
lib/
libtool
ltmain.sh
diff --git a/configure.ac b/configure.ac
index 806a4dcd1..901c642f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ AS_IF([test "$ac_cv_env_CFLAGS_set" = ""], [user_cflags=0], [user_cflags=1])
# Initialize automake
AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects foreign nostdinc -Wall -Werror])
AC_CONFIG_SRCDIR([include/odp/api/spec/init.h])
-AM_CONFIG_HEADER([include/odp/config.h])
+AM_CONFIG_HEADER([include/odp/autoheader_build.h include/odp/autoheader_external.h include/odp/autoheader_internal.h])
AC_USE_SYSTEM_EXTENSIONS
AC_SYS_LARGEFILE
diff --git a/helper/include/odp/helper/odph_debug.h b/helper/include/odp/helper/odph_debug.h
index 370a0fa12..2fa89d8ab 100644
--- a/helper/include/odp/helper/odph_debug.h
+++ b/helper/include/odp/helper/odph_debug.h
@@ -15,7 +15,7 @@
#ifndef ODPH_DEBUG_H_
#define ODPH_DEBUG_H_
-#include <odp/config.h>
+#include <odp/autoheader_external.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/helper/test/debug.c b/helper/test/debug.c
index 48d4462c9..2431b0ecd 100644
--- a/helper/test/debug.c
+++ b/helper/test/debug.c
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#include <odp/config.h>
+#include <odp/autoheader_external.h>
#include <odp_api.h>
#include <odp/helper/odph_api.h>
diff --git a/include/Makefile.am b/include/Makefile.am
index ed33e7c8e..c3e42b96e 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -4,7 +4,7 @@ include_HEADERS = \
odpincludedir= $(includedir)/odp
odpinclude_HEADERS = \
- odp/config.h \
+ odp/autoheader_external.h \
odp/visibility_begin.h \
odp/visibility_end.h
diff --git a/include/odp/autoheader_external.h.in b/include/odp/autoheader_external.h.in
new file mode 100644
index 000000000..15626898d
--- /dev/null
+++ b/include/odp/autoheader_external.h.in
@@ -0,0 +1,17 @@
+
+#ifndef ODP_AUTOHEADER_EXTERNAL_H_
+#define ODP_AUTOHEADER_EXTERNAL_H_
+
+/* Define to 1 to include additional debug code */
+#undef ODP_DEBUG
+
+/* Define to 1 to display debug information */
+#undef ODP_DEBUG_PRINT
+
+/* Define to 1 to include additional helper debug code */
+#undef ODPH_DEBUG
+
+/* Define to 1 to display helper debug information */
+#undef ODPH_DEBUG_PRINT
+
+#endif
diff --git a/include/odp/autoheader_internal.h.in b/include/odp/autoheader_internal.h.in
new file mode 100644
index 000000000..4d1d17f4f
--- /dev/null
+++ b/include/odp/autoheader_internal.h.in
@@ -0,0 +1,29 @@
+
+#ifndef ODP_AUTOHEADER_INTERNAL_H_
+#define ODP_AUTOHEADER_INTERNAL_H_
+
+/* Define to the name of the implementation */
+#undef ODP_IMPLEMENTATION_NAME
+
+/* Define to name default scheduler */
+#undef ODP_SCHEDULE_DEFAULT
+
+/* Define to 1 if numa library is usable */
+#undef _ODP_HAVE_NUMA_LIBRARY
+
+/* Define to 1 to enable DPDK zero copy support */
+#undef ODP_DPDK_ZERO_COPY
+
+/* Define to 1 to enable netmap IO support */
+#undef ODP_NETMAP
+
+/* Define to 1 to enable DPDK packet I/O support */
+#undef ODP_PKTIO_DPDK
+
+/* Define to 1 to enable pcap packet I/O support */
+#undef _ODP_PKTIO_PCAP
+
+/* Define to 1 to enable pcapng support */
+#undef _ODP_PCAPNG
+
+#endif
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