Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
CLHEP
CLHEP
Commits
7859e9f1
Commit
7859e9f1
authored
Nov 03, 2009
by
Lynn Garren
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use -L -l for internal dependencies
parent
198e680d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
12 deletions
+17
-12
ChangeLog
ChangeLog
+4
-0
Geometry/src/Makefile.am
Geometry/src/Makefile.am
+2
-2
Matrix/src/Makefile.am
Matrix/src/Makefile.am
+5
-4
RandomObjects/src/Makefile.am
RandomObjects/src/Makefile.am
+6
-6
No files found.
ChangeLog
View file @
7859e9f1
2009-11-03 Lynn Garren <garren@fnal.gov>
* */src/Makefile.am: use -L<path> -l<library> for dependencies
2009-08-25 Lynn Garren <garren@fnal.gov>
* configure.in, */configure.in: remove old -lcxa -lunwind icc flags
...
...
Geometry/src/Makefile.am
View file @
7859e9f1
...
...
@@ -21,10 +21,10 @@ if BUILD_SHARED
shareddir
=
shared
if
BUILD_VISUAL
lib_shared
=
CLHEP-Geometry-@VERSION@.
$(SHEXT)
LDADD
=
${top_builddir}
/../Vector/src
/
CLHEP-Vector-@VERSION@
.
$(SHEXT)
LDADD
=
-L
${top_builddir}
/../Vector/src
-l
CLHEP-Vector-
@VERSION@
else
lib_shared
=
libCLHEP-Geometry-@VERSION@.
$(SHEXT)
LDADD
=
${top_builddir}
/../Vector/src
/lib
CLHEP-Vector-@VERSION@
.
$(SHEXT)
LDADD
=
-L
${top_builddir}
/../Vector/src
-l
CLHEP-Vector-
@VERSION@
endif
SHFLAGS
=
@MY_SHFLAGS@
SHLINK
=
@MY_SHLINK@ @MY_SHEXTRA@
...
...
Matrix/src/Makefile.am
View file @
7859e9f1
...
...
@@ -19,17 +19,18 @@ libCLHEP_Matrix_@VERSION@_a_SOURCES = \
libCLHEP_Matrix_@VERSION@
_so_OBJECTS
=
$(
patsubst
%.cc,
$(shareddir)
/%.
$(OBJEXT)
,
$
(
libCLHEP_Matrix_@VERSION@_a_SOURCES
))
# these if/else blocks will be parsed by automake and translated
if
BUILD_SHARED
shareddir
=
shared
if
BUILD_VISUAL
lib_shared
=
CLHEP-Matrix-@VERSION@.
$(SHEXT)
LDADD
=
${top_builddir}
/../Random/src
/
CLHEP-Random-@VERSION@
.
$(SHEXT)
\
${top_builddir}
/../Vector/src
/
CLHEP-Vector-@VERSION@
.
$(SHEXT)
LDADD
=
-L
${top_builddir}
/../Random/src
-l
CLHEP-Random-
@VERSION@
\
-L
${top_builddir}
/../Vector/src
-l
CLHEP-Vector-
@VERSION@
else
lib_shared
=
libCLHEP-Matrix-@VERSION@.
$(SHEXT)
LDADD
=
${top_builddir}
/../Random/src
/lib
CLHEP-Random-@VERSION@
.
$(SHEXT)
\
${top_builddir}
/../Vector/src
/lib
CLHEP-Vector-@VERSION@
.
$(SHEXT)
LDADD
=
-L
${top_builddir}
/../Random/src
-l
CLHEP-Random-
@VERSION@
\
-L
${top_builddir}
/../Vector/src
-l
CLHEP-Vector-
@VERSION@
endif
SHFLAGS
=
@MY_SHFLAGS@
SHLINK
=
@MY_SHLINK@ @MY_SHEXTRA@
...
...
RandomObjects/src/Makefile.am
View file @
7859e9f1
...
...
@@ -17,14 +17,14 @@ if BUILD_SHARED
shareddir
=
shared
if
BUILD_VISUAL
lib_shared
=
CLHEP-RandomObjects-@VERSION@.
$(SHEXT)
LDADD
=
${top_builddir}
/../Random/src
/
CLHEP-Random-@VERSION@
.
$(SHEXT)
\
${top_builddir}
/../Matrix/src
/
CLHEP-Matrix-@VERSION@
.
$(SHEXT)
\
${top_builddir}
/../Vector/src
/
CLHEP-Vector-@VERSION@
.
$(SHEXT)
LDADD
=
-L
${top_builddir}
/../Random/src
-l
CLHEP-Random-
@VERSION@
\
-L
${top_builddir}
/../Matrix/src
-l
CLHEP-Matrix-
@VERSION@
\
-L
${top_builddir}
/../Vector/src
-l
CLHEP-Vector-
@VERSION@
else
lib_shared
=
libCLHEP-RandomObjects-@VERSION@.
$(SHEXT)
LDADD
=
${top_builddir}
/../Random/src
/lib
CLHEP-Random-@VERSION@
.
$(SHEXT)
\
${top_builddir}
/../Matrix/src
/lib
CLHEP-Matrix-@VERSION@
.
$(SHEXT)
\
${top_builddir}
/../Vector/src
/lib
CLHEP-Vector-@VERSION@
.
$(SHEXT)
LDADD
=
-L
${top_builddir}
/../Random/src
-l
CLHEP-Random-
@VERSION@
\
-L
${top_builddir}
/../Matrix/src
-l
CLHEP-Matrix-
@VERSION@
\
-L
${top_builddir}
/../Vector/src
-l
CLHEP-Vector-
@VERSION@
endif
SHFLAGS
=
@MY_SHFLAGS@
SHLINK
=
@MY_SHLINK@ @MY_SHEXTRA@
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment