diff --git a/src/dev/Makefile.Vx b/src/dev/Makefile.Vx
index 9fb09a6f3..3322f8fbc 100644
--- a/src/dev/Makefile.Vx
+++ b/src/dev/Makefile.Vx
@@ -4,193 +4,191 @@ include $(EPICS)/config/CONFIG_BASE
 
 USR_INCLUDES = -I../../drv
 
-SRCS.c = \
-	../devAiDvx2502.c\
-	../devAiSoft.c\
-	../devAiSoftRaw.c\
-	../devAiSymb.c\
-	../devAiTestAsyn.c\
-	../devAiXy566Di.c\
-	../devAiXy566DiL.c\
-	../devAiXy566Se.c\
-	../devAoSoft.c\
-	../devApsEg.c\
-	../devApsEr.c\
-	../devAoSoftRaw.c\
-	../devAoSymb.c\
-	../devAoTestAsyn.c\
-	../devAoVmiVme4100.c\
-	../devBiMpv910.c\
-	../devBiSoft.c\
-	../devBiSoftRaw.c\
-	../devBiTestAsyn.c\
-	../devBiXVme210.c\
-	../devBoMpv902.c\
-	../devBoSoft.c\
-	../devBoSoftRaw.c\
-	../devBoTestAsyn.c\
-	../devBoXVme220.c\
-	../devCommonGpib.c\
-	../devEventSoft.c\
-	../devEventTestIoEvent.c\
-	../devHistogramSoft.c\
-	../devHistogramTestAsyn.c\
-	../devLiSoft.c\
-	../devLiSymb.c\
-	../devLoSoft.c\
-	../devLoSymb.c\
-	../devMbbiMpv910.c\
-	../devMbbiSoft.c\
-	../devMbbiSoftRaw.c\
-	../devMbbiTestAsyn.c\
-	../devMbbiXVme210.c\
-	../devMbboMpv902.c\
-	../devMbboSoft.c\
-	../devMbboSoftRaw.c\
-	../devMbboTestAsyn.c\
-	../devMbboXVme220.c\
-	../devMbbiDirectMpv910.c\
-	../devMbbiDirectSoft.c\
-	../devMbbiDirectSoftRaw.c\
-	../devMbbiDirectXVme210.c\
-	../devMbboDirectMpv902.c\
-	../devMbboDirectSoft.c\
-	../devMbboDirectSoftRaw.c\
-	../devMbboDirectXVme220.c\
-	../devPtSoft.c\
-	../devSmCompumotor1830.c\
-	../devSmOms6Axis.c\
-	../devSiSoft.c\
-	../devSiSymb.c\
-	../devSiTestAsyn.c\
-	../devSoSoft.c\
-	../devSASoft.c\
-	../devSoSymb.c\
-	../devSoTestAsyn.c\
-	../devWfSoft.c\
-	../devWfTestAsyn.c\
-	../devWfXy566Sc.c\
-	../devAllenBradley.c\
-	../devAt5Vxi.c\
-	../devMz8310.c\
-	../devTimerMz8310.c\
-	../devVxiTDM.c\
-	../devAiKscV215.c\
-	../devXy240.c\
-	../devHpe1368a.c\
-	../devAt8Fp.c\
-	../devWfComet.c\
-	../devWfDvx2502.c\
-	../devWfJoergerVtr1.c\
-	../devAvme9440.c\
-	../devSysmon.c
-#	../devAiCamac.c\
-#	../devAaiCamac.c\
-#	../devBiCamac.c\
-#	../devLiCamac.c\
-#	../devMbbiCamac.c\
-#	../devMbbiDirectCamac.c\
-#	../devWfCamac.c\
-#	../devAoCamac.c\
-#	../devAaoCamac.c\
-#	../devBoCamac.c\
-#	../devLoCamac.c\
-#	../devMbboCamac.c\
-#	../devMbboDirectCamac.c 
+#	SRCS.c += ../devAaiCamac.c
+#	SRCS.c += ../devAiCamac.c
+SRCS.c += ../devAiDvx2502.c
+SRCS.c += ../devAiKscV215.c
+SRCS.c += ../devAiSoft.c
+SRCS.c += ../devAiSoftRaw.c
+SRCS.c += ../devAiSymb.c
+SRCS.c += ../devAiTestAsyn.c
+SRCS.c += ../devAiXy566Di.c
+SRCS.c += ../devAiXy566DiL.c
+SRCS.c += ../devAiXy566Se.c
+SRCS.c += ../devAllenBradley.c
+#	SRCS.c += ../devAaoCamac.c
+#	SRCS.c += ../devAoCamac.c
+SRCS.c += ../devAoSoft.c
+SRCS.c += ../devAoSoftRaw.c
+SRCS.c += ../devAoSymb.c
+SRCS.c += ../devAoTestAsyn.c
+SRCS.c += ../devAoVmiVme4100.c
+SRCS.c += ../devApsEg.c
+SRCS.c += ../devApsEr.c
+SRCS.c += ../devAt5Vxi.c
+SRCS.c += ../devAt8Fp.c
+SRCS.c += ../devAvme9440.c
+#	SRCS.c += ../devBiCamac.c
+SRCS.c += ../devBiMpv910.c
+SRCS.c += ../devBiSoft.c
+SRCS.c += ../devBiSoftRaw.c
+SRCS.c += ../devBiTestAsyn.c
+SRCS.c += ../devBiXVme210.c
+#	SRCS.c += ../devBoCamac.c
+SRCS.c += ../devBoMpv902.c
+SRCS.c += ../devBoSoft.c
+SRCS.c += ../devBoSoftRaw.c
+SRCS.c += ../devBoTestAsyn.c
+SRCS.c += ../devBoXVme220.c
+SRCS.c += ../devCommonGpib.c
+SRCS.c += ../devEventSoft.c
+SRCS.c += ../devEventTestIoEvent.c
+SRCS.c += ../devHistogramSoft.c
+SRCS.c += ../devHistogramTestAsyn.c
+SRCS.c += ../devHpe1368a.c
+#	OBJS += devLiCamac.c
+SRCS.c += ../devLiSoft.c
+SRCS.c += ../devLiSymb.c
+#	OBJS += devLoCamac.c
+SRCS.c += ../devLoSoft.c
+SRCS.c += ../devLoSymb.c
+#	SRCS.c += ../devMbbiCamac.c
+#	SRCS.c += ../devMbbiDirectCamac.c
+SRCS.c += ../devMbbiDirectMpv910.c
+SRCS.c += ../devMbbiDirectSoft.c
+SRCS.c += ../devMbbiDirectSoftRaw.c
+SRCS.c += ../devMbbiDirectXVme210.c
+SRCS.c += ../devMbbiMpv910.c
+SRCS.c += ../devMbbiSoft.c
+SRCS.c += ../devMbbiSoftRaw.c
+SRCS.c += ../devMbbiTestAsyn.c
+SRCS.c += ../devMbbiXVme210.c
+#	SRCS.c += ../devMbboCamac.c
+#	SRCS.c += ../devMbboDirectCamac.c
+SRCS.c += ../devMbboDirectMpv902.c
+SRCS.c += ../devMbboDirectSoft.c
+SRCS.c += ../devMbboDirectSoftRaw.c
+SRCS.c += ../devMbboDirectXVme220.c
+SRCS.c += ../devMbboMpv902.c
+SRCS.c += ../devMbboSoft.c
+SRCS.c += ../devMbboSoftRaw.c
+SRCS.c += ../devMbboTestAsyn.c
+SRCS.c += ../devMbboXVme220.c
+SRCS.c += ../devMz8310.c
+SRCS.c += ../devPtSoft.c
+SRCS.c += ../devSASoft.c
+SRCS.c += ../devSiSoft.c
+SRCS.c += ../devSiSymb.c
+SRCS.c += ../devSiTestAsyn.c
+SRCS.c += ../devSmCompumotor1830.c
+SRCS.c += ../devSmOms6Axis.c
+SRCS.c += ../devSoSoft.c
+SRCS.c += ../devSoSymb.c
+SRCS.c += ../devSoTestAsyn.c
+SRCS.c += ../devSysmon.c
+SRCS.c += ../devTimerMz8310.c
+SRCS.c += ../devVxiTDM.c
+#	SRCS.c += ../devWfCamac.c
+SRCS.c += ../devWfComet.c
+SRCS.c += ../devWfDvx2502.c
+SRCS.c += ../devWfJoergerVtr1.c
+SRCS.c += ../devWfSoft.c
+SRCS.c += ../devWfTestAsyn.c
+SRCS.c += ../devWfXy566Sc.c
+SRCS.c += ../devXy240.c
 
