From 63eefd2ba8990b8a1629b07846ec176752ba7165 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Thu, 17 Aug 1995 15:43:34 +0000
Subject: [PATCH] Makefile now uses library build rule from RULES.Vx

---
 src/devOpt/Makefile.Vx     | 28 ++++++------
 src/libvxWorks/Makefile.Vx | 10 +----
 src/misc/Makefile.Vx       |  7 +--
 src/rec/Makefile.Vx        | 90 ++++++++++++++++++--------------------
 src/sequencer/Makefile.Vx  |  8 +---
 5 files changed, 62 insertions(+), 81 deletions(-)

diff --git a/src/devOpt/Makefile.Vx b/src/devOpt/Makefile.Vx
index 112d83927..13688a6f3 100644
--- a/src/devOpt/Makefile.Vx
+++ b/src/devOpt/Makefile.Vx
@@ -15,22 +15,20 @@ SRCS.c += ../devXxDc5009Gpib.c
 SRCS.c += ../devXxK263Gpib.c
 SRCS.c += ../devXxSkeletonGpib.c
 
-OBJS += devAnalytekGpib.o
-OBJS += devXxDg535Gpib.o
-OBJS += devBBInteract.o
-OBJS += devGpibInteract.o
-OBJS += devXxSr620Gpib.o
-OBJS += devK486Gpib.o
-OBJS += devXxK196Gpib.o
-OBJS += devXxDc5009Gpib.o
-OBJS += devXxK263Gpib.o
-OBJS += devXxSkeletonGpib.o
+LIBOBJS += devAnalytekGpib.o
+LIBOBJS += devXxDg535Gpib.o
+LIBOBJS += devBBInteract.o
+LIBOBJS += devGpibInteract.o
+LIBOBJS += devXxSr620Gpib.o
+LIBOBJS += devK486Gpib.o
+LIBOBJS += devXxK196Gpib.o
+LIBOBJS += devXxDc5009Gpib.o
+LIBOBJS += devXxK263Gpib.o
+LIBOBJS += devXxSkeletonGpib.o
 
-PROD = devLibOpt  $(OBJS)
+LIBNAME = devLibOpt
+
+PROD = $(LIBOBJS)
 
 include $(EPICS)/config/RULES.Vx
 
-devLibOpt: $(OBJS)
-	$(RM) $@
-	$(LINK.c) $@ $(OBJS) $(LDLIBS)
-
diff --git a/src/libvxWorks/Makefile.Vx b/src/libvxWorks/Makefile.Vx
index 965c04083..76fd1b3dc 100644
--- a/src/libvxWorks/Makefile.Vx
+++ b/src/libvxWorks/Makefile.Vx
@@ -5,15 +5,9 @@ include $(EPICS)/config/CONFIG_BASE
 
 SRCS.c = ../iocLogClient.c ../veclist.c 
 
-OBJS = veclist.o iocLogClient.o 
+LIBOBJS = veclist.o iocLogClient.o 
 
-PROD = vxComLib
+LIBNAME = vxComLib
 
 include $(EPICS)/config/RULES.Vx
 
-clean::
-	@$(RM) vxComLib
-
-vxComLib: $(OBJS)
-	$(RM) $@
-	$(LINK.c) $@ $(OBJS) $(LDLIBS)
diff --git a/src/misc/Makefile.Vx b/src/misc/Makefile.Vx
index 76c4507b0..182edfa1c 100644
--- a/src/misc/Makefile.Vx
+++ b/src/misc/Makefile.Vx
@@ -4,12 +4,9 @@ include $(EPICS)/config/CONFIG_BASE
 
 SRCS.c = ../epicsRelease.c
 
-OBJS =  epicsRelease.o
+LIBOBJS =  epicsRelease.o
 
-PROD = miscLib
+LIBNAME = miscLib
 
 include $(EPICS)/config/RULES.Vx
 
-miscLib: $(OBJS)
-	$(RM) $@
-	$(LINK.c) $@ $(OBJS) $(LDLIBS)
diff --git a/src/rec/Makefile.Vx b/src/rec/Makefile.Vx
index 7b0d16a57..24abdff7c 100644
--- a/src/rec/Makefile.Vx
+++ b/src/rec/Makefile.Vx
@@ -47,54 +47,50 @@ SRCS.c += ../recWait.c
 SRCS.c += ../recWaitCa.c
 SRCS.c += ../recWaveform.c
 
