EPICS_base/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Warn on multiple inclusion of RULES_BUILD

Browse Source 
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.
This commit is contained in:
Andrew Johnson
2018-10-19 14:32:26 -05:00
parent f1e55ef240
commit dd78ab0888
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure/RULES_BUILD
View File

@ -533,5 +533,7 @@ include $(CONFIG)/RULES_EXPAND
include $(CONFIG)/RULES_COMMON include $(CONFIG)/RULES_COMMON
else
$(warning RULES_BUILD included more than once. \
Use 'make show-makefiles' to work out why.)
endif # BASE_RULES_BUILD endif # BASE_RULES_BUILD
# EOF RULES_BUILD

6
configure/RULES_FILE_TYPE
View File

@ -7,9 +7,11 @@
# in the file LICENSE that is included with this distribution. # in the file LICENSE that is included with this distribution.
#************************************************************************* #*************************************************************************
# Include <top>/configure/RULES_BUILD from tops defined in RELEASE* files # Include <top>/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)) $(wildcard $($(top))/configure/RULES_BUILD))
ifneq ($(RELEASE_RULES_BUILDS),) ifneq ($(RELEASE_RULES_BUILDS),)
include $(RELEASE_RULES_BUILDS) include $(RELEASE_RULES_BUILDS)