from Clement Vasseur <clement.vasseur@lrde.epita.fr>

	* src/sig/Makefile.am: Use Stratego-Regular to generate the
	signatures.

cxx-grammar/ChangeLog

+2004-05-04  Clement Vasseur  <clement.vasseur@lrde.epita.fr>
+
+	* src/sig/Makefile.am: Use Stratego-Regular to generate the
+	signatures.
+
 2004-05-04  Nicolas Pouillard  <ertai@lrde.epita.fr>
 
 	* configure.ac: Bug fix, boxed2sdf no more in boxedsdf.

cxx-grammar/src/sig/Makefile.am

@@ -2,93 +2,17 @@
 
 include $(top_srcdir)/config/Makefile.xt
 
-SDFS 		= \
-		AccessSpecifiers.sdf \
-		AdditiveExpressions.sdf \
-		AndExpressions.sdf \
-		AsmDefinitions.sdf \
-		AssignmentExpressions.sdf \
-		BaseSpecifiers.sdf \
-		BooleanLiterals.sdf \
-		CastExpressions.sdf \
-		CharacterLiterals.sdf \
-		Characters.sdf \
-		ClassSpecifiers.sdf \
-		CompoundStatements.sdf \
-		ConditionalExpressions.sdf \
-		ConstantExpressions.sdf \
-		ConversionFunctionIds.sdf \
-		Cxx.sdf \
-		CtorInitializers.sdf \
-		CvQualifiers.sdf \
-		DeclarationStatements.sdf \
-		Declarations.sdf \
-		Declarators.sdf \
-		DeleteExpressions.sdf \
-		Dxx.sdf \
-		ElaboratedTypeSpecifiers.sdf \
-		EnumSpecifiers.sdf \
-		EqualityExpressions.sdf \
-		EscapeSequences.sdf \
-		ExceptionSpecifications.sdf \
-		ExclusiveOrExpressions.sdf \
-		ExplicitInstantiations.sdf \
-		ExplicitSpecializations.sdf \
-		ExpressionStatements.sdf \
-		Expressions.sdf \
-		FloatingLiterals.sdf \
-		FunctionDefinitions.sdf \
-		FunctionSpecifiers.sdf \
-		IdExpressions.sdf \
-		Identifiers.sdf \
-		InclusiveOrExpressions.sdf \
-		InitDeclarators.sdf \
-		Initializers.sdf \
-		IntegerLiterals.sdf \
-		IterationStatements.sdf \
-		JumpStatements.sdf \
-		Keywords.sdf \
-		LabeledStatements.sdf \
-		Layout.sdf \
-		LinkageSpecifications.sdf \
-		Literals.sdf \
-		LogicalAndExpressions.sdf \
-		LogicalOrExpressions.sdf \
-		MemberSpecifications.sdf \
-		MultiplicativeExpressions.sdf \
-		NamespaceAliases.sdf \
-		Namespaces.sdf \
-		NewExpressions.sdf \
-		OperatorFunctionIds.sdf \
-		ParameterDeclarations.sdf \
-		PmExpressions.sdf \
-		PostfixExpressions.sdf \
-		PrimaryExpressions.sdf \
-		RelationalExpressions.sdf \
-		SelectionStatements.sdf \
-		ShiftExpressions.sdf \
-		SimpleTypeSpecifiers.sdf \
-		Specifiers.sdf \
-		Statements.sdf \
-		StorageClassSpecifiers.sdf \
-		StringLiterals.sdf \
-		TemplateDeclarations.sdf \
-		TemplateIds.sdf \
-		TemplateParameters.sdf \
-		ThrowExpressions.sdf \
-		TranslationUnits.sdf \
-		TryBlocks.sdf \
-		TypeIds.sdf \
-		TypeSpecifiers.sdf \
-		UnaryExpressions.sdf \
-		UsingDeclarations.sdf \
-		UsingDirectives.sdf
-
-STRS		= $(subst .sdf,.str,$(SDFS)) Dummy.str
-pkgdata_DATA	= Dxx.def Dxx.str $(subst .sdf,.rtree,$(SDFS)) Dummy.rtree
+pkgdata_DATA	= Cxx.rtree Dxx.rtree
 
 Dxx.def: $(top_builddir)/src/deterministic/Dxx.def
 	cp $< $@
 
-CLEANFILES	= $(pkgdata_DATA) *.str
-$(STRS)		: Dxx.def
+Dxx.str: Dxx.def
+	$(STRATEGO_REGULAR)/bin/sdf2rtg -i $< -m Dxx | \
+	$(STRATEGO_REGULAR)/bin/rtg2sig -o $@
+
+Cxx.str: Dxx.def
+	$(STRATEGO_REGULAR)/bin/sdf2rtg -i $< -m Cxx | \
+	$(STRATEGO_REGULAR)/bin/rtg2sig -o $@
+
+CLEANFILES	= $(pkgdata_DATA) Dxx.rtree Cxx.rtree