Replaced O.<T_A> files CONFIG_APP_INCLUDE and RULES_INCLUDE creation with

defs and rules in configure files CONFIG_APP_INCLUDE and RULES_BUILD
This commit is contained in:
Janet B. Anderson
2008-03-24 22:02:29 +00:00
parent 87c4db7e4d
commit 716dabdba1
3 changed files with 30 additions and 3 deletions

View File

@@ -56,8 +56,6 @@ include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).Common
ifdef T_A
-include $(CONFIG)/O.$(T_A)/CONFIG_APP_INCLUDE
# Cross compile specific definitions
#
ifneq ($(EPICS_HOST_ARCH),$(T_A))
@@ -72,6 +70,12 @@ endif
#
-include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).$(T_A)
# RELEASE file specific definitions
#
ifneq ($(CONFIG),$(TOP)/configure)
-include $(CONFIG)/CONFIG_APP_INCLUDE
endif
# Site specific target and host-target definitions
#
-include $(CONFIG)/os/CONFIG_SITE.Common.$(T_A)

View File

@@ -0,0 +1,23 @@
export TOP
export IOCAPPS
RELEASE_TOPS = $(shell $(PERL) $(TOOLS)/convertRelease.pl -T $(TOP) -h $(EPICS_HOST_ARCH) STDOUT )
ifneq ($(RELEASE_TOPS),)
define RELEASE_FLAGS_template
export $(1)
$(1)_HOST_BIN = $$(strip $$($(1)))/bin/$(EPICS_HOST_ARCH)
$(1)_HOST_LIB = $$(strip $$($(1)))/lib/$(EPICS_HOST_ARCH)
$(1)_BIN = $$(strip $$($(1)))/bin/$(T_A)
$(1)_LIB = $$(strip $$($(1)))/lib/$(T_A)
SHRLIB_SEARCH_DIRS += $$($(1)_LIB)
RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include/os/$$(OS_CLASS)))
RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include))
RELEASE_DBDFLAGS += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/dbd))
RELEASE_PERL_MODULE_DIRS += $$(wildcard $$($(1)_LIB)/perl)
endef
$(foreach top, $(RELEASE_TOPS), $(eval $(call RELEASE_FLAGS_template,$(top)) ))
endif

View File

@@ -108,7 +108,7 @@ COMMON_DBDS = $(DBD)
COMMON_DBS = $(DB)
COMMONS = $(DBD) $(DB)
-include $(TOP)/configure/O.$(EPICS_HOST_ARCH)/CONFIG_APP_INCLUDE
-include $(TOP)/configure/CONFIG_APP_INCLUDE
all: install