[PATCHv17,05/10] helper: move odp pause to installed helper

Message ID 1449757466-6287-6-git-send-email-maxim.uvarov@linaro.org
State New
Headers show

Commit Message

Maxim Uvarov Dec. 10, 2015, 2:24 p.m.
ipc pktio depends on ring which depends on pause. Move
pause to installed helpers to support out of tree builds.

Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
---
 helper/Makefile.am                                  | 4 ++--
 helper/{odph_pause.h => include/odp/helper/pause.h} | 0
 helper/ring.c                                       | 2 +-
 helper/test/pause.c                                 | 2 +-
 platform/linux-generic/Makefile.am                  | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename helper/{odph_pause.h => include/odp/helper/pause.h} (100%)

Patch

diff --git a/helper/Makefile.am b/helper/Makefile.am
index 1906ae2..9caaba0 100644
--- a/helper/Makefile.am
+++ b/helper/Makefile.am
@@ -18,11 +18,11 @@  helperinclude_HEADERS = \
 		  $(srcdir)/include/odp/helper/strong_types.h\
 		  $(srcdir)/include/odp/helper/tcp.h\
 		  $(srcdir)/include/odp/helper/table.h\
-		  $(srcdir)/include/odp/helper/udp.h
+		  $(srcdir)/include/odp/helper/udp.h \
+		  $(srcdir)/include/odp/helper/pause.h
 
 noinst_HEADERS = \
 		 $(srcdir)/odph_debug.h \
-		 $(srcdir)/odph_pause.h \
 		 $(srcdir)/odph_hashtable.h \
 		 $(srcdir)/odph_lineartable.h \
 		 $(srcdir)/odph_list_internal.h
diff --git a/helper/odph_pause.h b/helper/include/odp/helper/pause.h
similarity index 100%
rename from helper/odph_pause.h
rename to helper/include/odp/helper/pause.h
diff --git a/helper/ring.c b/helper/ring.c
index e113606..6b233cc 100644
--- a/helper/ring.c
+++ b/helper/ring.c
@@ -71,7 +71,7 @@ 
 
 #include <odp/shared_memory.h>
 #include <odp/spinlock.h>
-#include "odph_pause.h"
+#include <odp/helper/pause.h>
 #include <odp/align.h>
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/helper/test/pause.c b/helper/test/pause.c
index f5f5da3..c5a5f1a 100644
--- a/helper/test/pause.c
+++ b/helper/test/pause.c
@@ -5,7 +5,7 @@ 
  */
 
 #include <test_debug.h>
-#include "../odph_pause.h"
+#include <odp/helper/pause.h>
 
 int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED)
 {
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 70bd8fe..f71c0f2 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -6,6 +6,7 @@  include $(top_srcdir)/platform/Makefile.inc
 AM_CFLAGS +=  -I$(srcdir)/include
 AM_CFLAGS +=  -I$(top_srcdir)/include
 AM_CFLAGS +=  -I$(top_srcdir)/helper/include
+AM_CFLAGS +=  -I$(top_srcdir)/helper
 
 include_HEADERS = \
 		  $(top_srcdir)/include/odp.h