| Message ID | 1402141387-22058-3-git-send-email-taras.kondratiuk@linaro.org |
|---|---|
| State | Accepted |
| Commit | 470e3aa3047c5131c29233d73845850a45db8b57 |
| Headers | show |
Merged, thanks! Maxim. On 06/07/2014 04:43 AM, Taras Kondratiuk wrote: > Platform specific Makefile.inc should be able to override common > configuration, so invoke it at the end. > > Signed-off-by: Taras Kondratiuk <taras.kondratiuk@linaro.org> > --- > Makefile.inc | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/Makefile.inc b/Makefile.inc > index a44b629..837b5db 100644 > --- a/Makefile.inc > +++ b/Makefile.inc > @@ -6,7 +6,6 @@ > PLATFORM ?= linux-generic > OBJ_DIR = ./obj > ODP_DIR = $(ODP_ROOT)/platform/$(PLATFORM) > -include $(wildcard $(ODP_DIR)/Makefile.inc) > > export DESTDIR = $(ODP_ROOT)/build > > @@ -43,6 +42,8 @@ LDFLAGS += $(CFLAGS) > > STD_LIBS += -lrt > > +include $(wildcard $(ODP_DIR)/Makefile.inc) > + > .PHONY: default > default: >
diff --git a/Makefile.inc b/Makefile.inc index a44b629..837b5db 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -6,7 +6,6 @@ PLATFORM ?= linux-generic OBJ_DIR = ./obj ODP_DIR = $(ODP_ROOT)/platform/$(PLATFORM) -include $(wildcard $(ODP_DIR)/Makefile.inc) export DESTDIR = $(ODP_ROOT)/build @@ -43,6 +42,8 @@ LDFLAGS += $(CFLAGS) STD_LIBS += -lrt +include $(wildcard $(ODP_DIR)/Makefile.inc) + .PHONY: default default:
Platform specific Makefile.inc should be able to override common configuration, so invoke it at the end. Signed-off-by: Taras Kondratiuk <taras.kondratiuk@linaro.org> --- Makefile.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)