[Rivet-svn] r1712 - in trunk/src/Tools: . YAML

[blackhole at projects.hepforge.org]

Author: fsiegert
Date: Wed Jul 22 18:00:51 2009
New Revision: 1712

Log:
On SL4 it seems like $(builddir) is not available and thus it is not able to find the temporary libyaml-cpp location.
Changing it to use $(top_builddir)/src/Tools/YAML, which seems to work.

Modified:
   trunk/src/Tools/Makefile.am
   trunk/src/Tools/YAML/Makefile.am

Modified: trunk/src/Tools/Makefile.am
==============================================================================
--- trunk/src/Tools/Makefile.am	Wed Jul 22 10:41:58 2009	(r1711)
+++ trunk/src/Tools/Makefile.am	Wed Jul 22 18:00:51 2009	(r1712)
@@ -23,5 +23,5 @@
   -DDEFAULTDATADIR=\"$(datadir)\" \
   -DDEFAULTLIBDIR=\"$(libdir)\"
 
-libRivetTools_la_LDFLAGS = $(AM_LDFLAGS) -L$(builddir)/YAML
+libRivetTools_la_LDFLAGS = $(AM_LDFLAGS) -L$(top_builddir)/src/Tools/YAML
 libRivetTools_la_LIBADD = -lyaml-cpp

Modified: trunk/src/Tools/YAML/Makefile.am
==============================================================================
--- trunk/src/Tools/YAML/Makefile.am	Wed Jul 22 10:41:58 2009	(r1711)
+++ trunk/src/Tools/YAML/Makefile.am	Wed Jul 22 18:00:51 2009	(r1712)
@@ -15,5 +15,5 @@
 
 check_PROGRAMS = testYAML
 testYAML_SOURCES = test.cc
-testYAML_LDADD = -L$(builddir) -lyaml-cpp
+testYAML_LDADD = -L$(top_builddir)/src/Tools/YAML -lyaml-cpp
 TESTS = testYAML