From dd78ab0888147802f8bcde29c96c70f56a67e179 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 19 Oct 2018 14:32:26 -0500 Subject: [PATCH] Warn on multiple inclusion of RULES_BUILD RULES_BUILD has long had a multi-inclusion guard, but I want to be able to remove it. This commit cleans up the current place where it was happening, and shows a warning if the guard gets triggered, but it doesn't stop builds from working if it happens. --- configure/RULES_BUILD | 4 +++- configure/RULES_FILE_TYPE | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index a7dcacf3f..4f0d0a465 100644 --- a/configure/RULES_BUILD +++ b/configure/RULES_BUILD @@ -533,5 +533,7 @@ include $(CONFIG)/RULES_EXPAND include $(CONFIG)/RULES_COMMON +else + $(warning RULES_BUILD included more than once. \ + Use 'make show-makefiles' to work out why.) endif # BASE_RULES_BUILD -# EOF RULES_BUILD diff --git a/configure/RULES_FILE_TYPE b/configure/RULES_FILE_TYPE index 6f6500cf3..5936fd5e0 100644 --- a/configure/RULES_FILE_TYPE +++ b/configure/RULES_FILE_TYPE @@ -7,9 +7,11 @@ # in the file LICENSE that is included with this distribution. #************************************************************************* -# Include /configure/RULES_BUILD from tops defined in RELEASE* files +# Include /configure/RULES_BUILD from tops defined in RELEASE* files, +# excluding EPICS_BASE # -RELEASE_RULES_BUILDS = $(foreach top, $(RELEASE_TOPS), \ +RELEASE_RULES_BUILDS = $(foreach top, \ + $(filter-out EPICS_BASE, $(RELEASE_TOPS)), \ $(wildcard $($(top))/configure/RULES_BUILD)) ifneq ($(RELEASE_RULES_BUILDS),) include $(RELEASE_RULES_BUILDS)