from Nicolas Pouillard <ertai@lrde.epita.fr>

	* lib/sdf-pgen/Makefile.am,
	* lib/Makefile.am: Add.
	* configure.ac,
	* src/syn/Makefile.am,
	* Makefile.am: Update.

2004-05-06  Nicolas Pouillard  <ertai@lrde.epita.fr>

sdf-astgen/ChangeLog

+2004-05-06  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	* lib/sdf-pgen/Makefile.am,
+	* lib/Makefile.am: Add.
+	* configure.ac,
+	* src/syn/Makefile.am,
+	* Makefile.am: Update.
+
 2004-05-06  Nicolas Pouillard  <ertai@lrde.epita.fr>
 
 	Initial Checkin.

sdf-astgen/Makefile.am

@@ -3,7 +3,7 @@
 include $(top_srcdir)/config/Makefile.xt
 
 ACLOCAL_AMFLAGS		= -I config
-SUBDIRS			= config src # test
+SUBDIRS			= config lib src # test
 BOOTCLEAN_SUBDIRS	= src
 XTC_IMPORT		= $(STRATEGOXT)/share/strategoxt/XTC
 

sdf-astgen/configure.ac

@@ -62,6 +62,8 @@ AC_PROG_INSTALL
 # Output Files
 AC_CONFIG_FILES([Makefile
 		 config/version.str
+		 lib/Makefile
+		 lib/sdf-pgen/Makefile
 		 src/Makefile
 		 src/syn/Makefile
 		 src/sig/Makefile

sdf-astgen/lib/Makefile.am

+# Makefile.am                                          -*-Makefile-*-
+
+include $(top_srcdir)/config/Makefile.xt
+
+SUBDIRS			= ppgen sdf-pgen
+BOOTCLEAN_SUBDIRS	= $(SUBDIRS)

sdf-astgen/lib/sdf-pgen/Makefile.am

+# Makefile.am                                          -*-Makefile-*-
+
+include $(top_srcdir)/config/Makefile.xt
+
+SDFS	= \
+	Sdf2.sdf					\
+	basic/Comments.sdf				\
+	basic/Whitespace.sdf				\
+	languages/aterm/syntax/ATerms.sdf		\
+	languages/aterm/syntax/IntCon.sdf		\
+	languages/aterm/syntax/Literals.sdf		\
+	languages/aterm/syntax/RealCon.sdf		\
+	languages/sdf2/syntax/Aliases.sdf		\
+	languages/sdf2/syntax/Basic.sdf			\
+	languages/sdf2/syntax/CC.sdf			\
+	languages/sdf2/syntax/Character-Class.sdf	\
+	languages/sdf2/syntax/Character.sdf		\
+	languages/sdf2/syntax/Grammars.sdf		\
+	languages/sdf2/syntax/Kernel.sdf		\
+	languages/sdf2/syntax/Labels.sdf		\
+	languages/sdf2/syntax/Lifting.sdf		\
+	languages/sdf2/syntax/Literals.sdf		\
+	languages/sdf2/syntax/Modules.sdf		\
+	languages/sdf2/syntax/Priority.sdf		\
+	languages/sdf2/syntax/Regular.sdf		\
+	languages/sdf2/syntax/Renaming.sdf		\
+	languages/sdf2/syntax/Restrictions.sdf		\
+	languages/sdf2/syntax/Sdf2-Syntax.sdf		\
+	languages/sdf2/syntax/Sdf2.sdf			\
+	languages/sdf2/syntax/Sorts.sdf			\
+	languages/sdf2/syntax/Symbols.sdf
+
+noinst_DATA	= $(SDFS)
+CLEANFILES	= $(SDFS)
+
+$(SDFS): $(SDF_FRONT)/share/sdf/sdf-front/Sdf2.def
+	unpack-sdf -i $<

sdf-astgen/src/syn/Makefile.am

@@ -5,7 +5,7 @@ include $(top_srcdir)/config/Makefile.xt
 PGEN_FLAGS      = -m $*
 
 SDFINCLUDES     = \
-		  -I $(STRATEGO_FRONT)/share/sdf/sdf-front \
+		  -I $(GPP)/share/sdf/gpp \
 		  -I $(STRATEGO_FRONT)/share/sdf/stratego-front
 
 SDFS		= \