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
a71699fb
Commit
a71699fb
authored
16 years ago
by
mooney
Browse files
Options
Downloads
Patches
Plain Diff
remove genSub, add busy, comment out stuff that doesn't build on stock APS linux box
parent
fb422123
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
+6
-4
6 additions, 4 deletions
xxxApp/src/Makefile
with
6 additions
and
4 deletions
xxxApp/src/Makefile
+
6
−
4
View file @
a71699fb
...
...
@@ -55,9 +55,10 @@ xxx_SRCS_solaris += iocxxx_solaris_registerRecordDeviceDriver.cppa xxxMain.cpp
xxx_SRCS_vxWorks
+=
-nil-
#xxx_Common_LIBS += xxxSupport
xxx_Common_LIBS
+=
genSub
#
xxx_Common_LIBS += genSub
xxx_Common_LIBS
+=
mca
xxx_Common_LIBS
+=
calc
xxx_Common_LIBS
+=
busy
xxx_Common_LIBS
+=
sscan
xxx_Common_LIBS
+=
autosave
xxx_Common_LIBS
+=
optics
...
...
@@ -94,7 +95,7 @@ xxx_vxWorks_LIBS += oms DeltaTau
#The following adds support from base/src/vxWorks
xxx_OBJS_vxWorks
+=
$(
EPICS_BASE_BIN
)
/vxComLibrary
xxx_Linux_LIBS
+=
dxp handel
#
xxx_Linux_LIBS += dxp handel
# If libnet IS installed on your HOST Linux system;
# uncomment the following line.
#xxx_Linux_LIBS += mcaCanberra
...
...
@@ -103,9 +104,10 @@ xxx_cygwin_LIBS += dxp handel
xxx_WIN32_LIBS
+=
dxp handel
xxx_solaris_LIBS
+=
genSub
#
xxx_solaris_LIBS += genSub
#xxx_solaris_LIBS += mca
xxx_solaris_LIBS
+=
calc
xxx_solaris_LIBS
+=
busy
xxx_solaris_LIBS
+=
sscan
xxx_solaris_LIBS
+=
autosave
xxx_solaris_LIBS
+=
optics
...
...
@@ -132,7 +134,7 @@ xxx_LIBS_WIN32 = $(xxx_WIN32_LIBS) $(xxx_Common_LIBS)
# uncomment the following line.
#xxx_SYS_LIBS_Linux += net pcap
# For USB support on Saturn
xxx_SYS_LIBS_Linux
+=
usb
#
xxx_SYS_LIBS_Linux += usb
xxx_SYS_LIBS_vxWorks
+=
-nil-
# This is needed by dxp on cygwin and WIN32
...
...
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