Commit 9f8f9993 authored by Florent D'Halluin's avatar Florent D'Halluin Committed by Alexandre Duret-Lutz
Browse files

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.
parent d0501094
...@@ -19,6 +19,13 @@ ...@@ -19,6 +19,13 @@
CBS version: bbef600f610af475eda1ace19a8ca60a30c1faca. CBS version: bbef600f610af475eda1ace19a8ca60a30c1faca.
See cbs/Changelog. 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> 2009-04-06 d-halluin <d-halluin@lrde.epita.fr>
   
Add cbs (libbench). Add cbs (libbench).
......
...@@ -203,7 +203,7 @@ def write_makefile(type, context) ...@@ -203,7 +203,7 @@ def write_makefile(type, context)
"", "",
"lib_LTLIBRARIES\t+= lib" + type + ".la", "lib_LTLIBRARIES\t+= lib" + type + ".la",
"lib" + type_ + "_la_CXXFLAGS\t= $(CXXFLAGS) -DVCSN_CONTEXT=" + context, "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", "lib" + type_ + "_la_SOURCES\t= " + type + "/all.cc",
"## all.cc includes all the source files below. We declare them", "## all.cc includes all the source files below. We declare them",
"## as EXTRA_*_SOURCES so they are distributed and so we can", "## as EXTRA_*_SOURCES so they are distributed and so we can",
......
...@@ -86,6 +86,7 @@ EOF ...@@ -86,6 +86,7 @@ EOF
noinst_PROGRAMS += $BENCH_NAME-bench noinst_PROGRAMS += $BENCH_NAME-bench
$(echo "$BENCH_NAME" | sed 's/-/_/g')_bench_SOURCES = $BENCH_NAME-bench.cc \ $(echo "$BENCH_NAME" | sed 's/-/_/g')_bench_SOURCES = $BENCH_NAME-bench.cc \
$BENCH_HEADER $BENCH_HEADER
$(echo "$BENCH_NAME" | sed 's/-/_/g')_bench_LDADD = \$(benchlib)
EOF EOF
done done
if [ -r $BENCH_DIR/Makefile.bench ]; then if [ -r $BENCH_DIR/Makefile.bench ]; then
......
...@@ -167,8 +167,6 @@ vcsn_int_int_b_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=int_int_boolean_automaton \ ...@@ -167,8 +167,6 @@ vcsn_int_int_b_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=int_int_boolean_automaton \
-DNO_SECOND_OPERATOR -DNO_SECOND_OPERATOR
vcsn_int_int_b_LDADD = $(LDADD) $(top_builddir)/lib/libvcsn-int-int-b.la vcsn_int_int_b_LDADD = $(LDADD) $(top_builddir)/lib/libvcsn-int-int-b.la
vcsn_char_zmin_SOURCES = $(COMMON_SOURCES) \ vcsn_char_zmin_SOURCES = $(COMMON_SOURCES) \
ratexp_commands.hh \ ratexp_commands.hh \
common_automaton_commands.hh \ common_automaton_commands.hh \
...@@ -184,6 +182,7 @@ vcsn_char_zmax_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=z_max_plus_automaton -DVCSN_U ...@@ -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 vcsn_char_zmax_LDADD = $(LDADD) $(top_builddir)/lib/libvcsn-z-max.la
LDADD = \ LDADD = \
$(benchlib) \
$(top_builddir)/gnulib/libgnu.la \ $(top_builddir)/gnulib/libgnu.la \
$(top_builddir)/lib/libvcsn-common-ex.la $(top_builddir)/lib/libvcsn-common-ex.la
AM_CPPFLAGS += -I$(top_srcdir)/gnulib AM_CPPFLAGS += -I$(top_srcdir)/gnulib
...@@ -17,8 +17,12 @@ AM_CPPFLAGS = \ ...@@ -17,8 +17,12 @@ AM_CPPFLAGS = \
-I$(top_builddir) \ -I$(top_builddir) \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/cbs/include \
-I$(top_builddir)/cbs/include \
$(BOOST_CPPFLAGS) $(BOOST_CPPFLAGS)
benchlib = $(top_builddir)/cbs/lib/libbench.la
AM_CXXFLAGS = $(CXXFLAGS_STRICT) AM_CXXFLAGS = $(CXXFLAGS_STRICT)
AM_LDFLAGS = $(BOOST_LDFLAGS) AM_LDFLAGS = $(BOOST_LDFLAGS)
......
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