Skip to content

Commit

Permalink
include: move visibility headers to generic place
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dmitry Eremin-Solenikov committed Jan 16, 2018
1 parent 98c6456 commit e512804
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile.inc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
ODP_INCLUDES = \
-I$(top_srcdir)/platform/@with_platform@/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/include

Expand All @@ -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
Expand Down
5 changes: 5 additions & 0 deletions include/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
File renamed without changes.
File renamed without changes.
6 changes: 1 addition & 5 deletions platform/linux-generic/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -19,11 +20,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 = \
Expand Down
1 change: 1 addition & 0 deletions platform/linux-generic/test/ring/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ ring_main_SOURCES = \
ring_basic.c ring_stress.c

ring_main_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/include \
-I$(top_srcdir)/platform/linux-generic/include \
$(INCCUNIT_COMMON) $(ODP_INCLUDES) $(HELPER_INCLUDES)
ring_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP)

0 comments on commit e512804

Please sign in to comment.