Re-enable building of re2c (not lemon yet), including a generic Makefile rule.

A rewrite of the nasm-compat lexer in re2c is close to completion.

svn path=/trunk/yasm/; revision=648

diff --git a/Makefile.am b/Makefile.am
index b74f6798a4a558d466270ea256ce863625015165..583d7edda65ac8c2c4204e09fffe295c77542e0d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # $IdPath$
 
-SUBDIRS = libltdl m4 po
+SUBDIRS = libltdl tools m4 po
 
 CFLAGS = @ANSI_CFLAGS@
 AM_YFLAGS = -d
@@ -35,3 +35,7 @@ EXTRA_DIST += \
        Mkfiles/Makefile.vc Mkfiles/vc/config.h
 
 ACLOCAL_AMFLAGS = -I m4
+
+SUFFIXES = .re
+.re.c: tools/re2c/re2c$(EXEEXT)
+       tools/re2c/re2c -b $< | tools/re2c/cleanup.pl > $@

diff --git a/configure.ac b/configure.ac
index b3bacc050d39bde0ef8ab67c271a8dcaf5f04662..af183626a97933ded20085be8caf6273127cd87a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -285,6 +285,8 @@ AC_SUBST(LIBLTDL)
 
 AC_CONFIG_FILES([Makefile
        libltdl/Makefile
+       tools/Makefile
+       tools/re2c/Makefile
        m4/Makefile
        po/Makefile.in
 ])

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4890371d1e5902c54cb23e6f13f3a6b9422f46e8..de43148d57d3e307d34c51538e09f326dad06dbc 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,2 +1,2 @@
 # $IdPath$
-SUBDIRS = lemon re2c
+SUBDIRS = re2c