From e36bc1a5fef859498aadce1c7c6d542ef0d4ced1 Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Thu, 23 Mar 2006 00:34:50 +0000 Subject: [PATCH] Added motorSimSupport --- motorExApp/WithAsyn/Makefile | 18 ++++++++++-------- motorExApp/WithMPF/Makefile | 18 ++++++++++-------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/motorExApp/WithAsyn/Makefile b/motorExApp/WithAsyn/Makefile index 0d39d440..ba6028c9 100644 --- a/motorExApp/WithAsyn/Makefile +++ b/motorExApp/WithAsyn/Makefile @@ -27,7 +27,7 @@ WithMPFVx_SRCS += WithMPFVx_registerRecordDeviceDriver.cpp WithMPF_SRCS_DEFAULT += WithMPFMain.cpp # Support from EPICS base -WithMPF_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary +WithMPF_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary # Support from IPAC R2.5 and below. #!WithMPFVx_LDOBJS_vxWorks += $(IPAC_BIN)/ipacLib @@ -41,9 +41,10 @@ WithMPF_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary #!WithMPF_LIBS += Ims #!WithMPF_LIBS += Newport #!WithMPF_LIBS += softMotor -WithMPF_LIBS += motor -WithMPF_LIBS += asyn -WithMPF_LIBS += $(EPICS_BASE_IOC_LIBS) +#!WithMPF_LIBS += motorSimSupport +WithMPF_LIBS += motor +WithMPF_LIBS += asyn +WithMPF_LIBS += $(EPICS_BASE_IOC_LIBS) #!WithMPFVx_LIBS += Mclennan #!WithMPFVx_LIBS += Micos @@ -53,13 +54,14 @@ WithMPF_LIBS += $(EPICS_BASE_IOC_LIBS) #!WithMPFVx_LIBS += Ims #!WithMPFVx_LIBS += Newport #!WithMPFVx_LIBS += softMotor -WithMPFVx_LIBS += motor +#!WithMPFVx_LIBS += motorSimSupport +WithMPFVx_LIBS += motor # Support from IPAC R2.6 and above. -WithMPFVx_LIBS += Ipac TyGSOctal +WithMPFVx_LIBS += Ipac TyGSOctal -WithMPFVx_LIBS += asyn -WithMPFVx_LIBS += $(EPICS_BASE_IOC_LIBS) +WithMPFVx_LIBS += asyn +WithMPFVx_LIBS += $(EPICS_BASE_IOC_LIBS) include $(TOP)/configure/RULES diff --git a/motorExApp/WithMPF/Makefile b/motorExApp/WithMPF/Makefile index 0d39d440..ba6028c9 100644 --- a/motorExApp/WithMPF/Makefile +++ b/motorExApp/WithMPF/Makefile @@ -27,7 +27,7 @@ WithMPFVx_SRCS += WithMPFVx_registerRecordDeviceDriver.cpp WithMPF_SRCS_DEFAULT += WithMPFMain.cpp # Support from EPICS base -WithMPF_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary +WithMPF_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary # Support from IPAC R2.5 and below. #!WithMPFVx_LDOBJS_vxWorks += $(IPAC_BIN)/ipacLib @@ -41,9 +41,10 @@ WithMPF_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary #!WithMPF_LIBS += Ims #!WithMPF_LIBS += Newport #!WithMPF_LIBS += softMotor -WithMPF_LIBS += motor -WithMPF_LIBS += asyn -WithMPF_LIBS += $(EPICS_BASE_IOC_LIBS) +#!WithMPF_LIBS += motorSimSupport +WithMPF_LIBS += motor +WithMPF_LIBS += asyn +WithMPF_LIBS += $(EPICS_BASE_IOC_LIBS) #!WithMPFVx_LIBS += Mclennan #!WithMPFVx_LIBS += Micos @@ -53,13 +54,14 @@ WithMPF_LIBS += $(EPICS_BASE_IOC_LIBS) #!WithMPFVx_LIBS += Ims #!WithMPFVx_LIBS += Newport #!WithMPFVx_LIBS += softMotor -WithMPFVx_LIBS += motor +#!WithMPFVx_LIBS += motorSimSupport +WithMPFVx_LIBS += motor # Support from IPAC R2.6 and above. -WithMPFVx_LIBS += Ipac TyGSOctal +WithMPFVx_LIBS += Ipac TyGSOctal -WithMPFVx_LIBS += asyn -WithMPFVx_LIBS += $(EPICS_BASE_IOC_LIBS) +WithMPFVx_LIBS += asyn +WithMPFVx_LIBS += $(EPICS_BASE_IOC_LIBS) include $(TOP)/configure/RULES