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

[blackhole at projects.hepforge.org]

Author: buckley
Date: Tue Jul  7 16:39:08 2009
New Revision: 1664

Log:
Fixing up YAML parser to be a bit more suitable for use between several packages and to build properly.

Modified:
   trunk/configure.ac
   trunk/src/Tools/Makefile.am
   trunk/src/Tools/YAML/Makefile.am
   trunk/src/Tools/YAML/test.yaml

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	Tue Jul  7 16:38:00 2009	(r1663)
+++ trunk/configure.ac	Tue Jul  7 16:39:08 2009	(r1664)
@@ -206,8 +206,7 @@
 AC_EMPTY_SUBST
 AC_CONFIG_FILES(include/Makefile include/Rivet/Makefile)
 AC_CONFIG_FILES(src/Makefile)
-AC_CONFIG_FILES(src/Tools/Makefile)
-AC_CONFIG_FILES(src/Tools/YAML/Makefile)
+AC_CONFIG_FILES(src/Tools/Makefile src/Tools/YAML/Makefile)
 AC_CONFIG_FILES(src/Projections/Makefile)
 AC_CONFIG_FILES(src/Analyses/Makefile)
 AC_CONFIG_FILES(src/Test/Makefile)

Modified: trunk/src/Tools/Makefile.am
==============================================================================
--- trunk/src/Tools/Makefile.am	Tue Jul  7 16:38:00 2009	(r1663)
+++ trunk/src/Tools/Makefile.am	Tue Jul  7 16:39:08 2009	(r1664)
@@ -23,4 +23,5 @@
   -DDEFAULTDATADIR=\"$(datadir)\" \
   -DDEFAULTLIBDIR=\"$(libdir)\"
 
-libRivetTools_la_LIBADD = $(builddir)/YAML/libRivetYAML.la
+libRivetTools_la_LDFLAGS = $(AM_LDFLAGS) -L$(builddir)/YAML
+libRivetTools_la_LIBADD = -lyaml-cpp

Modified: trunk/src/Tools/YAML/Makefile.am
==============================================================================
--- trunk/src/Tools/YAML/Makefile.am	Tue Jul  7 16:38:00 2009	(r1663)
+++ trunk/src/Tools/YAML/Makefile.am	Tue Jul  7 16:39:08 2009	(r1664)
@@ -1,11 +1,19 @@
-lib_LTLIBRARIES = libRivetYAML.la
-libRivetYAML_la_SOURCES = \
+lib_LTLIBRARIES = libyaml-cpp.la
+libyaml_cpp_la_SOURCES = \
   alias.cpp conversion.cpp emitterstate.cpp exp.cpp map.cpp ostream.cpp \
   parserstate.cpp scalar.cpp scanscalar.cpp sequence.cpp stream.cpp \
   content.cpp emitter.cpp emitterutils.cpp  iterator.cpp  node.cpp  \
   parser.cpp regex.cpp scanner.cpp scantoken.cpp simplekey.cpp
 
+yamlincludedir = $(includedir)/yaml-cpp
+yamlinclude_HEADERS = \
+  alias.h emittermanip.h indentation.h node.h regex.h setting.h \
+  content.h emitterstate.h iterator.h noncopyable.h scalar.h stlemitter.h \
+  conversion.h emitterutils.h iterpriv.h ostream.h scanner.h stream.h \
+  crt.h exceptions.h ltnode.h parser.h scanscalar.h token.h \
+  emitter.h exp.h map.h parserstate.h sequence.h yaml.h
+
 check_PROGRAMS = testYAML
 testYAML_SOURCES = test.cc
-testYAML_LDADD = -L$(builddir) -lRivetYAML
+testYAML_LDADD = -L$(builddir) -lyaml-cpp
 TESTS = testYAML

Modified: trunk/src/Tools/YAML/test.yaml
==============================================================================
--- trunk/src/Tools/YAML/test.yaml	Tue Jul  7 16:38:00 2009	(r1663)
+++ trunk/src/Tools/YAML/test.yaml	Tue Jul  7 16:39:08 2009	(r1664)
@@ -8,4 +8,8 @@
  commenty
  thing
 ---
-data: [1,2,3,4,5,6,7]
+data: 
+ - [1,2,3,4,5,6,7]
+ - [1,2,3,4,5,6,7]
+ - [1,2,3,4,5,6,7]
+ - [1,2,3,4,5,6,7]