From: Peter Johnson <peter@tortall.net>
Date: Thu, 11 Apr 2002 07:21:38 +0000 (-0000)
Subject: Add re2c to the build tree.  Build tools with recursive make instead of from
X-Git-Tag: v0.2.0~254
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c23b8437d70dd3f55c06e7c7a456ce1391f48d0d;p=yasm

Add re2c to the build tree.  Build tools with recursive make instead of from
top-level Makefile (for various reasons, including object name conflicts).

svn path=/trunk/yasm/; revision=585
---

diff --git a/.cvsignore b/.cvsignore
index f9603540..ba35409f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -7,7 +7,6 @@ nasm-token.c
 yapp-token.c
 yasm
 *_test
-lemon
 configure
 configure.scan
 config.*
diff --git a/Makefile.am b/Makefile.am
index e0ae8ef7..17f53943 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # $IdPath$
 
-SUBDIRS = intl po
+SUBDIRS = tools intl po
 
 CFLAGS = @ANSI_CFLAGS@
 AM_YFLAGS = -d
@@ -24,7 +24,6 @@ EXTRA_DIST = \
 	src/Makefile.inc
 
 include check/Makefile.inc
-include tools/Makefile.inc
 include src/Makefile.inc
 
 EXTRA_DIST += \
diff --git a/configure.ac b/configure.ac
index 57c81054..5582b223 100644
--- a/configure.ac
+++ b/configure.ac
@@ -274,6 +274,9 @@ case "$host" in
 esac
 
 AC_CONFIG_FILES([Makefile
+	tools/Makefile
+	tools/lemon/Makefile
+	tools/re2c/Makefile
 	intl/Makefile
 	po/Makefile.in
 ])
diff --git a/configure.in b/configure.in
index 57c81054..5582b223 100644
--- a/configure.in
+++ b/configure.in
@@ -274,6 +274,9 @@ case "$host" in
 esac
 
 AC_CONFIG_FILES([Makefile
+	tools/Makefile
+	tools/lemon/Makefile
+	tools/re2c/Makefile
 	intl/Makefile
 	po/Makefile.in
 ])
diff --git a/tools/Makefile.am b/tools/Makefile.am
new file mode 100644
index 00000000..4890371d
--- /dev/null
+++ b/tools/Makefile.am
@@ -0,0 +1,2 @@
+# $IdPath$
+SUBDIRS = lemon re2c
diff --git a/tools/Makefile.inc b/tools/Makefile.inc
deleted file mode 100644
index 1bdf4a6d..00000000
--- a/tools/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-# $IdPath$
-
-EXTRA_DIST += \
-	tools/Makefile.inc
-
-include tools/lemon/Makefile.inc
diff --git a/tools/lemon/.cvsignore b/tools/lemon/.cvsignore
new file mode 100644
index 00000000..bde2990b
--- /dev/null
+++ b/tools/lemon/.cvsignore
@@ -0,0 +1 @@
+lemon
diff --git a/tools/lemon/Makefile.am b/tools/lemon/Makefile.am
new file mode 100644
index 00000000..4fbe1a6c
--- /dev/null
+++ b/tools/lemon/Makefile.am
@@ -0,0 +1,12 @@
+# $IdPath$
+CFLAGS = @ANSI_CFLAGS@
+
+noinst_PROGRAMS = lemon
+
+lemon_SOURCES = \
+	lemon.c
+
+EXTRA_DIST = \
+	lemon.html	\
+	lempar.c	\
+	README
diff --git a/tools/lemon/Makefile.inc b/tools/lemon/Makefile.inc
deleted file mode 100644
index bf7c101f..00000000
--- a/tools/lemon/Makefile.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-# $IdPath$
-
-noinst_PROGRAMS = lemon
-
-lemon_SOURCES = \
-	tools/lemon/lemon.c
-
-EXTRA_DIST += \
-	tools/lemon/Makefile.inc	\
-	tools/lemon/lemon.html		\
-	tools/lemon/lempar.c		\
-	tools/lemon/README
diff --git a/tools/re2c/.cvsignore b/tools/re2c/.cvsignore
new file mode 100644
index 00000000..f5496799
--- /dev/null
+++ b/tools/re2c/.cvsignore
@@ -0,0 +1,3 @@
+parser.c
+parser.h
+re2c
diff --git a/tools/re2c/Makefile.am b/tools/re2c/Makefile.am
new file mode 100644
index 00000000..c66920ba
--- /dev/null
+++ b/tools/re2c/Makefile.am
@@ -0,0 +1,45 @@
+# $IdPath$
+AM_YFLAGS = -d
+
+noinst_PROGRAMS = re2c
+
+re2c_SOURCES = \
+	basics.h	\
+	globals.h	\
+	ins.h		\
+	re.h		\
+	token.h		\
+	code.c		\
+	dfa.h		\
+	dfa.c		\
+	main.c		\
+	parse.h		\
+	parser.y	\
+	actions.c	\
+	scanner.h	\
+	scanner.c	\
+	substr.h	\
+	substr.c	\
+	translate.c
+
+EXTRA_DIST = \
+	CHANGELOG		\
+	NO_WARRANTY		\
+	README			\
+	scanner.re		\
+	re2c.1			\
+	bootstrap/re2c.man	\
+	bootstrap/scanner.c	\
+	doc/loplas.ps.gz	\
+	doc/sample.bib		\
+	examples/basemmap.c	\
+	examples/c.re		\
+	examples/cmmap.re	\
+	examples/cnokw.re	\
+	examples/cunroll.re	\
+	examples/modula.re	\
+	examples/sample.re	\
+	examples/simple.re	\
+	examples/rexx/README	\
+	examples/rexx/rexx.l	\
+	examples/rexx/scanio.c
diff --git a/tools/re2c/Makefile.inc b/tools/re2c/Makefile.inc
new file mode 100644
index 00000000..c66920ba
--- /dev/null
+++ b/tools/re2c/Makefile.inc
@@ -0,0 +1,45 @@
+# $IdPath$
+AM_YFLAGS = -d
+
+noinst_PROGRAMS = re2c
+
+re2c_SOURCES = \
+	basics.h	\
+	globals.h	\
+	ins.h		\
+	re.h		\
+	token.h		\
+	code.c		\
+	dfa.h		\
+	dfa.c		\
+	main.c		\
+	parse.h		\
+	parser.y	\
+	actions.c	\
+	scanner.h	\
+	scanner.c	\
+	substr.h	\
+	substr.c	\
+	translate.c
+
+EXTRA_DIST = \
+	CHANGELOG		\
+	NO_WARRANTY		\
+	README			\
+	scanner.re		\
+	re2c.1			\
+	bootstrap/re2c.man	\
+	bootstrap/scanner.c	\
+	doc/loplas.ps.gz	\
+	doc/sample.bib		\
+	examples/basemmap.c	\
+	examples/c.re		\
+	examples/cmmap.re	\
+	examples/cnokw.re	\
+	examples/cunroll.re	\
+	examples/modula.re	\
+	examples/sample.re	\
+	examples/simple.re	\
+	examples/rexx/README	\
+	examples/rexx/rexx.l	\
+	examples/rexx/scanio.c