-#	OBJS += recAai.o
-#	OBJS += recAao.o
-OBJS += recAi.o
-OBJS += recAo.o
-OBJS += recBi.o
-OBJS += recBo.o
-OBJS += recCalc.o
-OBJS += recCompress.o
-OBJS += recDfanout.o
-OBJS += recEg.o
-OBJS += recEgevent.o
-OBJS += recEr.o
-OBJS += recErevent.o
-OBJS += recEvent.o
-OBJS += recFanout.o
-#	OBJS += recGsub.o
-OBJS += recHistogram.o
-OBJS += recLongin.o
-OBJS += recLongout.o
-OBJS += recMbbi.o
-OBJS += recMbbiDirect.o
-OBJS += recMbbo.o
-OBJS += recMbboDirect.o
-#	OBJS += recPal.o
-OBJS += recPermissive.o
-OBJS += recPid.o
-OBJS += recPulseCounter.o
-OBJS += recPulseDelay.o
-OBJS += recPulseTrain.o
-OBJS += recScan.o
-OBJS += recSel.o
-OBJS += recSeq.o
-OBJS += recState.o
-OBJS += recSteppermotor.o
-OBJS += recStringin.o
-OBJS += recStringout.o
-OBJS += recSub.o
-OBJS += recSubArray.o
-OBJS += recTimer.o
-OBJS += recWait.o
-OBJS += recWaitCa.o
-OBJS += recWaveform.o
+#	LIBOBJS += recAai.o
+#	LIBOBJS += recAao.o
+LIBOBJS += recAi.o
+LIBOBJS += recAo.o
+LIBOBJS += recBi.o
+LIBOBJS += recBo.o
+LIBOBJS += recCalc.o
+LIBOBJS += recCompress.o
+LIBOBJS += recDfanout.o
+LIBOBJS += recEg.o
+LIBOBJS += recEgevent.o
+LIBOBJS += recEr.o
+LIBOBJS += recErevent.o
+LIBOBJS += recEvent.o
+LIBOBJS += recFanout.o
+#	LIBOBJS += recGsub.o
+LIBOBJS += recHistogram.o
+LIBOBJS += recLongin.o
+LIBOBJS += recLongout.o
+LIBOBJS += recMbbi.o
+LIBOBJS += recMbbiDirect.o
+LIBOBJS += recMbbo.o
+LIBOBJS += recMbboDirect.o
+#	LIBOBJS += recPal.o
+LIBOBJS += recPermissive.o
+LIBOBJS += recPid.o
+LIBOBJS += recPulseCounter.o
+LIBOBJS += recPulseDelay.o
+LIBOBJS += recPulseTrain.o
+LIBOBJS += recScan.o
+LIBOBJS += recSel.o
+LIBOBJS += recSeq.o
+LIBOBJS += recState.o
+LIBOBJS += recSteppermotor.o
+LIBOBJS += recStringin.o
+LIBOBJS += recStringout.o
+LIBOBJS += recSub.o
+LIBOBJS += recSubArray.o
+LIBOBJS += recTimer.o
+LIBOBJS += recWait.o
+LIBOBJS += recWaitCa.o
+LIBOBJS += recWaveform.o
 
-PROD = recSup
+LIBNAME = recSup
 
 include $(EPICS)/config/RULES.Vx
 
-$(PROD): $(OBJS)
-	$(RM) $@
-	$(LINK.c) $@ $(OBJS) $(LDLIBS)
-
diff --git a/src/sequencer/Makefile.Vx b/src/sequencer/Makefile.Vx
index c32860eb9..63cb2b0c6 100644
--- a/src/sequencer/Makefile.Vx
+++ b/src/sequencer/Makefile.Vx
@@ -8,21 +8,17 @@ SRCS.c = \
 	../seq_main.c ../seq_ca.c ../seq_qry.c ../seq_task.c \
 	../seq_mac.c ../seq_prog.c
 
-OBJS = \
+LIBOBJS = \
 	seq_main.o seq_ca.o seq_qry.o seq_task.o \
 	seq_mac.o seq_prog.o seqVersion.o
 
-PROD = seq
+LIBNAME = seq
 
 include $(EPICS)/config/RULES.Vx
 
 clean::
 	@$(RM) seqVersion.c
 
-seq: $(OBJS)
-	$(RM) $@
-	$(LINK.c) $@ $(OBJS) $(LDLIBS)
-
 seqVersion.c: ../Version
 	$(RM) seqVersion.c
 	sh ../makeSeqVersion ../Version > seqVersion.c