Commit 1dea0c43 authored by Akim Demaille's avatar Akim Demaille
Browse files

2006-05-18 Akim Demaille <akim@epita.fr>

	Fix various distro issues.
	* doc/manual/Makefile.am (SRC_FILES): Add the missing bits.
	* doc/doc.mk: Fix the order of the rules.

	* src/benchs/generate_all_benchs.sh: Remove, merged into...
	* src/benchs/generate_benchs.sh: this.
	Adjust uses.
	Introduce functions to clarify this program.
	* src/tests/test-suites/Makefile.am: Ship it.

	* configure.ac: Pass nostdinc to Automake to avoid useless -I on
	already too long command lines.
	All the uses must be adjusted to pass -I$(top_builddir) for
	config.h.
	So a Makefile snippet to factor all this would be most welcome.
	* src/vaucanson.mk: New.
	* src/taf-kit/Makefile.am: Use it.
	* src/benchs/common/Makefile.bench: Rename as...
	* src/benchs/common/bench.mk: this.
	Don't use INCLUDES, it is not defined.
	* src/tests/check/Makefile.flags,
	* src/benchs/common/bench.mk: Adjust to nostdinc.

	* src/demos/demo.mk: New.
	* src/demos/algorithms/Makefile.am: Use it.
	* src/demos/function_library/Makefile.am,
	* src/demos/automaton_library/Makefile.am,
	* src/demos/utilities/vgrep/Makefile.am,
	* src/demos/transducers/one_rule_rewriting/Makefile.am,
	* src/demos/transducers/Makefile.am: Ditto.

	* src/tests/bin/generate-test-suite.sh:
	Don't use "env", it's useless.
parent 2261a628
2006-05-17 Akim Demaille <akim@epita.fr>
2006-05-18 Akim Demaille <akim@epita.fr>
Help distcheck.
Fix various distro issues.
* doc/manual/Makefile.am (SRC_FILES): Add the missing bits.
* doc/doc.mk: Fix the order of the rules.
* src/benchs/generate_all_benchs.sh: Remove, merged into...
* src/benchs/generate_benchs.sh: this.
Adjust uses.
Introduce functions to clarify this program.
* src/tests/test-suites/Makefile.am: Ship it.
* configure.ac: Pass nostdinc to Automake to avoid useless -I on
already too long command lines.
All the uses must be adjusted to pass -I$(top_builddir) for
config.h.
So a Makefile snippet to factor all this would be most welcome.
* src/vaucanson.mk: New.
* src/taf-kit/Makefile.am: Use it.
* src/benchs/common/Makefile.bench: Rename as...
* src/benchs/common/bench.mk: this.
Don't use INCLUDES, it is not defined.
* src/tests/check/Makefile.flags,
* src/benchs/common/bench.mk: Adjust to nostdinc.
* src/demos/demo.mk: New.
* src/demos/algorithms/Makefile.am: Use it.
* src/demos/function_library/Makefile.am,
* src/demos/automaton_library/Makefile.am,
* src/demos/utilities/vgrep/Makefile.am,
* src/demos/transducers/one_rule_rewriting/Makefile.am,
* src/demos/transducers/Makefile.am: Ditto.
* src/tests/bin/generate-test-suite.sh:
Don't use "env", it's useless.
2006-05-16 Akim Demaille <akim@epita.fr>
* doc/share: New svn:external.
......
......@@ -10,7 +10,7 @@ fi
(cd src/tests/test-suites && /bin/sh ./generate-all.sh)
(cd src/tests/sanity && /bin/sh ./generate_files.sh .)
(cd src/vaucanswig && /bin/sh ./expand.sh .)
(cd src/benchs && /bin/sh ./generate_all_benchs.sh)
(cd src/benchs && /bin/sh ./generate_benchs.sh --all)
sh build-aux/find_tests.sh
sh build-aux/check_xml.sh
......
# configure.ac
# Vaucanson, a generic library for finite state machines.
# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 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
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# The complete GNU General Public Licence Notice can be found as the
# `NOTICE' file in the root directory.
#
# The Vaucanson Group consists of people listed in the `AUTHORS' file.
#
# $Id$
# VCSN_HEADER
AC_PREREQ([2.57])
AC_INIT([vaucanson], [0.8], [vaucanson-bugs@lrde.epita.fr])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([1.9.6 tar-ustar no-define foreign dist-bzip2])
AM_INIT_AUTOMAKE([1.9.6 tar-ustar no-define foreign dist-bzip2 nostdinc])
AC_CONFIG_HEADERS([config.h:config.hin] [include/vaucanson/config/pconf.hh])
# Comment the following to have a stable version numbering.
......
......@@ -10,7 +10,9 @@ images/a1_det.ps
EXTRA_DIST = $(SRC_FILES)
# We use vaucanson-g, which requires plain DVI compilation.
users_manual.pdf: users_manual.dvi
$(DVIPDF) users_manual.dvi
manual = vaucanson-users-manual.pdf
pdf: $(manual)
$(manual): users_manual.dvi
$(DVIPDF) users_manual.dvi $(manual)
dist_doc_DATA = users_manual.pdf
dist_doc_DATA = $(manual)
EXTRA_DIST = algorithm.hh alpha.syms bench_automaton.hh \
bench_constructs.hh Makefile.flags
bench_constructs.hh bench.mk
test:
echo hella
......@@ -2,9 +2,9 @@
# $Id$
AM_CXXFLAGS = $(CXXFLAGS_STRICT)
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src/benchs \
AM_CPPFLAGS = -I$(top_builddir) \
-I$(top_srcdir)/include -I$(top_srcdir)/src/benchs \
-I$(top_builddir)/include -I$(top_builddir)/src/bench
AM_CPPFLAGS += $(INCLUDES)
AM_CPPFLAGS += -DEXCEPTION_TRAPS
AM_CPPFLAGS += -DVCSN_SRC_DIR=\"'\$(top_srcdir)'\"
AM_CPPFLAGS += -DNDEBUG -O3 -DVCSN_BENCH
#!/bin/sh
./generate_benchs.sh determinization \
minimization_debruijn derived_terms minimization_2n \
quotient composition
#!/bin/sh
if [ $# -eq 0 ]; then
echo 'usage:'
echo 'create_benchs.sh bench_dirs'
exit 1
fi
BENCH_DIRS=$@
ALL_BENCH=''
# Vaucanson, a generic library for finite state machines.
# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 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
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# The complete GNU General Public Licence Notice can be found as the
# `NOTICE' file in the root directory.
#
# The Vaucanson Group consists of people listed in the `AUTHORS' file.
# Go through all benchs
for BENCH_DIR in $BENCH_DIRS; do
# generate_bench DIR
generate_bench ()
{
BENCH_DIR=$1
# Initialize Makefile.am.
cat > $BENCH_DIR/Makefile.am <<EOF
#
# DO NOT EDIT BY HAND - Generated by $0
#
include \$(top_srcdir)/src/benchs/common/Makefile.flags
include \$(top_srcdir)/src/benchs/common/bench.mk
EXTRA_PROGRAMS =
EOF
......@@ -32,7 +37,7 @@ EOF
// DO NOT EDIT BY HAND - Generated by $0
//
// 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, 2006 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
......@@ -70,7 +75,7 @@ EOF
int main(int argc, char* argv[])
{
std::cerr << BENCHTEXT << ":" << std::endl;
std::cerr \<\< BENCHTEXT \<\< ":" \<\< std::endl;
if (argc == 2)
BENCHFUN(atoi(argv[1]));
}
......@@ -89,4 +94,24 @@ EXTRA_DIST = Makefile.bench
include \$(top_srcdir)/src/benchs/$BENCH_DIR/Makefile.bench
EOF
fi
}
case $1:$# in
--all:1)
BENCH_DIRS="determinization \
minimization_debruijn derived_terms minimization_2n \
quotient composition"
;;
--all:* | *:0)
echo >&2 "invalid arguments: $@"
exit 1
;;
*)
BENCH_DIRS=$@
;;
esac
# Go through all benchs
for BENCH_DIR in $BENCH_DIRS; do
generate_bench $BENCH_DIR
done
# Makefile.am
# Vaucanson, a generic library for finite state machines.
# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 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
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# The complete GNU General Public Licence Notice can be found as the
# `NOTICE' file in the root directory.
#
# The Vaucanson Group consists of people listed in the `AUTHORS' file.
#
# $Id: Makefile.am 486 2004-03-31 22:30:33Z yann $
EXTRA_DIST = equivalent_functions.hh
include ../demo.mk
AM_CPPFLAGS = -DVCSN_XSD_PATH="\"$(top_srcdir)/src/vaucanson.xsd\""
EXTRA_DIST = equivalent_functions.hh
AM_CXXFLAGS = $(CXXFLAGS_STRICT) -DINTERNAL_CHECKS -DSTRICT
AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include
AM_CPPFLAGS += -DVCSN_XSD_PATH="\"$(top_srcdir)/src/vaucanson.xsd\""
EXTRA_PROGRAMS = universal b_are_equivalent z_are_equivalent \
TESTERS = universal b_are_equivalent z_are_equivalent \
b_exp_equiv z_exp_equiv b_contains_factor z_contains_factor classics
if VCSN_USE_XML
demos: $(EXTRA_PROGRAMS)
else
demos:
endif
universal_SOURCES = universal.cc
......
# Makefile.am
#
# $Id: Makefile.am 1005 2005-06-23 17:17:36Z o-conn_s $
include ../demo.mk
AM_CXXFLAGS = $(CXXFLAGS_STRICT) -DINTERNAL_CHECKS -DSTRICT
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
EXTRA_PROGRAMS = a1 b1 c1 divkbaseb double_ring ladybird
if VCSN_USE_XML
demos: divkbaseb double_ring ladybird
else
demos:
endif
GENERATORS = a1 b1 c1
XML_SAMPLES = $(srcdir)/a1.xml $(srcdir)/b1.xml $(srcdir)/c1.xml
EXTRA_DIST = $(XML_SAMPLES) dumper.hcc
......@@ -20,9 +12,6 @@ MAINTAINERCLEANFILES = $(XML_SAMPLES)
a1_SOURCES = a1.cc
b1_SOURCES = b1.cc
c1_SOURCES = c1.cc
divkbaseb_SOURCES = divkbaseb.cc
double_ring_SOURCES = double_ring.cc
ladybird_SOURCES = ladybird.cc
$(srcdir)/a1.xml: a1.cc $(top_srcdir)/configure.ac
$(MAKE) $(AM_MAKEFLAGS) a1$(EXEEXT)
......@@ -35,3 +24,9 @@ $(srcdir)/b1.xml: b1.cc $(top_srcdir)/configure.ac
$(srcdir)/c1.xml: c1.cc $(top_srcdir)/configure.ac
$(MAKE) $(AM_MAKEFLAGS) c1$(EXEEXT)
./c1$(EXEEXT) > $@
TESTERS = divkbaseb double_ring ladybird
divkbaseb_SOURCES = divkbaseb.cc
double_ring_SOURCES = double_ring.cc
ladybird_SOURCES = ladybird.cc
# Makefile.am
#
# $Id: Makefile.am 462 2004-03-31 21:55:16Z yann $
include $(top_srcdir)/src/vaucanson.mk
AM_CPPFLAGS = -DVCSN_XSD_PATH="\"$(top_srcdir)/src/vaucanson.xsd\""
AM_CXXFLAGS = $(CXXFLAGS_STRICT) -DINTERNAL_CHECKS -DSTRICT
AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include
AM_CPPFLAGS += -DVCSN_XSD_PATH="\"$(top_srcdir)/src/vaucanson.xsd\""
AM_CXXFLAGS += -DINTERNAL_CHECKS -DSTRICT
EXTRA_PROGRAMS = \
b \
......
# Makefile.am
#
# $Id: Makefile.am 462 2004-03-31 21:55:16Z yann $
include $(top_srcdir)/src/vaucanson.mk
SUBDIRS = one_rule_rewriting
AM_CPPFLAGS = -DVCSN_XSD_PATH="\"$(top_srcdir)/src/vaucanson.xsd\""
AM_CXXFLAGS = $(CXXFLAGS_STRICT) -DINTERNAL_CHECKS -DSTRICT
AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include
AM_CPPFLAGS += -DVCSN_XSD_PATH="\"$(top_srcdir)/src/vaucanson.xsd\""
EXTRA_PROGRAMS = u1 t1
......
......@@ -3,11 +3,9 @@
# $Id: Makefile.am 1005 2005-06-23 17:17:36Z o-conn_s $
# Don't check VCSN_USE_XML, as programs aren't automatically compiled.
include ../../demo.mk
AM_CXXFLAGS = $(CXXFLAGS_STRICT) -DINTERNAL_CHECKS -DSTRICT
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
EXTRA_PROGRAMS = fibonacci_demo fibonacci_rt fibonacci_tdc ORR_demo ORR_rt \
TESTERS = fibonacci_demo fibonacci_rt fibonacci_tdc ORR_demo ORR_rt \
ORR_tdc
fibonacci_demo_SOURCES = fibonacci_demo.cc
......
......@@ -2,6 +2,8 @@
#
# $Id: Makefile.am 462 2004-03-31 21:55:16Z yann $
## FIXME: What's the point of the utilities directory?
SUBDIRS = vgrep
demos:
......
......@@ -2,8 +2,9 @@
#
# $Id$
AM_CXXFLAGS = $(CXXFLAGS_STRICT) -DINTERNAL_CHECKS -DSTRICT
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
include $(top_srcdir)/src/vaucanson.mk
AM_CXXFLAGS += -DINTERNAL_CHECKS -DSTRICT
EXTRA_PROGRAMS = vgrep
......
include $(top_srcdir)/src/vaucanson.mk
# VCSN_USE_XML doesn't need to be checked as VCSN_TAF_KIT
# is not enabled if the former isn't.
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_OPTIMIZE)
AM_CPPFLAGS += $(CXXFLAGS_OPTIMIZE)
AM_LDFLAGS = $(TERMLIBS)
Progs = vcsn-b
......
......@@ -71,7 +71,7 @@ generate_CCs()
// DO NOT EDIT BY HAND - Generated by $0
//
// Vaucanson, a generic library for finite state machines.
// Copyright (C) 2001, 2002, 2004, 2005 The Vaucanson Group.
// Copyright (C) 2001, 2002, 2004, 2005, 2006 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
......@@ -188,7 +188,7 @@ AM_CPPFLAGS += $INCLUDES
AM_CPPFLAGS += -DEXCEPTION_TRAPS
AM_CPPFLAGS += -DVCSN_SRC_DIR=\"'\$(top_srcdir)'\"
TESTS_ENVIRONMENT = /usr/bin/env CXX="\$(CXX)" CXXFLAGS="\$(AM_CPPFLAGS)"
TESTS_ENVIRONMENT = CXX="\$(CXX)" CXXFLAGS="\$(AM_CPPFLAGS)"
TESTS += failcomp.sh
check_PROGRAMS = $CHECK_PROG
......
......@@ -2,5 +2,6 @@
# $Id$
AM_CXXFLAGS = $(CXXFLAGS_STRICT)
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src/tests \
AM_CPPFLAGS = -I$(top_builddir) \
-I$(top_srcdir)/include -I$(top_srcdir)/src/tests \
-I$(top_builddir)/include -I$(top_builddir)/src/tests
......@@ -3,3 +3,5 @@
# $Id$
SUBDIRS= $(VCSN_TESTS_SUBDIRS)
EXTRA_DIST = generate-all.sh
AM_CPPFLAGS = -I $(top_builddir) -I$(top_srcdir)/include -I$(top_builddir)/include
AM_CXXFLAGS = $(CXXFLAGS_STRICT)
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