Modified to build correctly.

src/db/Makefile.Vx

@@ -9,6 +9,8 @@ SRCS = \
 	dbCaLink.c dbCaDblink.c devLib.c initHooks.c
 
 OBJS = \
+
+LIBOBJS = \
 	$(OBDIR)/dbAccess.o $(OBDIR)/dbBkpt.o $(OBDIR)/dbFastLinkConv.o \
 	$(OBDIR)/dbLink.o $(OBDIR)/dbStaticLib.o $(OBDIR)/iocInit.o \
 	$(OBDIR)/drvTS.o $(OBDIR)/dbScan.o $(OBDIR)/dbEvent.o \
@@ -17,9 +19,7 @@ OBJS = \
 	$(OBDIR)/taskwd.o $(OBDIR)/dbCaLink.o $(OBDIR)/dbCaDblink.o \
 	$(OBDIR)/devLib.o
 
-LIBOBJS =
-
-PROD = $(OBDIR)/dbLib
+LIBNAME = dbLib
 
 TARGET = $(OBDIR)/initHooks.o
 

src/dbtools/Makefile.Unix

@@ -3,44 +3,55 @@ include $(EPICS)/config/CONFIG
 
 CC = acc -Xt 
 
+LEX = $(ELEX)
+YACC = $(EYACC)
+
 SRCS = \
-	dbStaticLib.c \
-	atdb_lex.c \
-	atdb_yacc.c \
-	dbta.c \
-	atdb.c \
-	dbl.c \
-	dbls.c
+	dbVarSub.c $(OBDIR)/dbLoadTemplate.c $(OBDIR)/dbLoadRecords.c
 
-OBJS =
+OBJS = \
+	$(OBDIR)/dbVarSub.o $(OBDIR)/dbLoadTemplate.o \
+	$(OBDIR)/dbLoadRecords.o
 
-LIBOBJS = \
-	dbStaticLib.o
+LIBOBJS =
 
-LIBNAME = libDb.a
+PROD = $(OBDIR)/dbLoadTemplate
 
-TARGET = $(OBDIR)/dbta $(OBDIR)/atdb $(OBDIR)/dbl $(OBDIR)/dbls
+TARGET = $(OBDIR)/subtool
 
-$(OBDIR)/atdb: $(OBDIR)/atdb.o $(OBDIR)/atdb_yacc.o
-	$(LINK.c) -o $@ $? $(LDLIBS)
+depends: $(OBDIR)/dbLoadTemplate.c $(OBDIR)/dbLoadRecords.c
 
-depends: $(OBDIR)/atdb_yacc.o
+$(OBDIR)/dbLoadRecords.c: $(OBDIR)/dbLoadRecords_lex.c dbLoadRecords.y
+	/bin/rm -f $@
+	$(YACC) -l dbLoadRecords.y
+	mv y.tab.c $@
 
-$(OBDIR)/atdb_yacc.o: atdb_lex.c atdb_yacc.c
-	/bin/rm -f $(OBDIR)/atdb_yacc.o
-	$(CC) $(CFLAGS) -o $@ -c atdb_yacc.c
+$(OBDIR)/dbLoadRecords_lex.c: dbLoadRecords.l
+	/bin/rm -f $@
+	$(LEX) -t -L dbLoadRecords.l > $@
 
-atdb_yacc.c: atdb_lex.c atdb_yacc.y
-	yacc atdb_yacc.y
-	/bin/rm -f atdb_yacc.c
-	/bin/mv y.tab.c atdb_yacc.c
+$(OBDIR)/dbLoadTemplate.c: $(OBDIR)/dbLoadTemplate_lex.c dbLoadTemplate.y
+	/bin/rm -f $@
+	$(YACC) -l dbLoadTemplate.y
+	mv y.tab.c $@
 
-atdb_lex.c: atdb_lex.l
-	lex atdb_lex.l
-	/bin/rm -f atdb_lex.c
-	/bin/mv lex.yy.c atdb_lex.c
+$(OBDIR)/dbLoadTemplate_lex.c: dbLoadTemplate.l
+	/bin/rm -f $@
+	$(LEX) -t -L dbLoadTemplate.l > $@
 
-clean::
-	/bin/rm -f atdb_lex.c atdb_yacc.c
+$(OBDIR)/dbLoadRecords.o: $(OBDIR)/dbLoadRecords.c
+	$(RM) $@
+	$(CC) -c $(CFLAGS) -o $(OBDIR)/dbLoadRecords.o \
+			       $(OBDIR)/dbLoadRecords.c
+
+$(OBDIR)/dbLoadTemplate.o: $(OBDIR)/dbLoadTemplate.c
+	$(RM) $@
+	$(CC) -c $(CFLAGS) -o $(OBDIR)/dbLoadTemplate.o \
+			       $(OBDIR)/dbLoadTemplate.c
+
+$(OBDIR)/subtool: $(OBDIR)/dbLoadTemplate.o $(OBDIR)/dbVarSub.o
+	$(RM) $@
+	$(LINK.c) $(CFLAGS) -DSUB_TOOL -o $(OBDIR)/subtool \
+	$(OBDIR)/dbLoadTemplate.c $(OBDIR)/dbVarSub.o -s
 
 include $(EPICS)/config/RULES.Unix

