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

Fix make check.

Use CBS in demos, disable CBS in tests (for faster
compilation/link), disable CBS in vaucanswig.

* src/demos/algorithms/Makefile.am,
* src/demos/one_rule_rewriting/Makefile.am,
* src/demos/vgrep/Makefile.am:
Add cbs include dir, link with libbench.la.

* src/tests/xml/Makefile.am,
* src/tests/check/check-flags.mk,
* src/tests/sanity/Makefile.am:
Add cbs include dir. Disable bench (-DBENCH_DISABLED).

* vaucanswig/expand.sh,
* vaucanswig/meta/Makefile.am:
Add cbs include dir. Disable bench (-DBENCH_DISABLED).
parent e2ae22f3
2009-04-16 d-halluin <d-halluin@lrde.epita.fr>
Fix make check.
Use CBS in demos, disable CBS in tests (for faster
compilation/link), disable CBS in vaucanswig.
* src/demos/algorithms/Makefile.am,
* src/demos/one_rule_rewriting/Makefile.am,
* src/demos/vgrep/Makefile.am:
Add cbs include dir, link with libbench.la.
* src/tests/xml/Makefile.am,
* src/tests/check/check-flags.mk,
* src/tests/sanity/Makefile.am:
Add cbs include dir. Disable bench (-DBENCH_DISABLED).
* vaucanswig/expand.sh,
* vaucanswig/meta/Makefile.am:
Add cbs include dir. Disable bench (-DBENCH_DISABLED).
2009-04-09 d-halluin <d-halluin@lrde.epita.fr>
 
Update cbs.
......
......@@ -15,4 +15,4 @@
include $(top_srcdir)/vaucanson.mk
AM_CXXFLAGS += -DINTERNAL_CHECKS -DSTRICT
LDADD = $(top_builddir)/lib/libvcsn-common.la
LDADD = $(top_builddir)/lib/libvcsn-common.la $(benchlib)
......@@ -12,6 +12,13 @@
## The Vaucanson Group consists of people listed in the `AUTHORS' file.
AM_CXXFLAGS = $(CXXFLAGS_STRICT)
AM_CPPFLAGS = -I$(top_builddir) -I $(srcdir)/.. \
-I$(top_srcdir)/include -I$(top_srcdir)/src/tests/include \
-I$(top_builddir)/include -I$(top_builddir)/src/tests/include
# Note: To enable/disable Libbench in tests,
# use the flag -DBENCH_DISABLED below and link
# with $(benchlib) as needed.
AM_CPPFLAGS = -I$(top_builddir) -I $(srcdir)/.. \
-I$(top_srcdir)/include -I$(top_srcdir)/src/tests/include \
-I$(top_builddir)/include -I$(top_builddir)/src/tests/include \
-I$(top_srcdir)/cbs/include \
-I$(top_builddir)/cbs/include \
-DBENCH_DISABLED
......@@ -13,7 +13,11 @@
EXTRA_DIST = generate_files.sh hhck.pl
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include \
# Note: use -DBENCH_DISABLED to disable libbench
AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/cbs/include \
-I$(top_builddir)/cbs/include \
$(BOOST_CPPFLAGS) -DVCSN_SANITY_CHECK
AM_CXXFLAGS = $(CXXFLAGS_STRICT)
LDADD = $(top_builddir)/lib/libvcsn-common.la
......@@ -24,6 +28,7 @@ include check-programs.mk
# We don't run the resulting tests, there is no point in doing so, as
# they just check that the syntax is ok.
# Note: libbench.la is not linked since the tests are not run.
......
......@@ -16,7 +16,10 @@ include $(top_srcdir)/build-aux/check.mk
LDADD = $(top_builddir)/lib/libvcsn-common.la
AM_CPPFLAGS += $(XSD_CPPFLAGS)
# Note: To enable/disable Libbench in xml tests,
# use the flag -DBENCH_DISABLED below and link
# with $(benchlib) as needed.
AM_CPPFLAGS += $(XSD_CPPFLAGS) -DBENCH_DISABLED
TESTS_ENVIRONMENT = srcdir=$(srcdir)
......
......@@ -229,8 +229,9 @@ cat <<EOF
##
INCLUDES = -I\$(PYTHON_INCLUDEDIR) -I\$(srcdir)/../src -I\$(srcdir)/../meta \\
-I\$(top_srcdir)/include -I\$(top_builddir)/include
AM_CPPFLAGS = \$(BOOST_CPPFLAGS) -DINTERNAL_CHECKS -DSTRICT -DVCSN_DEFAULT_GRAPH_IMPL=listg
-I\$(top_srcdir)/include -I\$(top_builddir)/include \\
-I\$(top_srcdir)/cbs/include -I\$(top_builddir)/cbs/include
AM_CPPFLAGS = \$(BOOST_CPPFLAGS) -DINTERNAL_CHECKS -DSTRICT -DVCSN_DEFAULT_GRAPH_IMPL=listg -DBENCH_DISABLED
AM_CXXFLAGS = \$(CXXFLAGS_DEBUG)
AM_LDFLAGS = -avoid-version
......
......@@ -11,7 +11,8 @@
##
## The Vaucanson Group consists of people listed in the `AUTHORS' file.
INCLUDES = -I$(srcdir) -I$(top_srcdir)/include -I$(top_builddir)/include
INCLUDES = -I$(srcdir) -I$(top_srcdir)/include -I$(top_builddir)/include \
-I$(top_srcdir)/cbs/include -I$(top_builddir)/cbs/include
EXTRA_DIST = \
automaton.hh \
......@@ -28,5 +29,5 @@ EXTRA_DIST = \
lib_LTLIBRARIES = libvv.la
libvv_la_SOURCES = vcontext.cc vauto.cc
libvv_la_CPPFLAGS = -DVCSN_DEFAULT_GRAPH_IMPL=listg
libvv_la_CPPFLAGS = -DVCSN_DEFAULT_GRAPH_IMPL=listg -DBENCH_DISABLED
libvv_la_LIBADD = $(top_builddir)/lib/libvcsn-common-ex.la
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