Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
K
Keithley428
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software Control System
Tango devices
MeasureInstruments
Keithley
Keithley428
Commits
78ab3deb
Commit
78ab3deb
authored
6 years ago
by
Johannes Blume
Browse files
Options
Downloads
Patches
Plain Diff
deleted Uniblitz
parent
7cae9bc3
No related branches found
Tags
Release_1_5
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Makefile
+3
-3
3 additions, 3 deletions
Makefile
with
3 additions
and
3 deletions
Makefile
+
3
−
3
View file @
78ab3deb
...
...
@@ -56,7 +56,7 @@ OUTPUT_TYPE = DEVICE
# - $HOME/DeviceServers if OUTPUT_TYPE is DEVICE
# - ../bin for others
#
OUTPUT_DIR
=
./bin/
$(
BIN_DIR
)
#
OUTPUT_DIR = ./bin/$(BIN_DIR)
#
...
...
@@ -82,7 +82,7 @@ INC_DIR_USER= -I . -I$(GPIB_DIR)
# - for a device server, tango libraries directories are automatically appended
# - '-L ../lib' is automatically appended in all cases
#
LIB_DIR_USER
=
LIB_DIR_USER
=
-L
$(
GPIB_DIR
)
/
$(
_libdir
)
-L
$(
TANGO_HOME
)
/
$(
_libdir
)
#=============================================================================
# LFLAGS_USR is the list of user link flags
...
...
@@ -95,7 +95,7 @@ LIB_DIR_USER=
# you must use '-lA -lB' in this order as link flags, otherwise you will get
# 'undefined reference' errors
#
LFLAGS_USR
+=
$(
GPIB_DIR
)
/bin/libGpibDeviceServer.a
$(
TANGO_HOME
)
/
$(
_libdir
)
/lib
gpib
.a
LFLAGS_USR
+=
-lGpibDeviceServer
-l
gpib
#=============================================================================
...
...
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