From 40f708b8a05df03ba671bee4dec8773db6fefe33 Mon Sep 17 00:00:00 2001 From: MarkRivers <rivers@cars.uchicago.edu> Date: Thu, 29 Apr 2004 04:16:46 +0000 Subject: [PATCH] Rename bruker, mar, roper; remove love; change mpf --- xxxApp/src/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/xxxApp/src/Makefile b/xxxApp/src/Makefile index a8447b9..5637148 100644 --- a/xxxApp/src/Makefile +++ b/xxxApp/src/Makefile @@ -53,9 +53,12 @@ xxx_Common_LIBS += vme xxx_Common_LIBS += std xxx_Common_LIBS += ip xxx_Common_LIBS += gpib -xxx_Common_LIBS += bruker -xxx_Common_LIBS += Acs Ims Mclennan motor motorCOM_mpf Newport softMotor -xxx_Common_LIBS += mpf mpfEpics mpfSerial +xxx_Common_LIBS += brukerCCD +xxx_Common_LIBS += marCCD +xxx_Common_LIBS += roperCCD +#xxx_Common_LIBS += Acs Ims Mclennan motor Newport softMotor +xxx_Common_LIBS += Acs motor Newport softMotor +xxx_Common_LIBS += mpf xxx_Common_LIBS += seq pv seqDev xxx_Common_LIBS += $(EPICS_BASE_IOC_LIBS) @@ -65,11 +68,10 @@ xxx_vxWorks_LIBS += ip330 devIp330 xxx_vxWorks_LIBS += ipUnidig xxx_vxWorks_LIBS += dac128V xxx_vxWorks_LIBS += quadEM -xxx_vxWorks_LIBS += bruker xxx_vxWorks_LIBS += camac devCamac xxx_vxWorks_LIBS += dxp xerxes xxx_vxWorks_LIBS += oms -xxx_vxWorks_LIBS += love +#xxx_vxWorks_LIBS += love xxx_vxWorks_LIBS += vxStats xxx_vxWorks_LIBS += TyGSOctal Ipac #The following adds support from base/src/vxWorks -- GitLab