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
931fdc65
Commit
931fdc65
authored
8 years ago
by
mooney
Browse files
Options
Downloads
Patches
Plain Diff
Don't include devVxStats.dbd. devIocStats.dbd is preferred.
parent
7a4157bd
No related branches found
Branches containing commit
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
+24
-6
24 additions, 6 deletions
xxxApp/src/Makefile
with
24 additions
and
6 deletions
xxxApp/src/Makefile
+
24
−
6
View file @
931fdc65
...
@@ -29,6 +29,11 @@ PROD_IOC = xxx
...
@@ -29,6 +29,11 @@ PROD_IOC = xxx
DBD
+=
xxx_Common.dbd
DBD
+=
xxx_Common.dbd
xxx_Common_DBD
+=
base.dbd
xxx_Common_DBD
+=
base.dbd
#ifdef TDS3000
# xxx_Common_DBD += devTDS3000.dbd
# xxx_Common_LIBS := devTDS3000 $(xxx_Common_LIBS)
#endif
#ifdef CAPUTLOG
#ifdef CAPUTLOG
# xxx_Common_DBD += caPutLog.dbd
# xxx_Common_DBD += caPutLog.dbd
# xxx_Common_LIBS := caPutLog $(xxx_Common_LIBS)
# xxx_Common_LIBS := caPutLog $(xxx_Common_LIBS)
...
@@ -155,6 +160,11 @@ ifdef VAC
...
@@ -155,6 +160,11 @@ ifdef VAC
xxx_Common_LIBS
:=
vac
$(
xxx_Common_LIBS
)
xxx_Common_LIBS
:=
vac
$(
xxx_Common_LIBS
)
endif
endif
#ifdef FLY
# xxx_Common_DBD += flySupport.dbd
# xxx_Common_LIBS := fly $(xxx_Common_LIBS)
#endif
xxx_Common_LIBS
:=
$(
xxx_Common_LIBS
)
$(
EPICS_BASE_IOC_LIBS
)
xxx_Common_LIBS
:=
$(
xxx_Common_LIBS
)
$(
EPICS_BASE_IOC_LIBS
)
##################################################################
##################################################################
...
@@ -188,9 +198,11 @@ ifeq (win32-x86,$(findstring win32-x86, $(T_A)))
...
@@ -188,9 +198,11 @@ ifeq (win32-x86,$(findstring win32-x86, $(T_A)))
-include
$(ADCORE)/ADApp/commonDriverMakefile
-include
$(ADCORE)/ADApp/commonDriverMakefile
iocxxxWin32_DBD
+=
ADSupport.dbd NDPluginSupport.dbd
iocxxxWin32_DBD
+=
ADSupport.dbd NDPluginSupport.dbd
xxx_LIBS_WIN32
+=
$(
AD_LIBS
)
xxx_LIBS_WIN32
+=
$(
AD_LIBS
)
# To add the simDetector uncomment the following lines
ifdef
ADEXAMPLE
iocxxxLinux_DBD
+=
simDetectorSupport.dbd
# To add the simDetector uncomment the following lines
xxx_LIBS_WIN32
+=
simDetector
iocxxxLinux_DBD
+=
simDetectorSupport.dbd
xxx_LIBS_WIN32
+=
simDetector
endif
endif
endif
endif
endif
...
@@ -330,9 +342,11 @@ ifeq (vxWorks,$(findstring vxWorks, $(T_A)))
...
@@ -330,9 +342,11 @@ ifeq (vxWorks,$(findstring vxWorks, $(T_A)))
xxx_LIBS_vxWorks
+=
oms DeltaTau
xxx_LIBS_vxWorks
+=
oms DeltaTau
endif
endif
ifdef
DEVIOCSTATS
# ifdef FLY
iocxxxVX_DBD
+=
devVxStats.dbd
# iocxxxVX_DBD += flyVXSupport.dbd
endif
# xxx_LIBS_vxWorks += fly
# endif
endif
endif
ifneq
(,$(findstring linux, $(T_A)))
ifneq
(,$(findstring linux, $(T_A)))
...
@@ -424,6 +438,10 @@ xxx_LIBS_cygwin32 += $(xxx_Common_LIBS)
...
@@ -424,6 +438,10 @@ xxx_LIBS_cygwin32 += $(xxx_Common_LIBS)
xxx_LIBS_WIN32
+=
$(
xxx_Common_LIBS
)
xxx_LIBS_WIN32
+=
$(
xxx_Common_LIBS
)
xxx_LIBS_Darwin
+=
$(
xxx_Common_LIBS
)
xxx_LIBS_Darwin
+=
$(
xxx_Common_LIBS
)
# Here's how to print out all gnumake variables
#$(foreach v, $(.VARIABLES), $(info $(v) = $($(v))))
# print out just one variable
#$(info SUPPORT = $(SUPPORT))
#===========================
#===========================
...
...
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