helper: use odph_api.h for test include for unexported files

Adding the previously missing table functions to the public helper api
allows the tests to use just odph_api.h

Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
Reviewed-by: Christophe Milard <christophe.milard@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

13 files changed, 16 insertions, 13 deletions

diff --git a/helper/Makefile.am b/helper/Makefile.am
index 76cad1b7b..4d24a6913 100644
--- a/helper/Makefile.am
+++ b/helper/Makefile.am
@@ -20,6 +20,10 @@ helperinclude_HEADERS = \
 		  $(srcdir)/include/odp/helper/ip.h\
 		  $(srcdir)/include/odp/helper/ipsec.h\
 		  $(srcdir)/include/odp/helper/odph_api.h\
+		  $(srcdir)/include/odp/helper/odph_cuckootable.h\
+		  $(srcdir)/include/odp/helper/odph_hashtable.h\
+		  $(srcdir)/include/odp/helper/odph_iplookuptable.h\
+		  $(srcdir)/include/odp/helper/odph_lineartable.h\
 		  $(srcdir)/include/odp/helper/strong_types.h\
 		  $(srcdir)/include/odp/helper/tcp.h\
 		  $(srcdir)/include/odp/helper/table.h\
@@ -33,11 +37,7 @@ endif
 
 noinst_HEADERS = \
 		 $(srcdir)/odph_debug.h \
-		 $(srcdir)/odph_hashtable.h \
-		 $(srcdir)/odph_lineartable.h \
-		 $(srcdir)/odph_cuckootable.h \
-		 $(srcdir)/odph_list_internal.h \
-		 $(srcdir)/odph_iplookuptable.h
+		 $(srcdir)/odph_list_internal.h
 
 __LIB__libodphelper_@with_platform@_la_SOURCES = \
 					eth.c \
diff --git a/helper/cuckootable.c b/helper/cuckootable.c
index b4fce6c5b..83647ec2d 100644
--- a/helper/cuckootable.c
+++ b/helper/cuckootable.c
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <stdio.h>
 
-#include "odph_cuckootable.h"
+#include "odp/helper/odph_cuckootable.h"
 #include "odph_debug.h"
 #include <odp_api.h>
 
diff --git a/helper/hashtable.c b/helper/hashtable.c
index 8bb1ae57c..983b3da9a 100644
--- a/helper/hashtable.c
+++ b/helper/hashtable.c
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <malloc.h>
 
-#include "odph_hashtable.h"
+#include "odp/helper/odph_hashtable.h"
 #include "odph_list_internal.h"
 #include "odph_debug.h"
 #include <odp_api.h>
diff --git a/helper/include/odp/helper/odph_api.h b/helper/include/odp/helper/odph_api.h
index ae6e77bd5..7ed0e7786 100644
--- a/helper/include/odp/helper/odph_api.h
+++ b/helper/include/odp/helper/odph_api.h
@@ -19,10 +19,14 @@ extern "C" {
 #endif
 
 #include <odp/helper/chksum.h>
+#include <odp/helper/odph_cuckootable.h>
 #include <odp/helper/eth.h>
+#include <odp/helper/odph_hashtable.h>
 #include <odp/helper/icmp.h>
 #include <odp/helper/ip.h>
 #include <odp/helper/ipsec.h>
+#include <odp/helper/odph_lineartable.h>
+#include <odp/helper/odph_iplookuptable.h>
 #include <odp/helper/strong_types.h>
 #include <odp/helper/tcp.h>
 #include <odp/helper/table.h>
diff --git a/helper/odph_cuckootable.h b/helper/include/odp/helper/odph_cuckootable.h
index d56998078..d56998078 100644
--- a/helper/odph_cuckootable.h
+++ b/helper/include/odp/helper/odph_cuckootable.h
diff --git a/helper/odph_hashtable.h b/helper/include/odp/helper/odph_hashtable.h
index bb75cb9fa..bb75cb9fa 100644
--- a/helper/odph_hashtable.h
+++ b/helper/include/odp/helper/odph_hashtable.h
diff --git a/helper/odph_iplookuptable.h b/helper/include/odp/helper/odph_iplookuptable.h
index 0ae6b3762..0ae6b3762 100644
--- a/helper/odph_iplookuptable.h
+++ b/helper/include/odp/helper/odph_iplookuptable.h
diff --git a/helper/odph_lineartable.h b/helper/include/odp/helper/odph_lineartable.h
index 0b56b7fab..0b56b7fab 100644
--- a/helper/odph_lineartable.h
+++ b/helper/include/odp/helper/odph_lineartable.h
diff --git a/helper/iplookuptable.c b/helper/iplookuptable.c
index 5f80743b3..f6d6f8809 100644
--- a/helper/iplookuptable.c
+++ b/helper/iplookuptable.c
@@ -9,7 +9,7 @@
 #include <errno.h>
 #include <stdio.h>
 
-#include "odph_iplookuptable.h"
+#include <odp/helper/odph_iplookuptable.h>
 #include "odph_list_internal.h"
 #include "odph_debug.h"
 #include <odp_api.h>
diff --git a/helper/lineartable.c b/helper/lineartable.c
index e82c1651c..891790144 100644
--- a/helper/lineartable.c
+++ b/helper/lineartable.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <malloc.h>
 
-#include "odph_lineartable.h"
+#include "odp/helper/odph_lineartable.h"
 #include "odph_debug.h"
 #include <odp_api.h>
 
diff --git a/helper/test/cuckootable.c b/helper/test/cuckootable.c
index 6736f2be4..002e52e0a 100644
--- a/helper/test/cuckootable.c
+++ b/helper/test/cuckootable.c
@@ -49,7 +49,7 @@
 
 #include <odp_api.h>
 #include <odph_debug.h>
-#include <../odph_cuckootable.h>
+#include <odp/helper/odph_api.h>
 
 /*******************************************************************************
  * Hash function performance test configuration section.
diff --git a/helper/test/iplookuptable.c b/helper/test/iplookuptable.c
index 86aa1b332..b5d774cbc 100644
--- a/helper/test/iplookuptable.c
+++ b/helper/test/iplookuptable.c
@@ -12,7 +12,7 @@
 
 #include <odp_api.h>
 #include <odph_debug.h>
-#include <../odph_iplookuptable.h>
+#include <odp/helper/odph_api.h>
 #include <odp/helper/ip.h>
 
 static void print_prefix_info(
diff --git a/helper/test/table.c b/helper/test/table.c
index 3b74b2256..ac454da5e 100644
--- a/helper/test/table.c
+++ b/helper/test/table.c
@@ -5,8 +5,7 @@
  */
 
 #include <odph_debug.h>
-#include <../odph_hashtable.h>
-#include <../odph_lineartable.h>
+#include <odp/helper/odph_api.h>
 #include <odp_api.h>
 
 /**