From 55fcafe89ae91f0a24c855037523fc5f37a410ad Mon Sep 17 00:00:00 2001 From: MarkRivers <rivers@cars.uchicago.edu> Date: Mon, 12 Jul 2004 19:24:14 +0000 Subject: [PATCH] Removed MPF --- configure/RELEASE | 46 ++++++++++++++++----------------- xxxApp/src/Makefile | 1 - xxxApp/src/iocxxxInclude.dbd | 1 - xxxApp/src/iocxxxVXInclude.dbd | 1 - xxxApp/src/xxxCommonInclude.dbd | 2 -- 5 files changed, 22 insertions(+), 29 deletions(-) diff --git a/configure/RELEASE b/configure/RELEASE index 6aa47e6..4572e86 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -9,30 +9,28 @@ # # Add your declarations here -ALLEN_BRADLEY=/corvette/home/epics/synApps5-1/allenBradley/2-1 -ASYN=/corvette/home/epics/synApps5-1/asyn/2-2beta -AUTOSAVE=/corvette/home/epics/synApps5-1/autosave/2-3 -CALC=/corvette/home/epics/synApps5-1/calc -CAMAC=/corvette/home/epics/synApps5-1/camac -CCD=/corvette/home/epics/synApps5-1/ccd -DAC128V=/corvette/home/epics/synApps5-1/dac128V -DXP=/corvette/home/epics/synApps5-1/dxp -GPIBCORE=/corvette/home/epics/synApps5-1/gpibCore/1-3 -IP=/corvette/home/epics/synApps5-1/ip -IP330=/corvette/home/epics/synApps5-1/ip330 -IPAC=/corvette/home/epics/synApps5-1/ipac/2-7a -IPUNIDIG=/corvette/home/epics/synApps5-1/ipUnidig +ALLEN_BRADLEY=/corvette/home/epics/synApps5-1beta/allenBradley/2-1 +ASYN=/corvette/home/epics/synApps5-1beta/asyn/3-3beta +AUTOSAVE=/corvette/home/epics/synApps5-1beta/autosave/ +CALC=/corvette/home/epics/synApps5-1beta/calc +CAMAC=/corvette/home/epics/synApps5-1beta/camac +CCD=/corvette/home/epics/synApps5-1beta/ccd +DAC128V=/corvette/home/epics/synApps5-1beta/dac128V +DXP=/corvette/home/epics/synApps5-1beta/dxp +IP=/corvette/home/epics/synApps5-1beta/ip +IP330=/corvette/home/epics/synApps5-1beta/ip330 +IPAC=/corvette/home/epics/synApps5-1beta/ipac/2-7a +IPUNIDIG=/corvette/home/epics/synApps5-1beta/ipUnidig #LOVE=/corvette/home/epics/synApps5-1/love -MCA=/corvette/home/epics/synApps5-1/mca -MOTOR=/corvette/home/epics/synApps5-1/motor -MPF=/corvette/home/epics/synApps5-1/mpf/2-6beta -OPTICS=/corvette/home/epics/synApps5-1/optics -QUADEM=/corvette/home/epics/synApps5-1/quadEM -SSCAN=/corvette/home/epics/synApps5-1/sscan -STD=/corvette/home/epics/synApps5-1/std -SNCSEQ=/corvette/home/epics/synApps5-1/seq/2-0-9beta -VME=/corvette/home/epics/synApps5-1/vme -VXSTATS=/corvette/home/epics/synApps5-1/vxStats/1-7-2a -EPICS_BASE=/corvette/usr/local/epics/base-3.14.5 +MCA=/corvette/home/epics/synApps5-1beta/mca +MOTOR=/corvette/home/epics/synApps5-1beta/motor +OPTICS=/corvette/home/epics/synApps5-1beta/optics +QUADEM=/corvette/home/epics/synApps5-1beta/quadEM +SSCAN=/corvette/home/epics/synApps5-1beta/sscan +STD=/corvette/home/epics/synApps5-1beta/std +SNCSEQ=/corvette/home/epics/synApps5-1beta/seq/2-0-9beta +VME=/corvette/home/epics/synApps5-1beta/vme +VXSTATS=/corvette/home/epics/synApps5-1beta/vxStats/1-7-2a +EPICS_BASE=/corvette/usr/local/epics/base-3.14.6 TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top diff --git a/xxxApp/src/Makefile b/xxxApp/src/Makefile index 9b6a09e..e52bf98 100644 --- a/xxxApp/src/Makefile +++ b/xxxApp/src/Makefile @@ -56,7 +56,6 @@ xxx_Common_LIBS += marCCD xxx_Common_LIBS += roperCCD #xxx_Common_LIBS += Acs Ims Mclennan motor Newport softMotor xxx_Common_LIBS += Acs motor Mclennan Newport softMotor -xxx_Common_LIBS += mpf xxx_Common_LIBS += asyn xxx_Common_LIBS += seq pv seqDev xxx_Common_LIBS += $(EPICS_BASE_IOC_LIBS) diff --git a/xxxApp/src/iocxxxInclude.dbd b/xxxApp/src/iocxxxInclude.dbd index 27c9b12..41394d3 100644 --- a/xxxApp/src/iocxxxInclude.dbd +++ b/xxxApp/src/iocxxxInclude.dbd @@ -1,3 +1,2 @@ # stuff for non-vxWorks ioc include "xxxCommonInclude.dbd" -include "mpfSerial.dbd" diff --git a/xxxApp/src/iocxxxVXInclude.dbd b/xxxApp/src/iocxxxVXInclude.dbd index 7cc3086..c8db5bc 100644 --- a/xxxApp/src/iocxxxVXInclude.dbd +++ b/xxxApp/src/iocxxxVXInclude.dbd @@ -3,7 +3,6 @@ # Include everything for non-vxWorks IOC include "xxxCommonInclude.dbd" -include "mpfSerialVx.dbd" include "vmeVXSupport.dbd" include "sscanVXSupport.dbd" include "stdVXSupport.dbd" diff --git a/xxxApp/src/xxxCommonInclude.dbd b/xxxApp/src/xxxCommonInclude.dbd index 4ed34f0..9a3e4f6 100644 --- a/xxxApp/src/xxxCommonInclude.dbd +++ b/xxxApp/src/xxxCommonInclude.dbd @@ -3,8 +3,6 @@ include "base.dbd" include "asyn.dbd" include "drvAsynSerialPort.dbd" include "drvAsynIPPort.dbd" -include "mpf.dbd" -include "devStringMpf.dbd" include "stdSupport.dbd" include "calcSupport.dbd" include "sscanSupport.dbd" -- GitLab