diff options
| author | Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org> | 2018-01-09 11:13:54 +0300 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2018-01-18 22:07:25 +0300 |
| commit | f3b6be23045a924b8d8034a9a490b4fe5928684e (patch) | |
| tree | 47f92c5ea2a2508b5ae555ec1868ac23f0462776 | |
| parent | d4ad3409a51f94df403e0ae27e25baab2b0a1bf4 (diff) | |
include: move visibility headers to generic place
There was an idea that platform might override visibility headers in
platform-specific way. For the sake of providing full set of headers for
ABI-compatibile case, move those headers to include/ dir. Platform can
still override those headers when compiling in non-ABI-compatibile mode.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
| -rw-r--r-- | Makefile.inc | 2 | ||||
| -rw-r--r-- | include/Makefile.am | 5 | ||||
| -rw-r--r-- | include/odp/visibility_begin.h (renamed from platform/linux-generic/include/odp/visibility_begin.h) | 0 | ||||
| -rw-r--r-- | include/odp/visibility_end.h (renamed from platform/linux-generic/include/odp/visibility_end.h) | 0 | ||||
| -rw-r--r-- | platform/linux-generic/Makefile.am | 6 | ||||
| -rw-r--r-- | platform/linux-generic/test/ring/Makefile.am | 3 |
6 files changed, 10 insertions, 6 deletions
diff --git a/Makefile.inc b/Makefile.inc index 1610e2746..c887b2ee2 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1,5 +1,4 @@ ODP_INCLUDES = \ - -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_builddir)/include \ -I$(top_srcdir)/include @@ -8,6 +7,7 @@ ODP_INCLUDES += \ -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ else ODP_INCLUDES += \ + -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_srcdir)/platform/@with_platform@/include-abi endif diff --git a/include/Makefile.am b/include/Makefile.am index d463b6d73..c3452ef33 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -2,6 +2,11 @@ include_HEADERS = \ odp.h \ odp_api.h +odpincludedir= $(includedir)/odp +odpinclude_HEADERS = \ + odp/visibility_begin.h \ + odp/visibility_end.h + odpapiincludedir= $(includedir)/odp/api/ odpapiinclude_HEADERS = \ odp/api/align.h \ diff --git a/platform/linux-generic/include/odp/visibility_begin.h b/include/odp/visibility_begin.h index 1bbb43def..1bbb43def 100644 --- a/platform/linux-generic/include/odp/visibility_begin.h +++ b/include/odp/visibility_begin.h diff --git a/platform/linux-generic/include/odp/visibility_end.h b/include/odp/visibility_end.h index 748af5103..748af5103 100644 --- a/platform/linux-generic/include/odp/visibility_end.h +++ b/include/odp/visibility_end.h diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index ecc560880..9b7ee37e5 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -4,6 +4,7 @@ include $(top_srcdir)/platform/Makefile.inc AM_CPPFLAGS = $(ODP_INCLUDES) +AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/include AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/@ARCH_DIR@ AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/default @@ -18,11 +19,6 @@ AM_CFLAGS += -msse4.2 endif endif -odpincludedir= $(includedir)/odp -odpinclude_HEADERS = \ - include/odp/visibility_begin.h \ - include/odp/visibility_end.h - if !ODP_ABI_COMPAT odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ diff --git a/platform/linux-generic/test/ring/Makefile.am b/platform/linux-generic/test/ring/Makefile.am index 8287c7e04..edaf4510c 100644 --- a/platform/linux-generic/test/ring/Makefile.am +++ b/platform/linux-generic/test/ring/Makefile.am @@ -7,3 +7,6 @@ ring_main_SOURCES = \ ring_basic.c ring_stress.c PRELDADD += $(LIBCUNIT_COMMON) + +AM_CPPFLAGS += \ + -I$(top_srcdir)/platform/linux-generic/include |