From ec1aa66cd3b3531ab02a4036e4da3baabeca8a7e Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Fri, 12 Jan 2001 23:17:54 +0000
Subject: [PATCH] O.Common changes. Moved all db and dbd references to RULES.Db

---
 configure/CONFIG_COMMON | 41 ++++++++++++++---------------------------
 1 file changed, 14 insertions(+), 27 deletions(-)

diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
index 57b185f0b..1f12b218e 100644
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -61,6 +61,9 @@ INSTALL_DB                  = $(INSTALL_LOCATION)/db
 INSTALL_CONFIG              = $(INSTALL_LOCATION)/configure
 INSTALL_JAVA                = $(INSTALL_LOCATION)/javalib
 
+#Directory for OS independant build created files
+COMMON_DIR = ../O.Common
+
 ifdef T_A
 
 INSTALL_LIB                 = $(INSTALL_LOCATION_LIB)/$(T_A)
@@ -132,11 +135,6 @@ OBJSNAME = $(addsuffix $(OBJ),$(OBJS))
 PRODNAME = $(addsuffix $(EXE),$(PROD))
 TESTPRODNAME = $(addsuffix $(EXE),$(TESTPROD))
 
-#---------------------------------------------------------------
-# Directory targets
-
-DIRECTORY_TARGETS += $(INSTALL_DBD) $(INSTALL_INCLUDE)
-
 #--------------------------------------------------
 # obj files
 
@@ -162,13 +160,7 @@ LIBRARY_LD_RESS = $(TARGET_RESS) $(LIBRARY_RESS)
 #--------------------------------------------------
 # WIN95/NT source browser
 PROD_BAF = $(addsuffix $(BAF), $(basename $(PROD)))
-LIB_BAF_IOC=$(addsuffix $(BAF),$(basename $(LIBRARY_IOC)))
-LIB_BAF_HOST=$(addsuffix $(BAF),$(basename $(LIBRARY_HOST)))
-
-#--------------------------------------------------
-# dbExpand flags
-
-INSTALL_DBDFLAGS = -I $(INSTALL_LOCATION)/dbd
+LIB_BAF=$(addsuffix $(BAF),$(basename $(LIBRARY)))
 
 #--------------------------------------------------
 # C preprocessor, compiler, and linker flag defaults
@@ -250,7 +242,7 @@ DEPENDS_FLAG = $($(CPLUSPLUS)_DEPENDS_FLAG)
 # Flags
 
 INCLUDES = -I. $(USR_INCLUDES) $(INSTALL_INCLUDES) \
-    $(TARGET_INCLUDES) $(GENERIC_SRC_INCLUDES) $(OP_SYS_INCLUDES)
+    $(TARGET_INCLUDES) $(GENERIC_SRC_INCLUDES) $(OP_SYS_INCLUDES) $(CROSS_INCLUDES)
 
 CFLAGS = $(CONFORM_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS) $(WARN_CFLAGS)\
  $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(CODE_CFLAGS)\
@@ -261,7 +253,7 @@ CXXFLAGS = $(CONFORM_CXXFLAGS) $(OPT_CXXFLAGS) $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS
  $(STATIC_CXXCFLAGS) $(OP_SYS_CFLAGS) $(TEMPL_INST_CXXFLAG)
 
 LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(DEPLIB_LDFLAGS)\
- $(ARCH_DEP_LDFLAGS) $(STATIC_LDFLAGS) $(OP_SYS_LDFLAGS)
+ $(ARCH_DEP_LDFLAGS) $(STATIC_LDFLAGS) $(OP_SYS_LDFLAGS) $(CROSS_LDFLAGS)
 
 LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(DEPLIB_LDLIBS) $(ARCH_DEP_LDLIBS)\
  $(STATIC_LDLIBS) $(OP_SYS_LDLIBS)