-OBJS = \
-	devAiDvx2502.o\
-	devAiSoft.o\
-	devAiSoftRaw.o\
-	devAiSymb.o\
-	devAiTestAsyn.o\
-	devAiXy566Di.o\
-	devAiXy566DiL.o\
-	devAiXy566Se.o\
-	devAoSoft.o\
-	devAoSoftRaw.o\
-	devAoSymb.o\
-	devAoTestAsyn.o\
-	devAoVmiVme4100.o\
-	devBiMpv910.o\
-	devApsEg.o\
-	devApsEr.o\
-	devBiSoft.o\
-	devBiSoftRaw.o\
-	devBiTestAsyn.o\
-	devBiXVme210.o\
-	devBoMpv902.o\
-	devBoSoft.o\
-	devBoSoftRaw.o\
-	devBoTestAsyn.o\
-	devBoXVme220.o\
-	devCommonGpib.o\
-	devEventSoft.o\
-	devEventTestIoEvent.o\
-	devHistogramSoft.o\
-	devHistogramTestAsyn.o\
-	devLiSoft.o\
-	devLiSymb.o\
-	devLoSoft.o\
-	devLoSymb.o\
-	devMbbiMpv910.o\
-	devMbbiSoft.o\
-	devMbbiSoftRaw.o\
-	devMbbiTestAsyn.o\
-	devMbbiXVme210.o\
-	devMbboMpv902.o\
-	devMbboSoft.o\
-	devMbboSoftRaw.o\
-	devMbboTestAsyn.o\
-	devMbboXVme220.o\
-	devMbbiDirectMpv910.o\
-	devMbbiDirectSoft.o\
-	devMbbiDirectSoftRaw.o\
-	devMbbiDirectXVme210.o\
-	devMbboDirectMpv902.o\
-	devMbboDirectSoft.o\
-	devMbboDirectSoftRaw.o\
-	devMbboDirectXVme220.o\
-	devPtSoft.o\
-	devSmCompumotor1830.o\
-	devSmOms6Axis.o\
-	devSASoft.o\
-	devSiSoft.o\
-	devSiSymb.o\
-	devSiTestAsyn.o\
-	devSoSoft.o\
-	devSoSymb.o\
-	devSoTestAsyn.o\
-	devWfSoft.o\
-	devWfTestAsyn.o\
-	devWfXy566Sc.o\
-	devAllenBradley.o\
-	devAt5Vxi.o\
-	devMz8310.o\
-	devTimerMz8310.o\
-	devVxiTDM.o\
-	devAiKscV215.o\
-	devXy240.o\
-	devHpe1368a.o\
-	devAt8Fp.o\
-	devWfComet.o\
-	devWfDvx2502.o\
-	devWfJoergerVtr1.o\
-	devAvme9440.o\
-	devSysmon.o
-#	devAiCamac.o\
-#	devAaiCamac.o\
-#	devBiCamac.o\
-#	devLiCamac.o\
-#	devMbbiCamac.o\
-#	devMbbiDirectCamac.o\
-#	devWfCamac.o\
-#	devAoCamac.o\
-#	devAaoCamac.o\
-#	devBoCamac.o\
-#	devLoCamac.o\
-#	devMbboCamac.o\
-#	devMbboDirectCamac.o
+#	OBJS += devAaiCamac.o
+#	OBJS += devAiCamac.o
+OBJS += devAiDvx2502.o
+OBJS += devAiKscV215.o
+OBJS += devAiSoft.o
+OBJS += devAiSoftRaw.o
+OBJS += devAiSymb.o
+OBJS += devAiTestAsyn.o
+OBJS += devAiXy566Di.o
+OBJS += devAiXy566DiL.o
+OBJS += devAiXy566Se.o
+OBJS += devAllenBradley.o
+#	OBJS += devAaoCamac.o
+#	OBJS += devAoCamac.o
+OBJS += devAoSoft.o
+OBJS += devAoSoftRaw.o
+OBJS += devAoSymb.o
+OBJS += devAoTestAsyn.o
+OBJS += devAoVmiVme4100.o
+OBJS += devApsEg.o
+OBJS += devApsEr.o
+OBJS += devAt5Vxi.o
+OBJS += devAt8Fp.o
+OBJS += devAvme9440.o
+#	OBJS += devBiCamac.o
+OBJS += devBiMpv910.o
+OBJS += devBiSoft.o
+OBJS += devBiSoftRaw.o
+OBJS += devBiTestAsyn.o
+OBJS += devBiXVme210.o
+#	OBJS += devBoCamac.o
+OBJS += devBoMpv902.o
+OBJS += devBoSoft.o
+OBJS += devBoSoftRaw.o
+OBJS += devBoTestAsyn.o
+OBJS += devBoXVme220.o
+OBJS += devCommonGpib.o
+OBJS += devEventSoft.o
+OBJS += devEventTestIoEvent.o
+OBJS += devHistogramSoft.o
+OBJS += devHistogramTestAsyn.o
+OBJS += devHpe1368a.o
+#	OBJS += devLiCamac.o
+OBJS += devLiSoft.o
+OBJS += devLiSymb.o
+#	OBJS += devLoCamac.o
+OBJS += devLoSoft.o
+OBJS += devLoSymb.o
+#	OBJS += devMbbiCamac.o
+#	OBJS += devMbbiDirectCamac.o
+OBJS += devMbbiDirectMpv910.o
+OBJS += devMbbiDirectSoft.o
+OBJS += devMbbiDirectSoftRaw.o
+OBJS += devMbbiDirectXVme210.o
+OBJS += devMbbiMpv910.o
+OBJS += devMbbiSoft.o
+OBJS += devMbbiSoftRaw.o
+OBJS += devMbbiTestAsyn.o
+OBJS += devMbbiXVme210.o
+#	OBJS += devMbboCamac.o
+#	OBJS += devMbboDirectCamac.o
+OBJS += devMbboDirectMpv902.o
+OBJS += devMbboDirectSoft.o
+OBJS += devMbboDirectSoftRaw.o
+OBJS += devMbboDirectXVme220.o
+OBJS += devMbboMpv902.o
+OBJS += devMbboSoft.o
+OBJS += devMbboSoftRaw.o
+OBJS += devMbboTestAsyn.o
+OBJS += devMbboXVme220.o
+OBJS += devMz8310.o
+OBJS += devPtSoft.o
+OBJS += devSASoft.o
+OBJS += devSiSoft.o
+OBJS += devSiSymb.o
+OBJS += devSiTestAsyn.o
+OBJS += devSmCompumotor1830.o
+OBJS += devSmOms6Axis.o
+OBJS += devSoSoft.o
+OBJS += devSoSymb.o
+OBJS += devSoTestAsyn.o
+OBJS += devSysmon.o
+OBJS += devTimerMz8310.o
+OBJS += devVxiTDM.o
+#	OBJS += devWfCamac.o
+OBJS += devWfComet.o
+OBJS += devWfDvx2502.o
+OBJS += devWfJoergerVtr1.o
+OBJS += devWfSoft.o
+OBJS += devWfTestAsyn.o
+OBJS += devWfXy566Sc.o
+OBJS += devXy240.o
 
 PROD = devSup
 