src/dbtools/Makefile.Vx

@@ -7,12 +7,12 @@ SRCS = \
 	dbVarSub.c $(OBDIR)/dbLoadTemplate.c $(OBDIR)/dbLoadRecords.c
 
 OBJS = \
+
+LIBOBJS = \
 	$(OBDIR)/dbVarSub.o $(OBDIR)/dbLoadTemplate.o \
 	$(OBDIR)/dbLoadRecords.o
 
-LIBOBJS =
-
-PROD = $(OBDIR)/dbSubs
+LIBNAME = dbSubs
 
 depends: $(OBDIR)/dbLoadTemplate.c $(OBDIR)/dbLoadRecords.c
 

src/libCom/Makefile.Unix

@@ -1,9 +1,9 @@
 EPICS = ../../..
 include $(EPICS)/config/CONFIG
 
-USR_CFLAGS = -DACCESS_SECURITY -D_NO_PROTO
+USR_CFLAGS = -D_NO_PROTO
+
 
-CC = acc -Xs
 CC = acc -Xt
 
 SRCS = \
@@ -31,6 +31,9 @@ LIBOBJS = \
 
 LIBNAME = libCom.a
 
+TARGET = \
+	$(OBDIR)/cvtTest $(OBDIR)/tsTest $(OBDIR)/sydTest
+
 depends: bld_errSym
 
 bld_errSym: $(OBDIR)/errSymTbl.c $(OBDIR)/errInc.o
@@ -40,4 +43,13 @@ $(OBDIR)/errSymTbl.c $(OBDIR)/errInc.o:
 	@$(EPICS_BASE)/tools/blderrSymTbl
 	@/bin/mv errSymTbl.c errInc.o $(OBDIR)
 
+$(OBDIR)/cvtTest: $(OBDIR)/cvtNumbers.o
+	$(LINK.c) -o $@ $? -lCom -lDb -lCom -lm -s
+
+$(OBDIR)/tsTest: $(OBDIR)/tsSubr.o
+	$(LINK.c) -o $@ $? -lCom -lDb -lCom -lm -s
+
+$(OBDIR)/sydTest: $(OBDIR)/sydSubr.o
+	$(LINK.c) -o $@ $? -lCom -lca -lDb -lCom -lm -s
+
 include $(EPICS)/config/RULES.Unix

src/libvxWorks/Makefile.Vx

@@ -7,10 +7,10 @@ SRCS = \
 	iocLogClient.c veclist.c
 
 OBJS = \
-	$(OBDIR)/veclist.o $(OBDIR)/iocLogClient.o
 
 LIBOBJS = \
+	$(OBDIR)/veclist.o $(OBDIR)/iocLogClient.o
 
-PROD = $(OBDIR)/vxComLib
+LIBNAME = vxComLib
 
 include $(EPICS)/config/RULES.Vx

src/rsrv/Makefile.Vx

@@ -7,14 +7,14 @@ SRCS = \
 	caserverio.c caservertask.c camsgtask.c camessage.c \
 	rsrv_init.c cast_server.c online_notify.c globalsource.c
 
-OBJS = \
+OBJS =
+
+LIBOBJS = \
 	$(OBDIR)/caserverio.o $(OBDIR)/caservertask.o \
 	$(OBDIR)/camsgtask.o $(OBDIR)/camessage.o \
 	$(OBDIR)/rsrv_init.o $(OBDIR)/cast_server.o \
 	$(OBDIR)/online_notify.o
 
-LIBOBJS =
-
-PROD = dbgLib
+LIBNAME = dbgLib
 
 include $(EPICS)/config/RULES.Vx

src/util/Makefile.Unix

@@ -25,13 +25,15 @@ OBJS = \
 	$(OBDIR)/recListProg.o $(OBDIR)/recordTest.o \
 	$(OBDIR)/startCArepeater.o $(OBDIR)/sydPlot.o
 
-PROD = \
+LIBOBJS =
+
+TARGETS = \
 	$(OBDIR)/apCreateShadow $(OBDIR)/apStatusSync $(OBDIR)/bfRing \
 	$(OBDIR)/ca_test $(OBDIR)/calcTest $(OBDIR)/checkDvlNode \
 	$(OBDIR)/cmdClient $(OBDIR)/extrDoc $(OBDIR)/iocLogServer \
 	$(OBDIR)/racPrint $(OBDIR)/recListProg $(OBDIR)/recordTest \
 	$(OBDIR)/startCArepeater
 
-all :: $(PROD)
+#all :: $(PROD)
 
-include $(EPICS)/config/RULES
+include $(EPICS)/config/RULES.Unix