[Rivet-svn] r2305 - trunk/test

[blackhole at projects.hepforge.org]

Author: fsiegert
Date: Wed Mar  3 15:21:40 2010
New Revision: 2305

Log:
A couple more fixes for building and checking on MacOS. One problem remains though, it won't load the rivet module in the testCmdLine.sh script. I have no idea what else could still be going wrong here.

Modified:
   trunk/test/Makefile.am

Modified: trunk/test/Makefile.am
==============================================================================
--- trunk/test/Makefile.am	Wed Mar  3 14:46:00 2010	(r2304)
+++ trunk/test/Makefile.am	Wed Mar  3 15:21:40 2010	(r2305)
@@ -4,7 +4,7 @@
 testBoost_CPPFLAGS = -I$(top_srcdir)/include $(AM_CPPFLAGS)
 
 testMatVec_SOURCES = testMatVec.cc
-testMatVec_LDADD   = -lm -lgsl -lgslcblas
+testMatVec_LDADD   = -lm -L$(GSLLIBPATH) -L$(GSLCBLASLIBPATH) -lgsl -lgslcblas
 testMatVec_CPPFLAGS = -I$(top_srcdir)/include $(AM_CPPFLAGS)
 
 testCmp_SOURCES = testCmp.cc
@@ -18,7 +18,7 @@
   RIVET_REF_PATH=$(top_builddir)/data/refdata \
   RIVET_INFO_PATH=$(top_builddir)/data/anainfo \
   RIVET_ANALYSIS_PATH=$(top_builddir)/src/Analyses/.libs \
-  LD_LIBRARY_PATH=$(top_builddir)/src:$(top_builddir)/src/.libs:$(HEPMCLIBPATH):$(FASTJETLIBPATH) \
+  LD_LIBRARY_PATH=$(top_builddir)/src:$(top_builddir)/src/.libs:$(top_builddir)/src/Tools/yaml-cpp:$(top_builddir)/src/Tools/yaml-cpp/.libs:$(HEPMCLIBPATH):$(FASTJETLIBPATH) \
   PYTHON_BUILD_DIR=$(top_builddir)/pyext/build \
   PATH=$(top_builddir)/bin:$(PATH)