Commit d8c81c6a authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

Rename libkrat_exp.la as libvcsn_common.la, and move lib/krat_exp/

to lib/src/krat_exp/, so that we can later integrate more code
into libvcsn_common.la.

* bootstrap: Don't run bison, the Makefile will do it.
* lib/krat_exp/krat_exp_bison.yy: Move ...
* lib/src/krat_exp/krat_exp_bison.yy: ... here.
* lib/krat_exp/libkrat_exp.mk: Rename as ...
* lib/src/libcommon.mk: ... this, and adjust to the new names.
* src/demos/algorithms/Makefile.am,
src/demos/one_rule_rewriting/Makefile.am,
src/demos/vgrep/Makefile.am, src/tests/xml/Makefile.am,
taf-kit/src/Makefile.am, lib/Makefile.am: Change all references to
libkrat_exp.la into libvcsn-common.la.
parent 788ef34e
2009-05-13 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Rename libkrat_exp.la as libvcsn_common.la, and move lib/krat_exp/
to lib/src/krat_exp/, so that we can later integrate more code
into libvcsn_common.la.
* bootstrap: Don't run bison, the Makefile will do it.
* lib/krat_exp/krat_exp_bison.yy: Move ...
* lib/src/krat_exp/krat_exp_bison.yy: ... here.
* lib/krat_exp/libkrat_exp.mk: Rename as ...
* lib/src/libcommon.mk: ... this, and adjust to the new names.
* src/demos/algorithms/Makefile.am,
src/demos/one_rule_rewriting/Makefile.am,
src/demos/vgrep/Makefile.am, src/tests/xml/Makefile.am,
taf-kit/src/Makefile.am, lib/Makefile.am: Change all references to
libkrat_exp.la into libvcsn-common.la.
2009-05-12 Alexandre Duret-Lutz <adl@lrde.epita.fr>
 