@@ -200,3 +198,7 @@ $(PROD): $(OBJS)
 	$(RM) $@
 	$(LINK.c) $@ $(OBJS) $(LDLIBS)
 
+
+
+
+
diff --git a/src/libCom/Makefile.Unix b/src/libCom/Makefile.Unix
index 45edfbffe..7c815354d 100644
--- a/src/libCom/Makefile.Unix
+++ b/src/libCom/Makefile.Unix
@@ -4,22 +4,42 @@ include $(EPICS)/config/CONFIG_BASE
 
 USR_CFLAGS = -D_NO_PROTO
 
-SRCS.c = \
-	../bucketLib.c ../calcPerform.c ../cvtFast.c \
-	../ellLib.c ../envSubr.c ../errMtst.c ../errSymLib.c \
-	../fdmgr.c  ../freeListLib.c \
-	../gpHashLib.c ../memDebugLib.c \
-	../nextFieldSubr.c ../postfix.c \
-	../tsSubr.c errSymTbl.c ../errInc.c \
-	../realpath.c  ../errPrintfUNIX.c
+SRCS.c += ../bucketLib.c
+SRCS.c += ../calcPerform.c
+SRCS.c += ../cvtFast.c
+SRCS.c += ../ellLib.c
+SRCS.c += ../envSubr.c
+SRCS.c += ../errInc.c
+SRCS.c += ../errMtst.c
+SRCS.c += ../errPrintfUNIX.c
+SRCS.c += ../errSymLib.c
+SRCS.c += errSymTbl.c
+SRCS.c += ../fdmgr.c
+SRCS.c += ../freeListLib.c
+SRCS.c += ../gpHashLib.c
+SRCS.c += ../memDebugLib.c
+SRCS.c += ../nextFieldSubr.c
+SRCS.c += ../postfix.c
+SRCS.c += ../realpath.c
+SRCS.c += ../tsSubr.c
 
-LIBOBJS = \
-	tsSubr.o bucketLib.o calcPerform.o\
-	cvtFast.o ellLib.o\
-	envSubr.o errMtst.o errSymLib.o errSymTbl.o fdmgr.o \
-	freeListLib.o gpHashLib.o \
-	memDebugLib.o  nextFieldSubr.o postfix.o \
-	realpath.o  errPrintfUNIX.o
+LIBOBJS += bucketLib.o
+LIBOBJS += calcPerform.o
+LIBOBJS += cvtFast.o
+LIBOBJS += ellLib.o
+LIBOBJS += envSubr.o
+LIBOBJS += errMtst.o
+LIBOBJS += errPrintfUNIX.o
+LIBOBJS += errSymLib.o
+LIBOBJS += errSymTbl.o
+LIBOBJS += fdmgr.o
+LIBOBJS += freeListLib.o
+LIBOBJS += gpHashLib.o
+LIBOBJS += memDebugLib.o
+LIBOBJS += nextFieldSubr.o
+LIBOBJS += postfix.o
+LIBOBJS += realpath.o
+LIBOBJS += tsSubr.o
 
 LIBNAME = libCom.a