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
af308c9e
Commit
af308c9e
authored
13 years ago
by
mooney
Browse files
Options
Downloads
Patches
Plain Diff
conditions on DXP and (areaDetector's) commonDriverMakefile
parent
c9e773e4
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
+4
-7
4 additions, 7 deletions
xxxApp/src/Makefile
with
4 additions
and
7 deletions
xxxApp/src/Makefile
+
4
−
7
View file @
af308c9e
...
@@ -107,9 +107,6 @@ ifeq (vxWorks,$(findstring vxWorks, $(T_A)))
...
@@ -107,9 +107,6 @@ ifeq (vxWorks,$(findstring vxWorks, $(T_A)))
iocxxxVX_DBD
+=
camacSupport.dbd
iocxxxVX_DBD
+=
camacSupport.dbd
iocxxxVX_DBD
+=
devCamacSupport.dbd
iocxxxVX_DBD
+=
devCamacSupport.dbd
ifdef
DXP
iocxxxVX_DBD
+=
dxpSupport.dbd
endif
ifdef
ALLEN_BRADLEY
ifdef
ALLEN_BRADLEY
iocxxxVX_DBD
+=
allenBradley.dbd
iocxxxVX_DBD
+=
allenBradley.dbd
endif
endif
...
@@ -222,9 +219,6 @@ xxx_LIBS_vxWorks += ipUnidig
...
@@ -222,9 +219,6 @@ xxx_LIBS_vxWorks += ipUnidig
xxx_LIBS_vxWorks
+=
dac128V
xxx_LIBS_vxWorks
+=
dac128V
xxx_LIBS_vxWorks
+=
quadEM
xxx_LIBS_vxWorks
+=
quadEM
xxx_LIBS_vxWorks
+=
camac devCamac
xxx_LIBS_vxWorks
+=
camac devCamac
ifdef
DXP
xxx_LIBS_vxWorks
+=
dxp handel
endif
xxx_LIBS_vxWorks
+=
love
xxx_LIBS_vxWorks
+=
love
ifndef
DEVIOCSTATS
ifndef
DEVIOCSTATS
xxx_LIBS_vxWorks
+=
vxStats
xxx_LIBS_vxWorks
+=
vxStats
...
@@ -256,8 +250,11 @@ ifneq ("",$(findstring linux, $(T_A)))
...
@@ -256,8 +250,11 @@ ifneq ("",$(findstring linux, $(T_A)))
endif
endif
# areaDetector provides a Makefile for things it needs and supplies
# areaDetector provides a Makefile for things it needs and supplies
ifneq
(solaris,$(findstring solaris, $(T_A)))
ifneq
(vxWorks,$(findstring vxWorks, $(T_A)))
-include
$(AREA_DETECTOR)/ADApp/commonDriverMakefile
-include
$(AREA_DETECTOR)/ADApp/commonDriverMakefile
endif
endif
#===========================
#===========================
include
$(TOP)/configure/RULES
include
$(TOP)/configure/RULES
...
...
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