Fix errors reported by g++ 4.4.0.
......
#!/bin/sh
# Vaucanson, a generic library for finite state machines.
# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 The Vaucanson Group.
# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 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
......@@ -66,7 +66,6 @@ run src/bench ./generate_bench.sh --all
run . build-aux/find_tests.sh
run include ./generate_headers.sh
run lib ./generate_libvcsn.rb
run lib/krat_exp bison krat_exp_bison.yy
run src/tests/sanity ./generate_files.sh .
# Will also boostrap argp/.
......
## Vaucanson, a generic library for finite state machines.
## Copyright (C) 2007, 2008 The Vaucanson Group.
## Copyright (C) 2007, 2008, 2009 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
......@@ -18,7 +18,7 @@ AUTOMAKE_OPTIONS = subdir-objects
lib_LTLIBRARIES =
MAINTAINERCLEANFILES =
include krat_exp/libkrat_exp.mk
include src/libcommon.mk
include vcsn-b/libvcsn-b.mk
include vcsn-int-b/libvcsn-int-b.mk
include vcsn-r/libvcsn-r.mk
......@@ -52,8 +52,7 @@ maintainer-clean-local:
$(top_builddir)/lib/vcsn-tdc \
$(top_builddir)/lib/vcsn-char-char-b \
$(top_builddir)/lib/vcsn-char-int-b \
$(top_builddir)/lib/vcsn-int-int-b \
$(top_builddir)/lib/krat_exp
$(top_builddir)/lib/vcsn-int-int-b
rm -rf $(top_srcdir)/lib/vcsn-b \
$(top_srcdir)/lib/vcsn-int-b \
$(top_srcdir)/lib/vcsn-r \
......@@ -69,6 +68,4 @@ maintainer-clean-local:
$(top_srcdir)/lib/vcsn-tdc \
$(top_srcdir)/lib/vcsn-char-char-b \
$(top_srcdir)/lib/vcsn-char-int-b \
$(top_srcdir)/lib/vcsn-int-int-b \
$(top_srcdir)/lib/krat_exp
$(top_srcdir)/lib/vcsn-int-int-b
## Vaucanson, a generic library for finite state machines.
## Copyright (C) 2008 The Vaucanson Group.
## Copyright (C) 2008, 2009 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
......@@ -14,12 +14,12 @@
KRAT_EXP_BISON_YY = krat_exp_bison.yy
FROM_KRAT_EXP_BISON_YY_MAIN = \
krat_exp/krat_exp_bison.tab.cc
src/krat_exp/krat_exp_bison.tab.cc
FROM_KRAT_EXP_BISON_YY_OTHERS = \
krat_exp/stack.hh \
krat_exp/position.hh \
krat_exp/location.hh \
krat_exp/krat_exp_bison.tab.hh
src/krat_exp/stack.hh \
src/krat_exp/position.hh \
src/krat_exp/location.hh \
src/krat_exp/krat_exp_bison.tab.hh
FROM_KRAT_EXP_BISON_YY = \
$(FROM_KRAT_EXP_BISON_YY_MAIN) \
$(FROM_KRAT_EXP_BISON_YY_OTHERS)
......@@ -27,18 +27,18 @@ FROM_KRAT_EXP_BISON_YY = \
BUILT_SOURCES = $(FROM_KRAT_EXP_BISON_YY)
MAINTAINERCLEANFILES += $(FROM_KRAT_EXP_BISON_YY)
$(FROM_KRAT_EXP_BISON_YY_MAIN): $(srcdir)/krat_exp/$(KRAT_EXP_BISON_YY)
## We must cd into $(srcdir)/krat_exp/ first because if we tell
## bison to read $(srcdir)/krat_exp/$(KRAT_EXP_BISON_YY), it
## will also use the value of $(srcdir)/krat_exp/ in the
$(FROM_KRAT_EXP_BISON_YY_MAIN): $(srcdir)/src/krat_exp/$(KRAT_EXP_BISON_YY)
## We must cd into $(srcdir)/src/krat_exp/ first because if we tell
## bison to read $(srcdir)/src/krat_exp/$(KRAT_EXP_BISON_YY), it
## will also use the value of $(srcdir)/src/krat_exp/ in the
## generated include statements.
cd $(srcdir)/krat_exp && bison $(KRAT_EXP_BISON_YY)
cd $(srcdir)/src/krat_exp && bison $(KRAT_EXP_BISON_YY)
$(FROM_KRAT_EXP_BISON_YY_OTHERS): $(FROM_KRAT_EXP_BISON_YY_MAIN)
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) $(FROM_KRAT_EXP_BISON_YY_MAIN)
EXTRA_DIST = krat_exp/$(KRAT_EXP_BISON_YY)
EXTRA_DIST = src/krat_exp/$(KRAT_EXP_BISON_YY)
lib_LTLIBRARIES += libkrat_exp.la
libkrat_exp_la_CXXFLAGS = $(CXXFLAGS) -I$(top_srcdir)/lib/krat_exp
libkrat_exp_la_LIBADD = $(LIBOBJS)
libkrat_exp_la_SOURCES = $(FROM_KRAT_EXP_BISON_YY)
lib_LTLIBRARIES += libvcsn-common.la
libvcsn_common_la_CXXFLAGS = $(CXXFLAGS) -I$(top_srcdir)/src/lib/krat_exp
libvcsn_common_la_LIBADD = $(LIBOBJS)
libvcsn_common_la_SOURCES = $(FROM_KRAT_EXP_BISON_YY)
# Vaucanson, a generic library for finite state machines.
# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008 The Vaucanson Group.
# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009 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
......@@ -25,10 +25,10 @@ aut_are_equivalent_SOURCES = aut_are_equivalent.cc equivalent_functions.cc
aut_are_equivalent_CPPFLAGS = $(AM_CPPFLAGS) \
-DCONTEXT_HEADER="<vaucanson/boolean_automaton.hh>" \
-DCONTEXT_NAMESPACE="vcsn::boolean_automaton"
aut_are_equivalent_LDADD = $(top_builddir)/lib/libkrat_exp.la
aut_are_equivalent_LDADD = $(top_builddir)/lib/libvcsn-common.la
exp_are_equivalent_SOURCES = exp_are_equivalent.cc equivalent_functions.cc
exp_are_equivalent_CPPFLAGS = $(AM_CPPFLAGS) \
-DCONTEXT_HEADER="<vaucanson/boolean_automaton.hh>" \
-DCONTEXT_NAMESPACE="vcsn::boolean_automaton"
exp_are_equivalent_LDADD = $(top_builddir)/lib/libkrat_exp.la
exp_are_equivalent_LDADD = $(top_builddir)/lib/libvcsn-common.la
## Vaucanson, a generic library for finite state machines.
## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008 The Vaucanson Group.
## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009 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
......@@ -26,7 +26,7 @@ noinst_PROGRAMS = \
ORR_fmp \
check_rw
LDADD = $(top_builddir)/lib/libkrat_exp.la
LDADD = $(top_builddir)/lib/libvcsn-common.la
fibonacci_demo_SOURCES = fibonacci_demo.cc
fibonacci_rw_comp_SOURCES = fibonacci_rw_composition.cc
......
# src/demos/vgrep/Makefile.am -*- Makefile -*-
#
# Vaucanson, a generic library for finite state machines.
# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The
# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The
# Vaucanson Group.
#
# This program is free software; you can redistribute it and/or
......@@ -20,4 +20,4 @@ include ../demo.mk
noinst_PROGRAMS = vgrep
vgrep_SOURCES = vgrep.cc
vgrep_LDADD = $(top_builddir)/lib/libkrat_exp.la
vgrep_LDADD = $(top_builddir)/lib/libvcsn-common.la
## Vaucanson, a generic library for finite state machines.
## Copyright (C) 2006, 2007 The Vaucanson Group.
## Copyright (C) 2006, 2007, 2009 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
......@@ -19,7 +19,7 @@ EXTRA_DIST = failcomp.sh
AM_CPPFLAGS += $(BOOST_CPPFLAGS) -DEXCEPTION_TRAPS -DVCSN_SRC_DIR=\"'$(top_srcdir)'\"
LDADD += $(top_builddir)/lib/libkrat_exp.la
LDADD += $(top_builddir)/lib/libvcsn-common.la
TESTS_ENVIRONMENT = CXX="$(CXX)" \
CXXFLAGS="$(AM_CPPFLAGS) $(CPPFLAGS)"
......
## Vaucanson, a generic library for finite state machines.
## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 The Vaucanson Group.
## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009 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
......@@ -90,7 +90,7 @@ int_z_trans_tester_SOURCES = xml_int_z_trans_tester.cc
geometry_tester_SOURCES = xml_geometry_tester.cc
label_node_tester_SOURCES = xml_label_node_tester.cc
label_node_tester_LDADD = $(top_builddir)/lib/libkrat_exp.la
label_node_tester_LDADD = $(top_builddir)/lib/libvcsn-common.la
## ------------------------ ##
## Running the test suite. ##
......
......@@ -54,9 +54,7 @@ vcsn_char_b_SOURCES = $(COMMON_SOURCES) \
common_automaton_commands.hh \
b_commands.cc
vcsn_char_b_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=boolean_automaton -DVCSN_USE_LIB
vcsn_char_b_LDADD = $(LDADD) \
$(top_builddir)/lib/libvcsn-b.la \
$(top_builddir)/lib/libkrat_exp.la
vcsn_char_b_LDADD = $(LDADD) $(top_builddir)/lib/libvcsn-b.la
vcsn_char_z_SOURCES = $(COMMON_SOURCES) \
ratexp_commands.hh \
......@@ -64,9 +62,7 @@ vcsn_char_z_SOURCES = $(COMMON_SOURCES) \
z_commands.cc
vcsn_char_z_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=z_automaton -DVCSN_USE_LIB \
-DWITH_WEIGHTS
vcsn_char_z_LDADD = $(LDADD) \
$(top_builddir)/lib/libvcsn-z.la \
$(top_builddir)/lib/libkrat_exp.la
vcsn_char_z_LDADD = $(LDADD) $(top_builddir)/lib/libvcsn-z.la
vcsn_char_r_SOURCES = $(COMMON_SOURCES) \
ratexp_commands.hh \
......@@ -74,9 +70,7 @@ vcsn_char_r_SOURCES = $(COMMON_SOURCES) \
r_commands.cc
vcsn_char_r_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=r_automaton -DVCSN_USE_LIB \
-DWITH_WEIGHTS
vcsn_char_r_LDADD = $(LDADD) \
$(top_builddir)/lib/libvcsn-r.la \
$(top_builddir)/lib/libkrat_exp.la
vcsn_char_r_LDADD = $(LDADD) $(top_builddir)/lib/libvcsn-r.la
vcsn_char_fmp_b_SOURCES = $(COMMON_SOURCES) \
fmp_commands.cc
......@@ -87,8 +81,7 @@ vcsn_char_fmp_b_CPPFLAGS = $(AM_CPPFLAGS) \
-DRW_CONTEXT=boolean_transducer -DVCSN_USE_LIB
vcsn_char_fmp_b_LDADD = $(LDADD) \
$(top_builddir)/lib/libvcsn-fmp-tdc.la \
$(top_builddir)/lib/libvcsn-b.la \
$(top_builddir)/lib/libkrat_exp.la
$(top_builddir)/lib/libvcsn-b.la
vcsn_char_fmp_z_SOURCES = $(COMMON_SOURCES) \
fmp_commands.cc
......@@ -100,8 +93,7 @@ vcsn_char_fmp_z_CPPFLAGS = $(AM_CPPFLAGS) \
-DWITH_WEIGHTS
vcsn_char_fmp_z_LDADD = $(LDADD) \
$(top_builddir)/lib/libvcsn-z-fmp-tdc.la \
$(top_builddir)/lib/libvcsn-z.la \
$(top_builddir)/lib/libkrat_exp.la
$(top_builddir)/lib/libvcsn-z.la
vcsn_int_b_SOURCES = $(COMMON_SOURCES) \
ratexp_commands.hh \
......@@ -109,9 +101,7 @@ vcsn_int_b_SOURCES = $(COMMON_SOURCES) \
b_commands.cc
vcsn_int_b_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=int_boolean_automaton \
-DNO_PREDEF_ALPHABETS -DVCSN_USE_LIB
vcsn_int_b_LDADD = $(LDADD) \
$(top_builddir)/lib/libkrat_exp.la \
$(top_builddir)/lib/libvcsn-int-b.la
vcsn_int_b_LDADD = $(LDADD) $(top_builddir)/lib/libvcsn-int-b.la
vcsn_int_z_SOURCES = $(COMMON_SOURCES) \
ratexp_commands.hh \
......@@ -120,9 +110,7 @@ vcsn_int_z_SOURCES = $(COMMON_SOURCES) \
vcsn_int_z_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=int_z_automaton \
-DNO_PREDEF_ALPHABETS -DVCSN_USE_LIB \
-DWITH_WEIGHTS
vcsn_int_z_LDADD = $(LDADD) \
$(top_builddir)/lib/libkrat_exp.la \
$(top_builddir)/lib/libvcsn-int-z.la
vcsn_int_z_LDADD = $(LDADD) $(top_builddir)/lib/libvcsn-int-z.la
vcsn_int_fmp_b_SOURCES = $(COMMON_SOURCES) \
fmp_commands.cc
......@@ -132,7 +120,6 @@ vcsn_int_fmp_b_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=int_fmp_transducer \
-DIOAUT_NAME='"Boolean"' \
-DRW_CONTEXT=int_boolean_transducer -DVCSN_USE_LIB
vcsn_int_fmp_b_LDADD = $(LDADD) \
$(top_builddir)/lib/libkrat_exp.la \
$(top_builddir)/lib/libvcsn-int-b.la \
$(top_builddir)/lib/libvcsn-int-fmp-tdc.la
......@@ -145,7 +132,6 @@ vcsn_int_fmp_z_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=int_z_fmp_transducer \
-DRW_CONTEXT=int_z_transducer -DWITH_WEIGHTS \
-DVCSN_USE_LIB
vcsn_int_fmp_z_LDADD = $(LDADD) \
$(top_builddir)/lib/libkrat_exp.la \
$(top_builddir)/lib/libvcsn-int-z.la \
$(top_builddir)/lib/libvcsn-int-z-fmp-tdc.la
......@@ -158,9 +144,7 @@ vcsn_char_char_b_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=char_char_boolean_automaton
-DFIRST_PROJECTION_CONTEXT=boolean_automaton \
-DSECOND_PROJECTION_CONTEXT=boolean_automaton \
-DNO_SECOND_OPERATOR
vcsn_char_char_b_LDADD = $(LDADD) \
$(top_builddir)/lib/libkrat_exp.la \
$(top_builddir)/lib/libvcsn-char-char-b.la
vcsn_char_char_b_LDADD = $(LDADD) $(top_builddir)/lib/libvcsn-char-char-b.la
vcsn_char_int_b_SOURCES = $(COMMON_SOURCES) \
ratexp_commands.hh \
......@@ -170,9 +154,7 @@ vcsn_char_int_b_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=char_int_boolean_automaton \
-DVCSN_USE_LIB -DNO_PREDEF_ALPHABETS \
-DFIRST_PROJECTION_CONTEXT=boolean_automaton \
-DSECOND_PROJECTION_CONTEXT=int_boolean_automaton
vcsn_char_int_b_LDADD = $(LDADD) \
$(top_builddir)/lib/libkrat_exp.la \
$(top_builddir)/lib/libvcsn-char-int-b.la
vcsn_char_int_b_LDADD = $(LDADD) $(top_builddir)/lib/libvcsn-char-int-b.la
vcsn_int_int_b_SOURCES = $(COMMON_SOURCES) \
ratexp_commands.hh \
......@@ -183,9 +165,7 @@ vcsn_int_int_b_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=int_int_boolean_automaton \
-DFIRST_PROJECTION_CONTEXT=int_boolean_automaton \
-DSECOND_PROJECTION_CONTEXT=int_boolean_automaton \
-DNO_SECOND_OPERATOR
vcsn_int_int_b_LDADD = $(LDADD) \
$(top_builddir)/lib/libkrat_exp.la \
$(top_builddir)/lib/libvcsn-int-int-b.la
vcsn_int_int_b_LDADD = $(LDADD) $(top_builddir)/lib/libvcsn-int-int-b.la
......@@ -194,20 +174,16 @@ vcsn_char_zmin_SOURCES = $(COMMON_SOURCES) \
common_automaton_commands.hh \
b_commands.cc
vcsn_char_zmin_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=z_min_plus_automaton -DVCSN_USE_LIB
vcsn_char_zmin_LDADD = $(LDADD) \
$(top_builddir)/lib/libvcsn-z-min.la \
$(top_builddir)/lib/libkrat_exp.la
vcsn_char_zmin_LDADD = $(LDADD) $(top_builddir)/lib/libvcsn-z-min.la
vcsn_char_zmax_SOURCES = $(COMMON_SOURCES) \
ratexp_commands.hh \
common_automaton_commands.hh \
b_commands.cc
vcsn_char_zmax_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=z_max_plus_automaton -DVCSN_USE_LIB
vcsn_char_zmax_LDADD = $(LDADD) \
$(top_builddir)/lib/libvcsn-z-max.la \
$(top_builddir)/lib/libkrat_exp.la
vcsn_char_zmax_LDADD = $(LDADD) $(top_builddir)/lib/libvcsn-z-max.la
LDADD = $(top_builddir)/gnulib/libgnu.la
LDADD = $(top_builddir)/gnulib/libgnu.la $(top_builddir)/lib/libvcsn-common.la
AM_CPPFLAGS += -I$(top_srcdir)/gnulib
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