Skip to content
Snippets Groups Projects
Commit d6c51a30 authored by mooney's avatar mooney
Browse files

.dbd users must come after sources, so required stuff is defined before it is...

.dbd users must come after sources, so required stuff is defined before it is used, but .lib users must come before sources, so required references are encountered before a library is searched

parent c91c0471
No related branches found
No related tags found
No related merge requests found
...@@ -42,57 +42,58 @@ DBD += xxx_Common.dbd ...@@ -42,57 +42,58 @@ DBD += xxx_Common.dbd
xxx_Common_DBD += base.dbd xxx_Common_DBD += base.dbd
ifdef AREA_DETECTOR ifdef AREA_DETECTOR
# areaDetector provides a Makefile for things it needs and supplies # areaDetector provides a Makefile for things it needs and supplies
PROD_NAME = xxx_Common PROD_NAME = xxx_Common
-include $(AREA_DETECTOR)/ADCore/ADApp/commonDriverMakefile -include $(AREA_DETECTOR)/ADCore/ADApp/commonDriverMakefile
# To add the simDetector uncomment the following lines # To add the simDetector uncomment the following lines
#xxx_Common_DBD += simDetectorSupport.dbd xxx_Common_DBD += simDetectorSupport.dbd
#xxx_Common_LIBS += simDetector xxx_Common_LIBS := simDetector $(xxx_Common_LIBS)
endif endif
ifdef ASYN ifdef ASYN
xxx_Common_DBD += asyn.dbd drvAsynSerialPort.dbd xxx_Common_DBD += asyn.dbd drvAsynSerialPort.dbd
xxx_Common_DBD += drvAsynIPPort.dbd drvVxi11.dbd devGpib.dbd xxx_Common_DBD += drvAsynIPPort.dbd drvVxi11.dbd devGpib.dbd
xxx_Common_LIBS += asyn xxx_Common_LIBS := asyn $(xxx_Common_LIBS)
endif endif
ifdef STD ifdef STD
xxx_Common_DBD += stdSupport.dbd xxx_Common_DBD += stdSupport.dbd
xxx_Common_LIBS += std xxx_Common_LIBS := std $(xxx_Common_LIBS)
endif endif
ifdef CALC ifdef CALC
xxx_Common_DBD += calcSupport.dbd xxx_Common_DBD += calcSupport.dbd
xxx_Common_LIBS += calc xxx_Common_LIBS := calc $(xxx_Common_LIBS)
endif endif
ifdef BUSY ifdef BUSY
xxx_Common_DBD += busySupport.dbd xxx_Common_DBD += busySupport.dbd
xxx_Common_LIBS += busy xxx_Common_LIBS := busy $(xxx_Common_LIBS)
endif endif
ifdef SSCAN ifdef SSCAN
xxx_Common_DBD += sscanSupport.dbd xxx_Common_DBD += sscanSupport.dbd
xxx_Common_LIBS += sscan xxx_Common_LIBS := sscan $(xxx_Common_LIBS)
ifdef SNCSEQ ifdef SNCSEQ
xxx_Common_DBD += sscanProgressSupport.dbd xxx_Common_DBD += sscanProgressSupport.dbd
xxx_Common_LIBS += scanProgress xxx_Common_LIBS := scanProgress $(xxx_Common_LIBS)
endif endif
endif endif
ifdef AUTOSAVE ifdef AUTOSAVE
xxx_Common_DBD += asSupport.dbd xxx_Common_DBD += asSupport.dbd
xxx_Common_LIBS += autosave xxx_Common_LIBS := autosave $(xxx_Common_LIBS)
endif endif
ifdef OPTICS ifdef OPTICS
xxx_Common_DBD += opticsSupport.dbd xxx_Common_DBD += opticsSupport.dbd
xxx_Common_LIBS += optics xxx_Common_LIBS := optics $(xxx_Common_LIBS)
endif endif
ifdef MCA ifdef MCA
xxx_Common_DBD += mcaSupport.dbd xxx_Common_DBD += mcaSupport.dbd
xxx_Common_LIBS += mca xxx_Common_LIBS := mca $(xxx_Common_LIBS)
endif endif
ifdef IP ifdef IP
xxx_Common_DBD += ipSupport.dbd xxx_Common_DBD += ipSupport.dbd
xxx_Common_LIBS += ip xxx_Common_LIBS := ip $(xxx_Common_LIBS)
endif endif
ifdef QUADEM ifdef QUADEM
xxx_Common_DBD += drvAHxxx.dbd xxx_Common_DBD += drvAHxxx.dbd
xxx_Common_LIBS += quadEM xxx_Common_LIBS := quadEM $(xxx_Common_LIBS)
endif endif
ifdef MOTOR ifdef MOTOR
xxx_Common_DBD += motorSupport.dbd devAcsMotor.dbd devAerotech.dbd xxx_Common_DBD += motorSupport.dbd devAcsMotor.dbd devAerotech.dbd
...@@ -103,26 +104,26 @@ ifdef MOTOR ...@@ -103,26 +104,26 @@ ifdef MOTOR
xxx_Common_DBD += devSPiiPlus.dbd devSmartMotorMotor.dbd devSoftMotor.dbd xxx_Common_DBD += devSPiiPlus.dbd devSmartMotorMotor.dbd devSoftMotor.dbd
xxx_Common_DBD += devThorLabs.dbd motorRecord.dbd motorSimSupport.dbd xxx_Common_DBD += devThorLabs.dbd motorRecord.dbd motorSimSupport.dbd
xxx_Common_LIBS += Acs acsTech80 Aerotech Attocube Faulhaber Ims KohzuMotor xxx_Common_LIBS := motor $(xxx_Common_LIBS)
xxx_Common_LIBS += Mclennan Micos MicroMo NewFocus Newport Oriel PI PIJena xxx_Common_LIBS := Acs acsTech80 Aerotech Attocube Faulhaber Ims KohzuMotor $(xxx_Common_LIBS)
xxx_Common_LIBS += Parker SmartMotor ThorLabs softMotor motorSimSupport xxx_Common_LIBS := Mclennan Micos MicroMo NewFocus Newport Oriel PI PIJena $(xxx_Common_LIBS)
xxx_Common_LIBS += motor xxx_Common_LIBS := Parker SmartMotor ThorLabs softMotor motorSimSupport $(xxx_Common_LIBS)
endif endif
ifdef SNCSEQ ifdef SNCSEQ
xxx_Common_DBD += devSequencer.dbd xxx_Common_DBD += devSequencer.dbd
xxx_Common_LIBS += seqDev seq pv xxx_Common_LIBS := seqDev seq pv $(xxx_Common_LIBS)
endif endif
ifdef STREAM ifdef STREAM
xxx_Common_DBD += stream.dbd streamSynApps.dbd xxx_Common_DBD += stream.dbd streamSynApps.dbd
xxx_Common_LIBS += stream streamSynApps xxx_Common_LIBS := stream streamSynApps $(xxx_Common_LIBS)
endif endif
ifdef DEVIOCSTATS ifdef DEVIOCSTATS
ifneq ($(OS_CLASS), WIN32) ifneq ($(OS_CLASS), WIN32)
xxx_Common_DBD += devIocStats.dbd iocAdmin.dbd xxx_Common_DBD += devIocStats.dbd iocAdmin.dbd
xxx_Common_LIBS += devIocStats xxx_Common_LIBS := devIocStats $(xxx_Common_LIBS)
endif endif
endif endif
xxx_Common_LIBS += $(EPICS_BASE_IOC_LIBS) xxx_Common_LIBS := $(xxx_Common_LIBS) $(EPICS_BASE_IOC_LIBS)
################################################################## ##################################################################
...@@ -290,10 +291,10 @@ endif ...@@ -290,10 +291,10 @@ endif
xxx_SRCS_vxWorks += iocxxxVX_registerRecordDeviceDriver.cpp xxx_SRCS_vxWorks += iocxxxVX_registerRecordDeviceDriver.cpp
xxx_SRCS_Linux += iocxxxLinux_registerRecordDeviceDriver.cpp xxxMain.cpp xxx_SRCS_Linux += iocxxxLinux_registerRecordDeviceDriver.cpp xxxMain.cpp
ifeq (win32-x86,$(findstring win32-x86, $(T_A))) ifeq (win32-x86,$(findstring win32-x86, $(T_A)))
xxx_SRCS_WIN32 += iocxxxWin32_registerRecordDeviceDriver.cpp xxxMain.cpp xxx_SRCS_WIN32 += iocxxxWin32_registerRecordDeviceDriver.cpp xxxMain.cpp
endif endif
ifeq (windows-x64,$(findstring windows-x64, $(T_A))) ifeq (windows-x64,$(findstring windows-x64, $(T_A)))
xxx_SRCS_WIN32 += iocxxxWin64_registerRecordDeviceDriver.cpp xxxMain.cpp xxx_SRCS_WIN32 += iocxxxWin64_registerRecordDeviceDriver.cpp xxxMain.cpp
endif endif
xxx_SRCS_cygwin32 += iocxxxCygwin_registerRecordDeviceDriver.cpp xxxMain.cpp xxx_SRCS_cygwin32 += iocxxxCygwin_registerRecordDeviceDriver.cpp xxxMain.cpp
xxx_SRCS_solaris += iocxxx_solaris_registerRecordDeviceDriver.cpp xxxMain.cpp xxx_SRCS_solaris += iocxxx_solaris_registerRecordDeviceDriver.cpp xxxMain.cpp
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment