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

Moved def of EPICS_INCLUDES to CONFIG_COMMON and reordered dirs.

Browse Source
This commit is contained in:
Janet B. Anderson
1999-08-27 21:40:52 +00:00
parent d56d5b3e49
commit e09684f012
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config/CONFIG_COMMON
View File

@@ -170,7 +170,17 @@ TEMPL_INST_CXXFLAG = $($(CPLUSPLUS)_TEMPL_INST_FLAG)
#--------------------------------------------------
# Epics includes (CONFIG.Vx will override OS_CLASS)
OS_CLASS = $(ARCH_CLASS)
EPICS_INCLUDES = -I$(INSTALL_INCLUDE) -I$(INSTALL_INCLUDE)/os/$(OS_CLASS)
#---------------------------------------------------------------
EPICS_INCLUDES = -I$(INSTALL_INCLUDE)/os/$(OS_CLASS) -I$(INSTALL_INCLUDE)
# if we are not building base add base includes and ld dirs
# (convenience for extensions and applications)
ifneq ($(EPICS_BASE),$(TOP))
ifneq ($(EPICS_BASE),$(INSTALL_LOCATION))
EPICS_INCLUDES += -I$(EPICS_BASE_INCLUDE)/os/$(OS_CLASS) += -I$(EPICS_BASE_INCLUDE)
endif
endif
#--------------------------------------------------
# Warnings flags (CONFIG.Vx will override)

9
config/RULES.Host
View File

@@ -223,15 +223,6 @@ ifdef PROD
PROD := $(addsuffix $(EXE), $(PROD))
endif
#---------------------------------------------------------------
# if we are not building base add base includes and ld dirs
# (convenience for extensions and applications)
ifneq ($(EPICS_BASE),$(TOP))
ifneq ($(EPICS_BASE),$(INSTALL_LOCATION))
EPICS_INCLUDES += -I$(EPICS_BASE_INCLUDE) -I$(EPICS_BASE_INCLUDE)/os/$(OS_CLASS)
endif
endif
#---------------------------------------------------------------
# ----------------------------------------------------
# create names (lists) for installed things