From ea07efa524f892791a7eb33b44685379d5dc720e Mon Sep 17 00:00:00 2001 From: Jerome Hugues Date: Mon, 10 Jul 2017 20:48:52 +0200 Subject: [PATCH] * Adjust loading strategy for makefile, to handle TASTE specific situations For issue openaadl/ocarina#100 --- share/make/Makefile.common.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/share/make/Makefile.common.in b/share/make/Makefile.common.in index 42c5db3..ee98290 100644 --- a/share/make/Makefile.common.in +++ b/share/make/Makefile.common.in @@ -11,7 +11,17 @@ all: build-node LOCAL_RUNTIME_PATH=$(shell pwd)/../polyorb-hi-c +# Test whether we are simply including this makefile, e.g. to get some +# configuration parameters, or used as part of the general build from +# an Ocarina generated makefile + +ifneq ($strip ($(wildcard $(LOCAL_RUNTIME_PATH)/config)),) +include $(RUNTIME_PATH)/make/Makefile.$(TARGET) +else include $(LOCAL_RUNTIME_PATH)/make/Makefile.$(TARGET) +endif + +# Include user-defined makefile -include ../../userdefined.mk ifneq ($(USE_CPP_LINKER),) -- GitLab