Link taf-kit, libs and benches with $(benchlib).

* vaucanson.mk: Define benchlib.
* lib/generate_libvcsn.rb,
* taf-kit/src/Makefile.am,
* src/bench/generate_bench.sh: Use it.

ChangeLog

@@ -19,6 +19,13 @@
 	CBS version: bbef600f610af475eda1ace19a8ca60a30c1faca.
 	See cbs/Changelog.
+2009-04-06  d-halluin  <d-halluin@lrde.epita.fr>
+
+	Use cbs for bench compilation.
+
+	* src/bench/generate_bench.sh: Add LDADD in generated Makefile.am.
+	* vaucanson.mk: Add proper include flags.
+
 2009-04-06  d-halluin  <d-halluin@lrde.epita.fr>
 	Add cbs (libbench).

lib/generate_libvcsn.rb

@@ -203,7 +203,7 @@ def write_makefile(type, context)
 	     "",
 	     "lib_LTLIBRARIES\t+= lib" + type + ".la",
 	     "lib" + type_ + "_la_CXXFLAGS\t= $(CXXFLAGS) -DVCSN_CONTEXT=" + context,
-	     "lib" + type_ + "_la_LIBADD\t= $(LIBOBJS)",
+	     "lib" + type_ + "_la_LIBADD\t= $(LIBOBJS) $(LIBADD) $(benchlib)",
              "lib" + type_ + "_la_SOURCES\t= " + type + "/all.cc",
 	     "## all.cc includes all the source files below.  We declare them",
 	     "## as EXTRA_*_SOURCES so they are distributed and so we can",

src/bench/generate_bench.sh

@@ -86,6 +86,7 @@ EOF
 noinst_PROGRAMS += $BENCH_NAME-bench
 $(echo "$BENCH_NAME" | sed 's/-/_/g')_bench_SOURCES = $BENCH_NAME-bench.cc \
 						      $BENCH_HEADER
+$(echo "$BENCH_NAME" | sed 's/-/_/g')_bench_LDADD = \$(benchlib)
 EOF
     done
     if [ -r $BENCH_DIR/Makefile.bench ]; then

taf-kit/src/Makefile.am

@@ -167,8 +167,6 @@ vcsn_int_int_b_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=int_int_boolean_automaton \
 			    -DNO_SECOND_OPERATOR
 vcsn_int_int_b_LDADD = $(LDADD) $(top_builddir)/lib/libvcsn-int-int-b.la
 
-
-
 vcsn_char_zmin_SOURCES = $(COMMON_SOURCES)			\
 		      ratexp_commands.hh			\
 	              common_automaton_commands.hh		\
@@ -184,6 +182,7 @@ vcsn_char_zmax_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=z_max_plus_automaton -DVCSN_U
 vcsn_char_zmax_LDADD = $(LDADD) $(top_builddir)/lib/libvcsn-z-max.la
 
 LDADD = \
+  $(benchlib) \
   $(top_builddir)/gnulib/libgnu.la \
   $(top_builddir)/lib/libvcsn-common-ex.la
 AM_CPPFLAGS += -I$(top_srcdir)/gnulib

vaucanson.mk

@@ -17,8 +17,12 @@ AM_CPPFLAGS = \
 -I$(top_builddir) \
 -I$(top_builddir)/include \
 -I$(top_srcdir)/include \
+-I$(top_srcdir)/cbs/include \
+-I$(top_builddir)/cbs/include \
 $(BOOST_CPPFLAGS)
 
+benchlib = $(top_builddir)/cbs/lib/libbench.la
+
 AM_CXXFLAGS = $(CXXFLAGS_STRICT)
 
 AM_LDFLAGS = $(BOOST_LDFLAGS)