epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

configure: Added 'host' make target.

Browse Source 
Builds only the current host architecture, so this is
equivalent to the target install.$EPISC_HOST_ARCH
This commit is contained in:
Andrew Johnson
2013-11-22 11:44:42 -06:00
parent b38e48642e
commit aab841e279
5 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure/RULES.Db
View File

@@ -137,6 +137,12 @@ cleanArchTargets = $(foreach arch,$(BUILD_ARCHS), clean$(DIVIDER)$(arch))
-include $(TOP)/configure/CONFIG_APP_INCLUDE -include $(TOP)/configure/CONFIG_APP_INCLUDE
all: install all: install
ifeq ($(EPICS_HOST_ARCH),$T_A)
host: install
else
# Do nothing
host:
endif
install: buildInstall install: buildInstall
@@ -144,7 +150,7 @@ buildInstall : build
rebuild: clean install rebuild: clean install
.PHONY: all $(ACTIONS) .PHONY: all host $(ACTIONS)
$(actionArchTargets) $(BUILD_ARCHS): install $(actionArchTargets) $(BUILD_ARCHS): install
$(cleanArchTargets): clean $(cleanArchTargets): clean

3
configure/RULES_ARCHS
View File

@@ -11,6 +11,7 @@
# #
all: install all: install
host: install$(DIVIDER)$(EPICS_HOST_ARCH)
ACTIONS = inc ACTIONS = inc
ACTIONS += build ACTIONS += build
@@ -94,4 +95,4 @@ realclean :
.PHONY : $(actionArchTargets) .PHONY : $(actionArchTargets)
.PHONY : $(cleanArchTargets) .PHONY : $(cleanArchTargets)
.PHONY : $(BUILD_ARCHS) rebuild arch_common_clean .PHONY : $(BUILD_ARCHS) rebuild arch_common_clean
.PHONY : $(ACTIONS) clean realclean archclean all .PHONY : $(ACTIONS) clean realclean archclean host all

10
configure/RULES_BUILD
View File

@@ -71,7 +71,13 @@ endif
#--------------------------------------------------------------- #---------------------------------------------------------------
# First target # First target
all: install all: install
ifeq ($(EPICS_HOST_ARCH),$T_A)
host: install
else
# Do nothing
host:
endif
-include $(CONFIG)/RULES.Db -include $(CONFIG)/RULES.Db
@@ -478,7 +484,7 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
.PRECIOUS: %.i %.o %.c %.nm %.cpp %.cc .PRECIOUS: %.i %.o %.c %.nm %.cpp %.cc
.PRECIOUS: $(COMMON_INC) .PRECIOUS: $(COMMON_INC)
.PHONY: all inc build install clean rebuild buildInstall build_clean .PHONY: all host inc build install clean rebuild buildInstall build_clean
.PHONY: runtests tapfiles checkRelease warnRelease noCheckRelease .PHONY: runtests tapfiles checkRelease warnRelease noCheckRelease
endif # BASE_RULES_BUILD endif # BASE_RULES_BUILD

5
configure/RULES_DIRS
View File

@@ -34,7 +34,8 @@ actionArchTargets = $(foreach action, $(ACTIONS),\
$(foreach arch, $(ARCHS), \ $(foreach arch, $(ARCHS), \
$(action)$(DIVIDER)$(arch))) $(action)$(DIVIDER)$(arch)))
all : install all: install
host: install$(DIVIDER)$(EPICS_HOST_ARCH)
# Allows rebuild to work with parallel builds option, -j. # Allows rebuild to work with parallel builds option, -j.
ifeq (rebuild,$(filter rebuild,$(MAKECMDGOALS))) ifeq (rebuild,$(filter rebuild,$(MAKECMDGOALS)))
@@ -73,7 +74,7 @@ $(DIRS) $(dirActionTargets) $(dirArchTargets) $(dirActionArchTargets) :
$(ARCHS) $(ACTIONS) $(actionArchTargets) :%: \ $(ARCHS) $(ACTIONS) $(actionArchTargets) :%: \
$(foreach dir, $(DIRS), $(dir)$(DIVIDER)%) $(foreach dir, $(DIRS), $(dir)$(DIVIDER)%)
.PHONY : $(DIRS) all rebuild .PHONY : $(DIRS) all host rebuild
.PHONY : $(ARCHS) $(ACTIONS) .PHONY : $(ARCHS) $(ACTIONS)
.PHONY : $(dirActionTargets) $(dirArchTargets) .PHONY : $(dirActionTargets) $(dirArchTargets)
.PHONY : $(dirActionArchTargets) .PHONY : $(dirActionArchTargets)

1
configure/RULES_TOP
View File

@@ -63,6 +63,7 @@ help:
@echo " rebuild - Same as clean install" @echo " rebuild - Same as clean install"
@echo " archclean - Removes O.<arch> dirs but not O.Common dir" @echo " archclean - Removes O.<arch> dirs but not O.Common dir"
@echo "\"Partial\" build targets supported by Makefiles:" @echo "\"Partial\" build targets supported by Makefiles:"
@echo " host - Builds and installs $(EPICS_HOST_ARCH) only."
@echo " inc$(DIVIDER)<arch> - Installs <arch> only header files." @echo " inc$(DIVIDER)<arch> - Installs <arch> only header files."
@echo " build$(DIVIDER)<arch> - Builds and installs <arch> only." @echo " build$(DIVIDER)<arch> - Builds and installs <arch> only."
@echo " install$(DIVIDER)<arch> - Builds and installs <arch> only." @echo " install$(DIVIDER)<arch> - Builds and installs <arch> only."