Message ID | 1392816999-9487-1-git-send-email-maxim.uvarov@linaro.org |
---|---|
State | Not Applicable, archived |
Headers | show |
This patch comes after Mike's " Makefiles: Allow CFLAGS to overide the build" patch. Maxim. On 02/19/2014 05:36 PM, Maxim Uvarov wrote: > Fix building with additional CFLAGS. > > Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> > --- > Makefile.inc | 4 ++++ > test/api_test/Makefile | 2 -- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/Makefile.inc b/Makefile.inc > index d9590e9..be79b93 100644 > --- a/Makefile.inc > +++ b/Makefile.inc > @@ -11,6 +11,10 @@ EXTRA_CFLAGS += -O3 > OBJ_DIR = ./obj > DESTDIR ?= $(ODP_ROOT)/build > > +EXTRA_CFLAGS += -I$(ODP_ROOT)/platform/linux-generic/include > +EXTRA_CFLAGS += -I$(ODP_ROOT)/platform/linux-generic/include/api > +EXTRA_CFLAGS += -I$(ODP_ROOT)/include > + > EXTRA_CFLAGS += -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes > EXTRA_CFLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith > EXTRA_CFLAGS += -Wcast-align -Wnested-externs -Wcast-qual -Wformat-nonliteral > diff --git a/test/api_test/Makefile b/test/api_test/Makefile > index 741fbe4..5f0f07d 100644 > --- a/test/api_test/Makefile > +++ b/test/api_test/Makefile > @@ -12,8 +12,6 @@ ODP_ATOMIC = odp_atomic > ODP_SHM = odp_shm > ODP_RING = odp_ring > > -EXTRA_CFLAGS += -I$(ODP_ROOT)/platform/linux-generic/include > - > include ../Makefile.inc > include $(ODP_ROOT)/Makefile.inc >
diff --git a/Makefile.inc b/Makefile.inc index d9590e9..be79b93 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -11,6 +11,10 @@ EXTRA_CFLAGS += -O3 OBJ_DIR = ./obj DESTDIR ?= $(ODP_ROOT)/build +EXTRA_CFLAGS += -I$(ODP_ROOT)/platform/linux-generic/include +EXTRA_CFLAGS += -I$(ODP_ROOT)/platform/linux-generic/include/api +EXTRA_CFLAGS += -I$(ODP_ROOT)/include + EXTRA_CFLAGS += -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes EXTRA_CFLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith EXTRA_CFLAGS += -Wcast-align -Wnested-externs -Wcast-qual -Wformat-nonliteral diff --git a/test/api_test/Makefile b/test/api_test/Makefile index 741fbe4..5f0f07d 100644 --- a/test/api_test/Makefile +++ b/test/api_test/Makefile @@ -12,8 +12,6 @@ ODP_ATOMIC = odp_atomic ODP_SHM = odp_shm ODP_RING = odp_ring -EXTRA_CFLAGS += -I$(ODP_ROOT)/platform/linux-generic/include - include ../Makefile.inc include $(ODP_ROOT)/Makefile.inc
Fix building with additional CFLAGS. Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> --- Makefile.inc | 4 ++++ test/api_test/Makefile | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-)