diff --git a/motorExApp/NoAsyn/Makefile b/motorExApp/NoAsyn/Makefile index 202dff3e..85687e69 100644 --- a/motorExApp/NoAsyn/Makefile +++ b/motorExApp/NoAsyn/Makefile @@ -1,3 +1,5 @@ +# "#!" marks lines that can be uncommented. + # Makefile TOP = ../.. include $(TOP)/configure/CONFIG @@ -5,29 +7,44 @@ include $(TOP)/configure/CONFIG # ADD MACRO DEFINITIONS AFTER THIS LINE #============================= -DBD += NoAsyn.dbd -DBD += NoAsynVx.dbd - PROD_IOC_DEFAULT = NoAsyn PROD_IOC_vxWorks = NoAsynVx +COMMONDBDS = base.dbd +COMMONDBDS += motorRecord.dbd +COMMONDBDS += devSoftMotor.dbd +#!COMMONDBDS += devMXmotor.dbd +ifeq ($(OS_CLASS), vxWorks) +COMMONDBDS += devDeltaTau.dbd +COMMONDBDS += MiscVx.dbd +else +COMMONDBDS += Misc.dbd +endif + +DBD += NoAsyn.dbd +NoAsyn_DBD += $(COMMONDBDS) + +ifeq ($(OS_CLASS), vxWorks) +DBD += NoAsynVx.dbd +NoAsynVx_DBD += $(COMMONDBDS) +endif + NoAsyn_SRCS += NoAsyn_registerRecordDeviceDriver.cpp NoAsyn_SRCS_DEFAULT += NoAsynMain.cpp -#!NoAsyn_LIBS += MXmotor -#!NoAsyn_LIBS += softMotor -#!NoAsyn_LIBS += oms -NoAsyn_LIBS += motor -NoAsyn_LIBS += asyn +NoAsynVx_SRCS += NoAsynVx_registerRecordDeviceDriver.cpp + +#!COMMONLIBS += MXmotor +COMMONLIBS += softMotor +ifeq ($(OS_CLASS), vxWorks) +COMMONLIBS += oms +COMMONLIBS += DeltaTau +endif +COMMONLIBS += motor + +NoAsyn_LIBS += $(COMMONLIBS) NoAsyn_LIBS += $(EPICS_BASE_IOC_LIBS) -NoAsynVx_SRCS += NoAsynVx_registerRecordDeviceDriver.cpp -#!NoAsynVx_LIBS += softMotor -#!NoAsynVx_LIBS += oms -#!NoAsynVx_LIBS += DeltaTau -NoAsynVx_LIBS += motor -NoAsynVx_LIBS += asyn - - +NoAsynVx_LIBS += $(COMMONLIBS) NoAsynVx_OBJS += $(EPICS_BASE_BIN)/vxComLibrary NoAsynVx_LIBS += $(EPICS_BASE_IOC_LIBS) diff --git a/motorExApp/NoAsyn/Misc.dbd b/motorExApp/NoAsyn/Misc.dbd new file mode 100644 index 00000000..3bd03290 --- /dev/null +++ b/motorExApp/NoAsyn/Misc.dbd @@ -0,0 +1,5 @@ +registrar(motorUtilRegister) +variable(motorRecordDebug) +#variable(motordrvComdebug) +#variable(motorUtil_debug) + diff --git a/motorExApp/NoAsyn/MiscVx.dbd b/motorExApp/NoAsyn/MiscVx.dbd new file mode 100644 index 00000000..c170aee0 --- /dev/null +++ b/motorExApp/NoAsyn/MiscVx.dbd @@ -0,0 +1,17 @@ +# Oregon Micro Systems VME8/44 driver support. +device(motor,VME_IO,devOMS,"OMS VME8/44") +driver(drvOms) + +# Oregon Micro Systems VME58 driver support. +device(motor,VME_IO,devOms58,"OMS VME58") +driver(drvOms58) + +# Oregon Micro Systems MAXv driver support. +device(motor,VME_IO,devMAXv,"OMS MAXv") +driver(drvMAXv) + +registrar(motorUtilRegister) +variable(motorRecordDebug) +#variable(motordrvComdebug) +#variable(motorUtil_debug) + diff --git a/motorExApp/WithAsyn/WithAsynInclude.dbd b/motorExApp/WithAsyn/WithAsynInclude.dbd deleted file mode 100644 index 1f9b4120..00000000 --- a/motorExApp/WithAsyn/WithAsynInclude.dbd +++ /dev/null @@ -1,18 +0,0 @@ -include "base.dbd" -include "motorSupport.dbd" -include "drvAsynSerialPort.dbd" -#include "devAcsMotor.dbd" -#include "devImsMotor.dbd" -#include "devMclennanMotor.dbd" -#include "devMicos.dbd" -#include "devMicroMo.dbd" -#include "devNewport.dbd" -#include "devPIMotor.dbd" -#include "devOms.dbd" -#include "devSoftMotor.dbd" -#include "motorSimSupport.dbd" -#include "devSmartMotorMotor.dbd" -#include "devKohzuMotor.dbd" -#include "devAttocube.dbd" -#include "devAerotech.dbd" - diff --git a/motorExApp/WithAsyn/WithAsynVxInclude.dbd b/motorExApp/WithAsyn/WithAsynVxInclude.dbd deleted file mode 100644 index 61a66c98..00000000 --- a/motorExApp/WithAsyn/WithAsynVxInclude.dbd +++ /dev/null @@ -1,25 +0,0 @@ -include "base.dbd" -include "motorSupport.dbd" -#include "devAcsMotor.dbd" -#include "devImsMotor.dbd" -#include "devMclennanMotor.dbd" -#include "devMicos.dbd" -#include "devMicroMo.dbd" -#include "devNewport.dbd" -#include "devPIMotor.dbd" -#include "devOms.dbd" -#include "devSoftMotor.dbd" -#include "motorSimSupport.dbd" -#include "devSmartMotorMotor.dbd" -#include "devKohzuMotor.dbd" -#include "devAttocube.dbd" -#include "devAerotech.dbd" - -#include "drvAsynSerialPort.dbd" -#include "drvGsIP488.dbd" - -# Only for IPAC R2.7 and above. -driver(drvIpac) -registrar(tvme200Registrar) -registrar(vipc616Registrar) -registrar(tyGSOctalRegistrar)