From b6b88918c1d44b432ab2d475bd5be107d5fdbe3a Mon Sep 17 00:00:00 2001 From: Ron Sluiter Date: Thu, 5 Jun 2003 17:19:19 +0000 Subject: [PATCH] Must have seperate builds for Unix and VxWorks. --- motorExApp/NoAsyn/Makefile | 20 +++++++++----------- motorExApp/NoMPF/Makefile | 20 +++++++++----------- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/motorExApp/NoAsyn/Makefile b/motorExApp/NoAsyn/Makefile index 12d01a87..07c2c29b 100644 --- a/motorExApp/NoAsyn/Makefile +++ b/motorExApp/NoAsyn/Makefile @@ -6,23 +6,21 @@ include $(TOP)/configure/CONFIG #============================= DBD += NoMPF.dbd +DBD += NoMPFVx.dbd -PROD_IOC_vxWorks = NoMPF +PROD_IOC_DEFAULT = NoMPF +PROD_IOC_vxWorks = NoMPFVx NoMPF_SRCS += NoMPF_registerRecordDeviceDriver.cpp NoMPF_SRCS_DEFAULT += NoMPFMain.cpp -NoMPF_SRCS_vxWorks += -nil- - -#The following adds support from base/src/vxWorks -NoMPF_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary - -NoMPF_LIBS += motor -NoMPF_LIBS_vxWorks += oms -NoMPF_LIBS += softMotor -NoMPF_LIBS += MXmotor - +NoMPF_LIBS += MXmotor softMotor motor NoMPF_LIBS += $(EPICS_BASE_IOC_LIBS) +NoMPFVx_SRCS += NoMPFVx_registerRecordDeviceDriver.cpp +NoMPFVx_LIBS += oms softMotor motor +NoMPFVx_OBJS += $(EPICS_BASE_BIN)/vxComLibrary +NoMPFVx_LIBS += $(EPICS_BASE_IOC_LIBS) + #=========================== include $(TOP)/configure/RULES diff --git a/motorExApp/NoMPF/Makefile b/motorExApp/NoMPF/Makefile index 12d01a87..07c2c29b 100644 --- a/motorExApp/NoMPF/Makefile +++ b/motorExApp/NoMPF/Makefile @@ -6,23 +6,21 @@ include $(TOP)/configure/CONFIG #============================= DBD += NoMPF.dbd +DBD += NoMPFVx.dbd -PROD_IOC_vxWorks = NoMPF +PROD_IOC_DEFAULT = NoMPF +PROD_IOC_vxWorks = NoMPFVx NoMPF_SRCS += NoMPF_registerRecordDeviceDriver.cpp NoMPF_SRCS_DEFAULT += NoMPFMain.cpp -NoMPF_SRCS_vxWorks += -nil- - -#The following adds support from base/src/vxWorks -NoMPF_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary - -NoMPF_LIBS += motor -NoMPF_LIBS_vxWorks += oms -NoMPF_LIBS += softMotor -NoMPF_LIBS += MXmotor - +NoMPF_LIBS += MXmotor softMotor motor NoMPF_LIBS += $(EPICS_BASE_IOC_LIBS) +NoMPFVx_SRCS += NoMPFVx_registerRecordDeviceDriver.cpp +NoMPFVx_LIBS += oms softMotor motor +NoMPFVx_OBJS += $(EPICS_BASE_BIN)/vxComLibrary +NoMPFVx_LIBS += $(EPICS_BASE_IOC_LIBS) + #=========================== include $(TOP)/configure/RULES