Commit ba8f00ce authored by Lynn Garren's avatar Lynn Garren
Browse files

get libraries from appropriate build subdirectories when running "make check"

parent 61ccd98b
CLHEP-@PACKAGE@-@VERSION@ CLHEP-@PACKAGE@-@VERSION@
CLHEP-@PACKAGE@-@VERSION@ CLHEP-Random-@VERSION@
CLHEP-@PACKAGE@-@VERSION@ CLHEP-Vector-@VERSION@
......@@ -31,6 +31,7 @@ AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([Matrix/Makefile])
AC_CONFIG_FILES([src/Makefile])
AC_CONFIG_FILES([test/Makefile])
AC_CONFIG_FILES([Matrix-deps])
# Test driver program/script:
AC_CONFIG_FILES([test/testMatrix.sh], [chmod +x test/testMatrix.sh])
......@@ -42,7 +43,7 @@ AC_CONFIG_FILES([test/testInversion.sh], [chmod +x test/testInversion.sh])
Matrix_CPPFLAGS="-I$includedir"
Matrix_LDFLAGS="-L$libdir"
Matrix_LIBS="-lCLHEP-$PACKAGE-$VERSION $prefix/lib/libCLHEP-Vector-$VERSION.so $prefix/lib/libCLHEP-Random-$VERSION.so -lm"
Matrix_LIBS="-lCLHEP-$PACKAGE-$VERSION -lCLHEP-Random-$VERSION -lCLHEP-Vector-$VERSION"
AC_SUBST(Matrix_CPPFLAGS)
AC_SUBST(Matrix_LIBS)
......
# Applicable to each test program:
INCLUDES = -I../
LDADD = -L${top_builddir}/src @Matrix_LIBS@ # libraries to link, and whence
# libraries to link, and whence
LDADD = -L${top_builddir}/src -lCLHEP-@PACKAGE@-@VERSION@ \
-L${top_builddir}/../Random/src -lCLHEP-Random-@VERSION@ \
-L${top_builddir}/../Vector/src -lCLHEP-Vector-@VERSION@
# add -D needed by testInversion
CXXFLAGS = @CXXFLAGS@ -DINSTALLATION_CHECK
......
Supports Markdown
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