From ca2f9aff52e8a26b5fd3872c98d38224a621641b Mon Sep 17 00:00:00 2001
From: Jim Kowalkowski <core-talk@aps.anl.gov>
Date: Wed, 6 Sep 1995 21:05:09 +0000
Subject: [PATCH] Corrected a problem with building dbLoadTemplate/subtool.
 Added the BS and PVS test functions

---
 src/dbtools/Makefile.Unix | 30 +++++++++++++++++++++++-------
 src/dbtools/Makefile.Vx   |  5 +++--
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/dbtools/Makefile.Unix b/src/dbtools/Makefile.Unix
index b701f8c96..a8e8995ee 100644
--- a/src/dbtools/Makefile.Unix
+++ b/src/dbtools/Makefile.Unix
@@ -2,29 +2,45 @@ EPICS = ../../../..
 include Target.include
 include $(EPICS)/config/CONFIG_BASE
 
+# USR_CFLAGS = -v
+
 LEX = $(ELEX)
 YACC = $(EYACC)
 YACCOPT = -l
 LEXOPT = -L
 
 SRCS.c = ../dbVarSub.c dbLoadTemplate_lex.c dbLoadTemplate.c \
-		dbLoadRecords_lex.c dbLoadRecords.c
+		dbLoadRecords_lex.c dbLoadRecords.c \
+		../BSlib.c ../PVSvx.c ../PVSserver.c ../PVSget.c
 
-OBJS =  dbVarSub.o dbLoadTemplate.o dbLoadRecords.o
+VAR_OBJS =  dbVarSub.o dbLoadTemplate.o dbLoadRecords.o 
+OBJS =  $(VAR_OBJS) BSlib.o PVSvx.o PVSserver.o PVSget.o
 
 PROD = subtool dbLoadTemplate
+TARGETS = PVSvx PVSserver PVSget
 
 include $(EPICS)/config/RULES.Unix
 
 dbLoadTemplate.o: dbLoadTemplate_lex.c
 dbLoadRecords.o: dbLoadRecords_lex.c 
 
-subtool: dbLoadTemplate.c dbLoadTemplate_lex.c dbVarSub.o
-	$(RM) $@
-	$(LINK.c) $(CFLAGS) -DSUB_TOOL -o subtool dbLoadTemplate.c dbVarSub.o -s
+PVSvx: PVSvx.o BSlib.o
+	$(LINK.c) $(ARCH_DEP_LDLIBS) $(LDFLAGS) -o $@ $^
 
-dbLoadTemplate: $(OBJS) 
-	$(LINK.c) -o $@ $(OBJS) $(LDLIBS) -lDb
+PVSserver: PVSserver.o BSlib.o
+	$(LINK.c) $(ARCH_DEP_LDLIBS) $(LDFLAGS) -o $@ $^
+
+PVSget: PVSget.o BSlib.o
+	$(LINK.c) $(ARCH_DEP_LDLIBS) $(LDFLAGS) -o $@ $^
+
+subtool.o: dbLoadTemplate.c dbLoadTemplate_lex.c
+	$(COMPILE.c) $(CFLAGS) -DSUB_TOOL -o $@ $<
+
+subtool: subtool.o dbVarSub.o
+	$(LINK.c) $(CFLAGS) -DSUB_TOOL -o $@ $^ -s
+
+dbLoadTemplate: $(VAR_OBJS) 
+	$(LINK.c) -o $@ $^ $(LDLIBS) -lDb
 
 clean::
 	@$(RM) dbLoadTemplate_lex.c dbLoadTemplate.c dbLoadRecords_lex.c \
diff --git a/src/dbtools/Makefile.Vx b/src/dbtools/Makefile.Vx
index e096328b0..003dd8e4e 100644
--- a/src/dbtools/Makefile.Vx
+++ b/src/dbtools/Makefile.Vx
@@ -8,8 +8,9 @@ YACCOPT = -l
 LEXOPT = -L
 
 SRCS.c = ../dbVarSub.c dbLoadTemplate_lex.c dbLoadTemplate.c \
-		dbLoadRecords_lex.c dbLoadRecords.c
-LIBOBJS = dbVarSub.o dbLoadTemplate.o dbLoadRecords.o
+		dbLoadRecords_lex.c dbLoadRecords.c ../BSlib.c ../PVSvx.c
+
+LIBOBJS = dbVarSub.o dbLoadTemplate.o dbLoadRecords.o BSlib.o PVSvx.o
 
 LIBNAME = dbSubs