From 8a29c82245742f72ea4098442a18a482d73f498d Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Mon, 1 Oct 2001 17:36:15 +0000
Subject: [PATCH] Merged changes from epics_R3_13_1_branch branch.

---
 config/CONFIG.Host.Borland |  2 +-
 config/CONFIG_SITE         |  2 +-
 config/RULES.Host          | 11 +++--------
 config/RULES.Vx            |  2 ++
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/config/CONFIG.Host.Borland b/config/CONFIG.Host.Borland
index f7aeda8e6..33a5df591 100644
--- a/config/CONFIG.Host.Borland
+++ b/config/CONFIG.Host.Borland
@@ -104,7 +104,7 @@ CCC_TEMPL_INST_FLAG =
 # -w-8012 Comparing signed and unsigned values
 # -w-8060 Possibly incorrect assignment
 # -w-8071 Conversion may lose significant digits
-CCC_WARN_YES = -w -g0 -w-8012 -w-8060 -w-8071
+CCC_WARN_YES = -w -g0 -w-8012 -w-8060 -w-8071 -w-8008 -w-8027 -w-8066 -w-8080 -w-8004
 # -w- display warnings off
 CCC_WARN_NO = -w-
 
diff --git a/config/CONFIG_SITE b/config/CONFIG_SITE
index bbbf3cf4e..e5218afd2 100644
--- a/config/CONFIG_SITE
+++ b/config/CONFIG_SITE
@@ -66,7 +66,7 @@ TORNADO=YES
 #  VxWorks directory for TORNADO=YES
 #VX_DIR_YES=c:\\Tornado
 #VX_DIR_YES = /usr/local/vw/tornado101
-VX_DIR_YES = /usr/local/vw/tornado20
+VX_DIR_YES = /usr/local/vw/tornado202
 
 #  VxWorks directory for TORNADO=NO
 #VX_DIR_NO=$(VW)
diff --git a/config/RULES.Host b/config/RULES.Host
index 9746493bc..613be01c3 100644
--- a/config/RULES.Host
+++ b/config/RULES.Host
@@ -306,11 +306,6 @@ LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS)
 LIBNAME_RCS=$(foreach lib, $(basename $(LIBRARY)), $(RCS) $($(lib)_RCS) $($(lib)_RCS_$(ARCH_CLASS)))
 LIBNAME_RESS=$(addsuffix $(RES), $(basename $(LIBNAME_RCS)))
 
-ifneq ($(words $(DLL_LIBS)), $(words $(DLL_DEPLIBS)))
-#  If invalid library names, don't make DLL file
-SHARED_LIBRARIES = NO
-endif
-
 #  check if shared libraries requested
 ifeq ($(strip $(SHARED_LIBRARIES)),YES)
 
@@ -329,8 +324,6 @@ endif # LIBOBJS
 endif # LIBRARY
 
 #---------------------------------------------------------------
-#	Main targets
-
 all::	install
 
 build:: inc
@@ -520,9 +513,11 @@ $(PACKAGE)_%.h:$(INSTALL_JAVA)/$(PACKAGE)/%.class
 #  The order of the following rules is
 #  VERY IMPORTANT !!!!
 
-depends:: $(LIBSRCS) $(SRCS) $(COND_PROD_SRCS)
+depends:: $(LIBSRCS) $(SRCS) $(COND_PROD_SRCS) $(SRCS.c) $(SRCS.cc)
 	$(RM) DEPENDS
+ifneq ($(strip $(LIBSRCS) $(SRCS) $(COND_PROD_SRCS) $(SRCS.c) $(SRCS.cc)),)
 	$(DEPENDS_RULE)
+endif
 
 ifeq ($(HOST_ARCH),Borland)
 %$(EXE): %.c
diff --git a/config/RULES.Vx b/config/RULES.Vx
index 87f8fca6e..b7d4565d7 100644
--- a/config/RULES.Vx
+++ b/config/RULES.Vx
@@ -77,7 +77,9 @@ endif
 
 depends:: $(SRCS.c) $(SRCS.cc)
 	$(RM) DEPENDS
+ifneq ($(strip $(SRCS.c) $(SRCS.cc)),)
 	$(DEPENDS_RULE)
+endif
 
 clean::
 	@echo "Cleaning"