@@ -271,8 +263,6 @@ CPPFLAGS += $(POSIX_CPPFLAGS) $(EPICS_BASE_CPPFLAGS)\
 
 CPPSNCFLAGS = $(CPPFLAGS) $(INCLUDES)
 
-DBDFLAGS = $(USR_DBDFLAGS) -I . -I .. $(INSTALL_DBDFLAGS)
-
 #--------------------------------------------------
 # ar definition default
 AR = $($(ANSI)_AR)
@@ -297,7 +287,7 @@ COMPILE.cpp = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) -c $(SOURCE_CXXFLAG)
 
 #--------------------------------------------------
 # depends definition 
-TARGET_SRCS = $(foreach name, $(TESTPROD) $(PROD) $(LIBRARY_HOST) $(LIBRARY_IOC), $($(name)_SRCS))
+TARGET_SRCS = $(foreach name, $(TESTPROD) $(PROD) $(LIBRARY), $($(name)_SRCS))
 SRC_FILES = $(foreach src, $(LIBSRCS) $(SRCS) $(PROD_SRCS) $(TARGET_SRCS) , \
     $(firstword  $(wildcard $(addsuffix /$(src),$(ALL_SRC_DIRS))) $(src)))
 DEPENDS_RULE = -$(COMPILE.cpp) $(DEPENDS_FLAG) $(SRC_FILES) > DEPENDS
@@ -318,8 +308,6 @@ INSTALL_TCLINDEX=$(TCLINDEX:%=$(INSTALL_TCLLIB)/%)
 INSTALL_SCRIPTS = $(SCRIPTS:%= $(INSTALL_BIN)/%)
 INSTALL_OBJS = $(OBJSNAME:%= $(INSTALL_BIN)/%)
 
-INCREC +=$(RECTYPES) $(MENUS)
-INSTALL_INCREC = $(INCREC:%= $(INSTALL_INCLUDE)/%)
 INSTALL_DOCS = $(DOCS:%= $(INSTALL_DOC)/%)
 INSTALL_HTMLS = $(HTMLS:%= $(INSTALL_HTML)/$(HTMLS_DIR)/%)
 
@@ -327,13 +315,6 @@ INSTALL_TEMPLATE = $(addprefix $(INSTALL_TEMPLATES_SUBDIR)/, \
                    $(subst $(CONFIG),top/configure,$(TEMPLATES)))
 INSTALL_CONFIGS = $(CONFIGS:%= $(INSTALL_CONFIG)/%)
 
-INSTALL_BPTS = $(BPTS:%= $(INSTALL_DBD)/%)
-INSTALL_DBS = $(DBDINSTALL:%= $(INSTALL_DBD)/%)\
-        $(RECTYPES:%.h= $(INSTALL_DBD)/%.dbd)\
-        $(MENUS:%.h= $(INSTALL_DBD)/%.dbd)
-
-INSTALL_DBDNAME = $(DBDNAME:%= $(INSTALL_DBD)/%)
-
 #---------------------------------------------------------------
 #
 # auto determine the directory paths that things are installed to
@@ -374,6 +355,12 @@ INSTALL_INC_aaa = $(wildcard $(addsuffix /$(inc), $(dir)) )
 #
 # Rule 3
 #
-GENERATED_INSTALL_INC = $(INSTALL_INCLUDE)/os/$(OS_CLASS)/$(inc)
+GENERATED_INSTALL_INC = $(INSTALL_INCLUDE)/$(inc)
+
+COMMON_INC += $(filter $(COMMON_DIR)/%, $(foreach file, $(INC), \
+    $(firstword  $(SOURCE_INC) $(COMMON_DIR)/$(file) ) ) )
+SOURCE_INC = $(wildcard $(file) $(SOURCE_INC_bbb) )
+SOURCE_INC_bbb = $(foreach dir, $(ALL_SRC_DIRS), $(SOURCE_INC_aaa)  )
+SOURCE_INC_aaa = $(addsuffix /$(file), $(dir) )
 
 endif