Moved checkRelease target rules into RULES_BUILD,

use CONFIG_TARGETS to only run in TOP/configure.
This commit is contained in:
Andrew Johnson
2009-06-24 19:33:57 +00:00
parent 1590358de4
commit b98655b8f3
3 changed files with 11 additions and 24 deletions

View File

@@ -110,6 +110,10 @@ HOST_WARN=YES
CROSS_WARN=YES
GNU=NO
#-------------------------------------------------------
# Run checkRelease in $(TOP)/configure/O.*
CONFIG_TARGETS += $(CHECK_RELEASE_$(CHECK_RELEASE))
#-------------------------------------------------------
# Prefix and suffix
DEP=.depends

View File

@@ -12,8 +12,6 @@
all: install
build install buildInstall: $(CHECK_RELEASE_$(CHECK_RELEASE))
rebuild: clean install
ACTIONS = inc
@@ -71,26 +69,6 @@ $(buildDirs):
O.Common:
$(MKDIR) O.Common
#
# RELEASE consistency checking
# The RELEASE.$(EPICS_HOST_ARCH) files don't need to be included here:
targetReleaseFiles = $(wildcard $(foreach arch, $(BUILD_ARCHS), \
$(TOP)/configure/RELEASE.Common.$(arch) \
$(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(arch)))
checkReleaseTargets = $(addprefix checkRelease, $(suffix $(targetReleaseFiles)))
checkRelease: $(checkReleaseTargets)
$(CONVERTRELEASE) checkRelease
$(checkReleaseTargets):checkRelease.%:
$(CONVERTRELEASE) -a $* checkRelease
warnReleaseTargets = $(addprefix warnRelease, $(suffix $(targetReleaseFiles)))
warnRelease: $(warnReleaseTargets)
-$(CONVERTRELEASE) checkRelease
$(warnReleaseTargets):warnRelease.%:
-$(CONVERTRELEASE) -a $* checkRelease
#
# special clean rule
#
@@ -110,4 +88,3 @@ realclean ::
.PHONY : $(cleanArchTargets)
.PHONY : $(BUILD_ARCHS)
.PHONY : $(ACTIONS) clean realclean archclean all
.PHONY : checkRelease $(checkReleaseTargets)

View File

@@ -152,6 +152,12 @@ $(DIRECTORY_TARGETS) :
$(PRODNAME): $(INSTALL_LIB_INSTALLS)
# RELEASE file consistency checking
checkRelease:
$(CONVERTRELEASE) checkRelease
warnRelease:
-$(CONVERTRELEASE) checkRelease
#---------------------------------------------------------------
# The order of the following rules is
# VERY IMPORTANT !!!!
@@ -442,7 +448,7 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
.PRECIOUS: $(COMMON_INC)
.PHONY: all inc build install clean rebuild buildInstall
.PHONY: runtests
.PHONY: runtests checkRelease warnRelease
endif # BASE_RULES_BUILD
# EOF RULES_BUILD