Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
X
xxx-R6-1
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
synApps_6_1_Working
xxx-R6-1
Commits
6da0745c
Commit
6da0745c
authored
10 years ago
by
mooney
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
xxxApp/src/Makefile
+19
-7
19 additions, 7 deletions
xxxApp/src/Makefile
with
19 additions
and
7 deletions
xxxApp/src/Makefile
+
19
−
7
View file @
6da0745c
...
...
@@ -31,8 +31,10 @@ include $(TOP)/configure/CONFIG
PROD_IOC
=
xxx
# Note that the order in which .dbd files are added to a list variable
# doesn't matter, but the order of libraries does.
# Note that the order in which .dbd files and libraries are added to a list
# 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
...
...
@@ -41,6 +43,19 @@ PROD_IOC = xxx
DBD
+=
xxx_Common.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
# areaDetector provides a Makefile for things it needs and supplies
PROD_NAME
=
xxx_Common
...
...
@@ -109,17 +124,14 @@ ifdef MOTOR
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
)
endif
ifdef
SNCSEQ
xxx_Common_DBD
+=
devSequencer.dbd
xxx_Common_LIBS
:=
seqDev
seq
pv
$(
xxx_Common_LIBS
)
endif
ifdef
STREAM
xxx_Common_DBD
+=
stream.dbd streamSynApps.dbd
xxx_Common_LIBS
:=
stream streamSynApps
$(
xxx_Common_LIBS
)
endif
ifdef
DEVIOCSTATS
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
)
endif
endif
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment