Commit 7859e9f1 authored by Lynn Garren's avatar Lynn Garren

use -L -l for internal dependencies

parent 198e680d
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
......
......@@ -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 -lCLHEP-Vector-@VERSION@
else
lib_shared = libCLHEP-Geometry-@VERSION@.$(SHEXT)
LDADD = ${top_builddir}/../Vector/src/libCLHEP-Vector-@VERSION@.$(SHEXT)
LDADD = -L${top_builddir}/../Vector/src -lCLHEP-Vector-@VERSION@
endif
SHFLAGS = @MY_SHFLAGS@
SHLINK = @MY_SHLINK@ @MY_SHEXTRA@
......
......@@ -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 -lCLHEP-Random-@VERSION@ \
-L${top_builddir}/../Vector/src -lCLHEP-Vector-@VERSION@
else
lib_shared = libCLHEP-Matrix-@VERSION@.$(SHEXT)
LDADD = ${top_builddir}/../Random/src/libCLHEP-Random-@VERSION@.$(SHEXT) \
${top_builddir}/../Vector/src/libCLHEP-Vector-@VERSION@.$(SHEXT)
LDADD = -L${top_builddir}/../Random/src -lCLHEP-Random-@VERSION@ \
-L${top_builddir}/../Vector/src -lCLHEP-Vector-@VERSION@
endif
SHFLAGS = @MY_SHFLAGS@
SHLINK = @MY_SHLINK@ @MY_SHEXTRA@
......
......@@ -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 -lCLHEP-Random-@VERSION@ \
-L${top_builddir}/../Matrix/src -lCLHEP-Matrix-@VERSION@ \
-L${top_builddir}/../Vector/src -lCLHEP-Vector-@VERSION@
else
lib_shared = libCLHEP-RandomObjects-@VERSION@.$(SHEXT)
LDADD = ${top_builddir}/../Random/src/libCLHEP-Random-@VERSION@.$(SHEXT) \
${top_builddir}/../Matrix/src/libCLHEP-Matrix-@VERSION@.$(SHEXT) \
${top_builddir}/../Vector/src/libCLHEP-Vector-@VERSION@.$(SHEXT)
LDADD = -L${top_builddir}/../Random/src -lCLHEP-Random-@VERSION@ \
-L${top_builddir}/../Matrix/src -lCLHEP-Matrix-@VERSION@ \
-L${top_builddir}/../Vector/src -lCLHEP-Vector-@VERSION@
endif
SHFLAGS = @MY_SHFLAGS@
SHLINK = @MY_SHLINK@ @MY_SHEXTRA@
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment