* test/disambiguate/Makefile.am, test/expressions/Makefile.am,
	* test/g++/template/Makefile.am, test/g++/parse/Makefile.am,
	* test/g++/overload/Makefile.am, test/g++/other/Makefile.am,
	* test/g++/opt/Makefile.am, test/g++/lookup/Makefile.am,
	* test/g++/init/Makefile.am, test/g++/inherit/Makefile.am,
	* test/g++/eh/Makefile.am, test/g++/debug/Makefile.am,
	* test/g++/abi/Makefile.am: Fix in CLEANFILES

	* test/disambiguate/variable-01.detcc,
	* test/disambiguate/typedef-02.detcc,
	* test/disambiguate/typedef-01.detcc,
	* test/disambiguate/template-10.detcc,
	* test/disambiguate/template-09.detcc,
	* test/disambiguate/template-06.detcc,
	* test/disambiguate/template-05.detcc,
	* test/disambiguate/template-04.detcc,
	* test/disambiguate/function-06.detcc,
	* test/disambiguate/function-05.detcc,
	* test/disambiguate/function-04.detcc,
	* test/disambiguate/function-03.detcc,
	* test/disambiguate/function-02.detcc,
	* test/disambiguate/function-01.detcc,
	* test/disambiguate/enum-04.detcc, test/disambiguate/enum-03.detcc,
	* test/disambiguate/enum-02.detcc: New.

	* configure.ac: Add --with-detgen option.

	* src/import-cxx-cons/Makefile.am: Deleted.
	* src/import-cxx-cons/import-cxx-cons.str: Deleted.
	* src/Makefile.am: Delete empty subdirs.

	* src/syn/ClassSpecifiers.sdf,
	* src/syn/EnumSpecifiers.sdf,
	* src/syn/Expressions.sdf,
	* src/syn/IdExpressions.sdf,
	* src/syn/Makefile.am,
	* src/syn/Namespaces.sdf,
	* src/syn/SimpleTypeSpecifiers.sdf,
	* src/syn/Specifiers.sdf:
	Add det tags to generate Dxx.

	* src/deterministic/Makefile.am: Generate the Dxx grammar.
	* src/deterministic/Dxx-main.sdf: Deleted.
	* src/deterministic/Dxx-nocons.sdf: Deleted.
	* src/deterministic/Dxx.sdf: New.

	* src/sdf/Makefile.am: Update.

	* src/import-cxx-cons/import-cxx-cons.str:
	Accept markups at any place.

	* src/deterministic/Dxx-nocons.sdf:
	Fix PP for OriginalNamespace, and add some bracket attributes.

        * Makefile.am: Remove DIST_SUBDIRS.
        * config/Makefile.am, configure.ac: Remove disambiguate-check.
        * config/sdf-check.in: Various cleanups.
        * src/Makefile.am, src/grammar/Makefile.am,
        * src/deterministic/Makefile.am, test/Makefile.am,
        * src/cxxsdf/Makefile.am, src/syn/Makefile.am: Rename grammar and
        signature directories to syn and sig (StrategoXT naming conventions).
        * src/import-cxx-cons/Makefile.am: Add --verbose 0. Fix CLEANFILES.
        * INSTALL, COPYING: New files.

	* Makefile.am: Add -I config for aclocal.
	* bootstrap: Remove -I config.

	* README: Update authors and dependencies (boxedsdf).
	* NEWS, AUTHORS: New.

	* src/import-cxx-cons/Makefile.am,
	* src/import-cxx-cons/import-cxx-cons.str: New files.

	* src/deterministic/Dxx.sdf:
	Deleted file.

	* src/deterministic/Dxx-main.sdf,
	* src/deterministic/Dxx-nocons.sdf: New files.

	* src/deterministic/Makefile.am:
	Now generate Dxx.sdf with import-cxx-cons tool and Dxx-nocons.sdf.
	The constructors in Dxx are now the same as Cxx.

	* src/cxxsdf/Makefile.am:
	New file. This directory is reseved for Cxx grammar files after
	using sdf-option and sdf-cons.

	* src/dxx-to-cxx/Makefile.am,
	* src/dxx-to-cxx/dxx-to-cxx.str,
	* src/cxx-to-dxx/Makefile.am,
	* src/cxx-to-dxx/cxx-to-dxx.str: Deleted files.

	* configure.ac,
	* src/Makefile.am: Some directories added or deleted

	* src/signature/Makefile.am,
	* src/pp/Makefile.am,
	* src/sdf/Makefile.am,
	* src/strategocxx/Makefile.am:
	Use Dxx.

	* config/sdf-check.in: Use Cxx.tbl.

	* */Makefile.am, bootstrap: autoxt in config

	* configure.ac: Now --with-sdf-option and --with-boxedsdf.

	* src/pp/pp-cxx.str: Use the generated grammar.
	* src/pp/Options.pp: New file.
	* src/pp/Cxx-pretty.pp: Deleted file.
	* src/pp/pp-dxx.str: New file.

	* src/grammar/*.sdf: Pretty-print attributes added !
	* src/grammar/Makefile.am,
	* src/deterministic/Makefile.am: Use BoxedSdf.

        * README, Makefile.am, configure.ac, bootstrap, src/pp/Makefile.am,
        * src/dxx-to-cxx/Makefile.am, src/cxx-to-dxx/Makefile.am,
        * src/strategocxx/Makefile.am:
        Cleanup.
        * src/attribute/Makefile.am, src/attribute/asfix-attribute.str:
        Use AsFix syntax from asfix-tools instead of keeping it in the `lib'
        directory.
        * src/grammar/Makefile.am, src/deterministic/Makefile.am:
        Use `pp-sdf' instead of `pp'.
        * src/signature/Makefile.am: Generate rtrees for distribution.
        * lib/Layout.sdf: Move to...
        * src/grammar/Layout.sdf: this.

        * src/strategocxx/CxxVariables.sdf: Remove colliding variables, add
        some more variables.
        * src/strategocxx/StrategoCxx.sdf: Handle both |[...]| and |[...]c++|
        syntaxes.

	* configure.ac: Add sdf/Makefile and strategocxx/Makefile
	* Makefile.am, src/Makefile.am: Add BOOTCLEAN_SUBDIRS
	* src/sdf/Makefile.am: New. Create a sdf-option'ed version of the
	grammar. We need this for concrete syntax implementation.

	* src/strategocxx/Makefile.am: New StrategoCxx grammar, for using Cxx
	syntax in Stratego code.
	* src/strategocxx/StrategoCxx.sdf: New. The StrategoCxx grammar.
	* src/strategocxx/CxxVariables.sdf: New. Declare StrategoCxx variables.

	* src/cxx-to-det/cxx-to-det.str, src/det-to-cxx/det-to-cxx.str:
	Rename as...
	* src/cxx-to-dxx/cxx-to-dxx.str, src/dxx-to-cxx/dxx-to-cxx.str:
	...these.

	* configure.ac, src/Makefile.am, src/deterministic/Dxx.sdf,
	* src/deterministic/Makefile.am, src/signature/Makefile.am,
	* src/dxx-to-cxx/Makefile.am, src/dxx-to-cxx/dxx-to-cxx.str,
	* src/cxx-to-dxx/Makefile.am, src/cxx-to-dxx/cxx-to-dxx.str,
	* src/pp/pp-cxx.str:
	Rename cxx-det to dxx everywhere.

	* src/deterministic/Cpp-det.sdf, src/grammar/Cpp.sdf,
	* src/pp/Cpp-pretty.pp, src/cpp-to-det/cpp-to-det.str,
	* src/det-to-cpp/det-to-cpp.str, src/pp/pp-cpp.str:
	Rename as...
	* src/deterministic/Cxx-det.sdf, src/grammar/Cxx.sdf,
	* src/pp/Cxx-pretty.pp, src/cxx-to-det/cxx-to-det.str,
	* src/det-to-cxx/det-to-cxx.str, src/pp/pp-cxx.str:
	...these.

	* configure.ac, src/Makefile.am, src/grammar/Cxx.sdf,
	* src/grammar/Makefile.am, src/deterministic/Cxx-det.sdf,
	* src/deterministic/Makefile.am, test/Makefile.am,
	* src/signature/Makefile.am, src/det-to-cxx/Makefile.am,
	* src/det-to-cxx/det-to-cxx.str, src/cxx-to-det/Makefile.am,
	* src/cxx-to-det/cxx-to-det.str, src/pp/pp-cxx.str, src/pp/Makefile.am:
	Rename cpp to cxx everywhere.

        * src/pp/Makefile.am (STRINCLUDES): Remove it.
        This variable was bugged since $(XTCFLAGS) already has "-I" inside.
        (SCFLAGS): Add "--verbose 0 $(XTCFLAGS)".

	* stdconfig: Remove CFLAGS, useless now.
	* Makefile.am: Remove XTC_IMPORT, it was not necessary.

--- Makefile.am Thu, 10 Apr 2003 18:40:23 +0200 david_v (meta-c++-grammar/f/34_Makefile.a 1.4 640)
+++ Makefile.am Tue, 13 May 2003 02:31:08 +0200 vasseu_c (meta-c++-grammar/f/34_Makefile.a 1.4 640)
@@ -1,4 +1,4 @@
 SUBDIRS = config src lib test
 EXTRA_DIST = stdconfig bootstrap Makefile.xt
 include Makefile.xt
-XTC_IMPORT = $(STRATEGOXT)/share/StrategoXT/XTC
+XTC_IMPORT = $(STRATEGOXT)/share/xt-strategoxt/XTC
Index: stdconfig
--- stdconfig Tue, 25 Mar 2003 06:44:56 +0100 vasseu_c (meta-c++-grammar/g/44_stdconfig 1.1 755)
+++ stdconfig Tue, 06 May 2003 18:49:58 +0200 vasseu_c (meta-c++-grammar/g/44_stdconfig 1.1 755)
@@ -1,9 +1,7 @@
 #!/bin/sh

-XT_PREFIX=$HOME/xt
+XT=/usr

 ./bootstrap
-./configure --prefix=$HOME \
-            --with-xt=$XT_PREFIX \
-            --with-stratego-xt=$XT_PREFIX \
-            --with-xtc=$XT_PREFIX
+./configure --prefix=$HOME --with-xt=$XT \
+CFLAGS="-I/usr/include/xt-strategoxt -I/usr/include/xt-aterm"
Index: src/pp/Makefile.am
--- src/pp/Makefile.am Thu, 10 Apr 2003 18:40:23 +0200 david_v (meta-c++-grammar/g/48_Makefile.a 1.1 644)
+++ src/pp/Makefile.am Wed, 07 May 2003 01:30:41 +0200 vasseu_c (meta-c++-grammar/g/48_Makefile.a 1.1 644)
@@ -2,7 +2,7 @@

 bin_PROGRAMS   = pp-cpp
 SCFLAGS                = --main $*
-STRINCLUDES    = -I $(XTC)/share/xtc -I $(GPP)/share/gpp
+STRINCLUDES    = -I $(XTCFLAGS)
 pkgdata_DATA   = Cpp-pretty.pp.af
 EXTRA_DIST     = Cpp-pretty.pp pp-cpp.str unbox.str
 CLEANFILES     = Cpp-pretty.pp.af

	* Makefile.am: Added StrategoXT to the XTC_IMPORT.
	* configure.ac, src/Makefile: Update.
	* src/pp: New Directory.
	* src/pp/Makefile: New file.
	* src/pp/pp-cpp.str: New file. Pretty printer.
	* src/pp/unbox.str: New file. Tool for abox transformation.
	* src/pp/Cpp-pretty.pp: New file. Pretty print table.

	* configure.ac: Expect automake 1.7.3.
	* config/sdf-check.in: Remove stderr redirection to /dev/null when
	parsing test files.

	* lib/sdf.cons.tbl, lib/stratego.pp, lib/stratego.pp.af: Remove.
	* lib/Makefile.am: Remove `sdf.cons.tbl', `stratego.pp', and
	`stratego.pp.af' from EXTRA_DIST.
	* src/attribute/Makefile.am, src/det-to-cpp/Makefile.am,
	* src/cpp-to-det/Makefile.am: Use STRINCLUDES for `sc' includes. Don't
	use wildcards in EXTRA_DIST and	CLEANFILES.

        * config/sdf-check.in: Fix @SGLR@ that should be used as
        @SGLR@/bin/sglr. Replace `unparsePT' with `asfix-yield'.

        * src/grammar/Makefile.am, src/deterministic/Makefile.am: Fix a bug
        that made the generated `Cpp.tbl' useless: don't forget to set
        PGEN_FLAGS to "-m $*" in Makefiles that invoke `sc'.

	* stdconfig, bootstrap: Add, from sample StrategoXT package.

        * src/attribute/Main.r, src/cpp-to-det/Main.r, src/det-to-cpp/Main.r:
        Rename as...
        * src/attribute/asfix-attribute.str, src/cpp-to-det/cpp-to-det.str,
        * src/det-to-cpp/det-to-cpp.str:
        ...these, and rename `main' strategy.

        * Makefile.am, lib/Makefile.am, src/Makefile.am,
        * src/attribute/Makefile.am, src/grammar/Makefile.am,
        * src/deterministic/Makefile.am, src/cpp-to-det/Makefile.am,
        * src/det-to-cpp/Makefile.am, src/signature/Makefile.am:
        Use Makefile.xt from autoxt, remove useless rules, modifify to work
        with standard StrategoXT rules.

        * config/Makefile.am: Add `depcomp' to STANDARD_TOOLS list.
        * configure.ac: Use USE_XT_PACKAGES macro from autoxt.
        * stdconfig, bootstrap: Add, from sample StrategoXT package.
        * README: Fix a typo.

	* lib/Layout.sdf: Add the right follow restrictions on layout, to
	avoid weird parsing ambiguities when using comments.

	* src/deterministic/Cpp-det.sdf: In some cases, a same piece of
	text can be parsed both as an expression or a declaration.  Add an
	annotation rule for expressions.

	* src/cpp-to-det/Main.r: Handle this new case.
	* src/det-to-cpp/Main.r: Handle this new case.

	* src/deterministic/Cpp-det.sdf: Add a rule to be able to annotate
	original definitions of namespaces.

	* src/cpp-to-det/Main.r: Update with respect to this new rule.
	* src/det-to-cpp/Main.r: Update with respect to this new rule.

	* src/Makefile.am (SUBDIRS): Update.
	* configure.ac: Update.

	* src/cpp-to-det/Main.r: New file.  Provide a filter that converts
	C++ abstract syntax trees into deterministic C++.
	* src/cpp-to-det/Makefile.am: New file.
	* src/cpp-to-det: New directory.

	* src/Makefile.am (SUBDIRS): Update.
	* configure.ac: Update.

	* src/det-to-cpp/Main.r: New.  Provide a filter that converts C++
	programs annoted for determinstic parsing into usual C++ programs.
	* src/det-to-cpp/Makefile.am: New file.
	* src/det-to-cpp: New directory.

	* src/signature/Makefile.am: Build a signature for the
	determinstic flavor of the grammar.

	* src/deterministic/Cpp-det.sdf: Add enum related rules.

	* src/deterministic/Cpp-det.sdf: Add rules for delimiting nested
	name specifiers.

	* src/deterministic/Cpp-det.sdf: Add rules for type identifiers.
	Use prefer to make the rules in this module override the original
	rules of the C++ grammar.

	* src/deterministic/Cpp-det.sdf: Rename the module.  Remove space
	characters from the disambiguation comments, it makes annotated
	programs much more readable.

	* src/Makefile.am: Update.
	* configure.ac: Update.

	* src/deterministic/Cpp-det.sdf: New.  Introduce an annotated
        flavor of our C++ grammar, that makes deterministic parsing
        possible.
	* src/deterministic/Makefile.am: New file.
	* src/deterministic: New directory.

	* configure.ac: Update.
	* src/Makefile.am (SUBDIRS): Update.
	* test/Makefile.am: Remove disambiguation tests.
	* src/disambiguate: Remove directory.  This filter is obsolete.

	* src/grammar/BooleanLiterals.sdf: Remove some debugging rules.
	* src/grammar/CharacterLiterals.sdf: Likewise.
	* src/grammar/Expressions.sdf: Likewise.
	* src/grammar/FloatingLiterals.sdf: Likewise.
	* src/grammar/Identifiers.sdf: Likewise.
	* src/grammar/IntegerLiterals.sdf: Likewise.
	* src/grammar/Literals.sdf: Likewise.
	* src/grammar/PrimaryExpressions.sdf: Likewise.
	* src/grammar/StringLiterals.sdf: Likewise.

	* src/grammar/MemberSpecifications.sdf: Rewrite the rules that
	produce `MemberDeclarator' to avoid useless conflicts.

	* src/grammar/Makefile.am: Generate the pretty printing table.