From e09684f012665cf1c11c76a5744df02607df7362 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Fri, 27 Aug 1999 21:40:52 +0000 Subject: [PATCH] Moved def of EPICS_INCLUDES to CONFIG_COMMON and reordered dirs. --- config/CONFIG_COMMON | 12 +++++++++++- config/RULES.Host | 9 --------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/config/CONFIG_COMMON b/config/CONFIG_COMMON index 9ca50615e..9f0970a0a 100644 --- a/config/CONFIG_COMMON +++ b/config/CONFIG_COMMON @@ -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) diff --git a/config/RULES.Host b/config/RULES.Host index ac5543468..d69064697 100644 --- a/config/RULES.Host +++ b/config/RULES.Host @@ -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