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

Put seq up front. Note that seq dependencies changed after version 2.1.

parent 9c1bd015
No related branches found
No related tags found
No related merge requests found
...@@ -31,8 +31,10 @@ include $(TOP)/configure/CONFIG ...@@ -31,8 +31,10 @@ include $(TOP)/configure/CONFIG
PROD_IOC = xxx PROD_IOC = xxx
# Note that the order in which .dbd files are added to a list variable # Note that the order in which .dbd files and libraries are added to a list
# doesn't matter, but the order of libraries does. # variable is important. For .dbd files, things must be defined before they
# are referenced by a later .dbd file. For libraries, things must be referenced
# before they are searched for; otherwise they won't be included.
################################################################## ##################################################################
# First, define xxx_Common_DBD and xxx_Common_LIBS from the modules # First, define xxx_Common_DBD and xxx_Common_LIBS from the modules
...@@ -41,6 +43,19 @@ PROD_IOC = xxx ...@@ -41,6 +43,19 @@ PROD_IOC = xxx
DBD += xxx_Common.dbd DBD += xxx_Common.dbd
xxx_Common_DBD += base.dbd xxx_Common_DBD += base.dbd
ifdef SNCSEQ
ifeq (seq-2-1, $(findstring seq-2-1, $(SNCSEQ)))
xxx_Common_DBD += devSequencer.dbd
xxx_Common_LIBS := seqDev seq pv $(xxx_Common_LIBS)
else ifeq (seq-2.1, $(findstring seq-2.1, $(SNCSEQ)))
xxx_Common_DBD += devSequencer.dbd
xxx_Common_LIBS := seqDev seq pv $(xxx_Common_LIBS)
else
# seq 2.2.
xxx_Common_LIBS := seq pv $(xxx_Common_LIBS)
endif
endif
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
...@@ -109,17 +124,14 @@ ifdef MOTOR ...@@ -109,17 +124,14 @@ ifdef MOTOR
xxx_Common_LIBS := Mclennan Micos MicroMo NewFocus Newport Oriel PI PIJena $(xxx_Common_LIBS) xxx_Common_LIBS := Mclennan Micos MicroMo NewFocus Newport Oriel PI PIJena $(xxx_Common_LIBS)
xxx_Common_LIBS := Parker SmartMotor ThorLabs softMotor motorSimSupport $(xxx_Common_LIBS) xxx_Common_LIBS := Parker SmartMotor ThorLabs softMotor motorSimSupport $(xxx_Common_LIBS)
endif endif
ifdef SNCSEQ
xxx_Common_DBD += devSequencer.dbd
xxx_Common_LIBS := seqDev seq pv $(xxx_Common_LIBS)
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) 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) xxx_Common_LIBS := devIocStats $(xxx_Common_LIBS)
endif endif
endif endif
......
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