Commit 1ab93ad5 authored by Jimmy Ma's avatar Jimmy Ma
Browse files

Fix the linkage of vcsn-(b|z) with libvcsn-(b|z).

	* include/vaucanson/algorithms/aut_to_exp.hh,
	  include/vaucanson/algorithms/internal/has_neighbour.hh,
	  include/vaucanson/algorithms/is_ambiguous.hh,
	  include/vaucanson/algorithms/krat_exp_expand.hh,
	  include/vaucanson/algorithms/normalized.hh,
	  include/vaucanson/algorithms/realtime.hh,
	  include/vaucanson/algorithms/realtime_decl.hh,
	  include/vaucanson/algorithms/thompson.hh:
	  Disable the VCSN_USE_LIB tag because of undefined reference
	  during the linking process. The instanciations in the libvcsn
	  are uncomplete. This is a temporary fix for the linkage bug.

	* lib/generate_libvcsn.rb: Remove ignore on is_ambigous.

	* taf-kit/src/Makefile.am:
	  Enable link of vcsn-(b|z) against the libvcsn-(b|z).

	* include/vaucanson/algorithms/image.hxx: Fix filename in header.
parent 56d44df9
2008-04-01 Jimmy Ma <jimmy.ma@lrde.epita.fr>
Fix the linkage of vcsn-(b|z) with libvcsn-(b|z).
* include/vaucanson/algorithms/aut_to_exp.hh,
include/vaucanson/algorithms/internal/has_neighbour.hh,
include/vaucanson/algorithms/is_ambiguous.hh,
include/vaucanson/algorithms/krat_exp_expand.hh,
include/vaucanson/algorithms/normalized.hh,
include/vaucanson/algorithms/realtime.hh,
include/vaucanson/algorithms/realtime_decl.hh,
include/vaucanson/algorithms/thompson.hh:
Disable the VCSN_USE_LIB tag because of undefined reference
during the linking process. The instanciations in the libvcsn
are uncomplete. This is a temporary fix for the linkage bug.
* lib/generate_libvcsn.rb: Remove ignore on is_ambigous.
* taf-kit/src/Makefile.am:
Enable link of vcsn-(b|z) against the libvcsn-(b|z).
* include/vaucanson/algorithms/image.hxx: Fix filename in header.
2008-04-01 Jimmy Ma <jimmy.ma@lrde.epita.fr>
Add template arguments naming convention.
......
......@@ -147,7 +147,12 @@ namespace vcsn {
} // vcsn
# if !defined VCSN_USE_INTERFACE_ONLY && !defined VCSN_USE_LIB
// FIXME: libvcsn and taf-kit undefined reference related bug
// this should be the correct one, should be fixed with:
// - the correct INTERFACE tag
// - a generation script that do not use INTERFACE tag
//# if !defined VCSN_USE_INTERFACE_ONLY && !defined VCSN_USE_LIB
# if !defined VCSN_USE_INTERFACE_ONLY
# include <vaucanson/algorithms/aut_to_exp.hxx>
# endif // VCSN_USE_INTERFACE_ONLY
......
// projections_fmp.hxx: this file is part of the Vaucanson project.
// image.hxx: this file is part of the Vaucanson project.
//
// Vaucanson, a generic library for finite state machines.
//
// Copyright (C) 2006 The Vaucanson Group.
// Copyright (C) 2006, 2008 The Vaucanson Group.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
......
......@@ -2,7 +2,7 @@
//
// Vaucanson, a generic library for finite state machines.
//
// Copyright (C) 2006 The Vaucanson Group.
// Copyright (C) 2006, 2008 The Vaucanson Group.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
......@@ -46,7 +46,13 @@ namespace vcsn
const typename automaton_traits<T>::hstate_t s);
}
# if !defined VCSN_USE_INTERFACE_ONLY && !defined VCSN_USE_LIB
// FIXME: libvcsn and taf-kit undefined reference related bug
// This should be the correct one, should be fixed with:
// - the correct INTERFACE tag
// - a generation script that do not use INTERFACE tag
// There may also be some problems related to GenAutomaton and libvcsn
//# if !defined VCSN_USE_INTERFACE_ONLY && !defined VCSN_USE_LIB
# if !defined VCSN_USE_INTERFACE_ONLY
# include <vaucanson/algorithms/internal/has_neighbour.hxx>
# endif // VCSN_USE_INTERFACE_ONLY
......
......@@ -2,7 +2,7 @@
//
// Vaucanson, a generic library for finite state machines.
//
// Copyright (C) 2006 The Vaucanson Group.
// Copyright (C) 2006, 2008 The Vaucanson Group.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
......@@ -30,6 +30,8 @@
*/
/** @} */
// INTERFACE: bool is_ambiguous(const Automaton& a) { return vcsn::is_ambiguous(*a); }
# include <vaucanson/design_pattern/design_pattern.hh>
namespace vcsn {
......
......@@ -39,8 +39,11 @@ namespace vcsn {
} // vcsn
# if !defined VCSN_USE_INTERFACE_ONLY && !defined VCSN_USE_LIB
// FIXME: this should be the correct one, should be fixed with:
// - the correct INTERFACE tag
// - a generation script that do not use INTERFACE tag
//# if !defined VCSN_USE_INTERFACE_ONLY && !defined VCSN_USE_LIB
# if !defined VCSN_USE_INTERFACE_ONLY
# include <vaucanson/algorithms/krat_exp_expand.hxx>
# endif // VCSN_USE_INTERFACE_ONLY
......
......@@ -2,7 +2,7 @@
//
// Vaucanson, a generic library for finite state machines.
//
// Copyright (C) 2001, 2002, 2003, 2004, 2005 The Vaucanson Group.
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008 The Vaucanson Group.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
......@@ -215,7 +215,13 @@ namespace vcsn {
} // vcsn
# if !defined VCSN_USE_INTERFACE_ONLY && !defined VCSN_USE_LIB
// FIXME: libvcsn and taf-kit undefined reference related bug
// This should be the correct one, should be fixed with:
// - the correct INTERFACE tag
// - a generation script that do not use INTERFACE tag
// There may also be some problems related to GenAutomaton and libvcsn
//# if !defined VCSN_USE_INTERFACE_ONLY && !defined VCSN_USE_LIB
# if !defined VCSN_USE_INTERFACE_ONLY
# include <vaucanson/algorithms/normalized.hxx>
# endif // VCSN_USE_INTERFACE_ONLY
......
......@@ -75,7 +75,11 @@ namespace vcsn {
} // vcsn
# if !defined VCSN_USE_INTERFACE_ONLY && !defined VCSN_USE_LIB
// FIXME: this should be the correct one, should be fixed with:
// - the correct INTERFACE tag
// - a generation script that do not use INTERFACE tag
//# if !defined VCSN_USE_INTERFACE_ONLY && !defined VCSN_USE_LIB
# if !defined VCSN_USE_INTERFACE_ONLY
# include <vaucanson/algorithms/realtime.hxx>
# endif // VCSN_USE_INTERFACE_ONLY
/*
......
......@@ -2,7 +2,7 @@
//
// Vaucanson, a generic library for finite state machines.
//
// Copyright (C) 2004, 2005 The Vaucanson Group.
// Copyright (C) 2004, 2005, 2008 The Vaucanson Group.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
......@@ -97,7 +97,9 @@ namespace vcsn {
} // vcsn
# if !defined VCSN_USE_INTERFACE_ONLY && !defined VCSN_USE_LIB
// FIXME: libvcsn and taf-kit undefined reference related bug
//# if !defined VCSN_USE_INTERFACE_ONLY && !defined VCSN_USE_LIB
# if !defined VCSN_USE_INTERFACE_ONLY
# include <vaucanson/algorithms/realtime_decl.hxx>
# endif // VCSN_USE_INTERFACE_ONLY
......
......@@ -2,7 +2,7 @@
//
// Vaucanson, a generic library for finite state machines.
//
// Copyright (C) 2001, 2002, 2003, 2004, 2005 The Vaucanson Group.
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008 The Vaucanson Group.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
......@@ -30,8 +30,8 @@
*/
/** @} */
// INTERFACE: void thompson_of(Automaton& a, const Exp& e) { return vcsn::thompson_of(*a, e.value()); }
// INTERFACE: void thompson_of(GenAutomaton& a, const Exp& e) { return vcsn::thompson_of(*a, e.value()); }
// INTERFACE: void thompson_of(Automaton& a, const Exp& e) { vcsn::thompson_of(*a, e.value()); }
// INTERFACE: void thompson_of(GenAutomaton& a, const Exp& e) { vcsn::thompson_of(*a, e.value()); }
# include <vaucanson/algebra/implementation/series/rat/exp.hh>
# include <vaucanson/automata/concept/automata.hh>
......@@ -71,7 +71,12 @@ namespace vcsn {
} // vcsn
# if !defined VCSN_USE_INTERFACE_ONLY && !defined VCSN_USE_LIB
// FIXME The interface tags are used for swig and libvcsn but here the
// definitions differs.
// This should be resolved when the generation of libvcsn do not depends
// on these interface tag.
//# if !defined VCSN_USE_INTERFACE_ONLY && !defined VCSN_USE_LIB
# if !defined VCSN_USE_INTERFACE_ONLY
# include <vaucanson/algorithms/thompson.hxx>
# endif // VCSN_USE_INTERFACE_ONLY
......
......@@ -71,6 +71,7 @@ def create?(type, file)
file !~ /extension.hh/ and
file !~ /finite_support_conversion.hh/ and
file !~ /forward_realtime.hh/ and
file !~ /is_ambiguous.hh/ and
file !~ /is_letterized.hh/ and
file !~ /is_normalized.hh/ and
file !~ /krat_exp.*.hh/ and
......
......@@ -43,14 +43,12 @@ COMMON_SOURCES = commands.hh \
vcsn_b_SOURCES = $(COMMON_SOURCES) \
ratexp_commands.hh common_automaton_commands.hh b_commands.cc
#vcsn_b_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=boolean_automaton -DVCSN_USE_LIB
vcsn_b_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=boolean_automaton
vcsn_b_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=boolean_automaton -DVCSN_USE_LIB
vcsn_b_LDFLAGS = $(AM_LDFLAGS) -L$(top_builddir)/lib -lvcsn-b
vcsn_z_SOURCES = $(COMMON_SOURCES) \
ratexp_commands.hh common_automaton_commands.hh z_commands.cc
#vcsn_z_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=z_automaton -DVCSN_USE_LIB
vcsn_z_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=z_automaton
vcsn_z_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=z_automaton -DVCSN_USE_LIB
vcsn_z_LDFLAGS = $(AM_LDFLAGS) -L$(top_builddir)/lib -lvcsn-z
vcsn_tdc_SOURCES = $(COMMON_SOURCES) \
......
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