From 25113b464774b474d4c233f2acaec23fa367eace Mon Sep 17 00:00:00 2001
From: "K. Richard Pixley" <rich@cygnus>
Date: Sat, 28 Dec 1991 01:27:15 +0000
Subject: [PATCH] flex joins the fray, also fixed clean-info in devo.

---
 ChangeLog    |  2 ++
 Makefile.in  | 83 +++++++++++++++++++++++++++++++++++++++++++++-------
 configure.in |  2 +-
 3 files changed, 76 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0cca85184e..bd8d34887d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Fri Dec 27 16:26:47 1991  K. Richard Pixley  (rich at cygnus.com)
 
+	* configure.in, Makefile.in: fix clean-info, add flex.
+
 	* configure: be less sensitive to spaces in Makefile.in.
 
 Thu Dec 26 16:30:26 1991  K. Richard Pixley  (rich at cygnus.com)
diff --git a/Makefile.in b/Makefile.in
index 3bc4e34897..17b5736c6c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,6 +78,10 @@ all:	$(ALL)
 info:	cfg-paper.info
 	$(MAKE) subdir_do DO=info "DODIRS=$(SUBDIRS)"
 
+clean-info:
+	$(MAKE) subdir_do DO=clean-info "DODIRS=$(SUBDIRS)"
+	rm -f cfg-paper.info
+
 cfg-paper.info: cfg-paper.texi
 	$(MAKEINFO) -o cfg-paper.info $(srcdir)/cfg-paper.texi
 
@@ -93,24 +97,26 @@ install-dir.info:
 	$(INSTALL_DATA) dir.info $(infodir)/dir.info
 
 # clib prms
-all.normal: all-texinfo all-bison all-byacc all-ld all-gnulib all-gdb all-make \
-	all-cvs all-emacs all-ispell
+all.normal: all-texinfo all-bison all-byacc all-flex all-ld all-gnulib \
+	all-gdb all-make all-cvs all-emacs all-ispell
 all.cross: all-bison all-ld all-gnulib all-gdb
 #	$(MAKE) subdir_do DO=all "DODIRS=$(SUBDIRS) $(OTHERS)"
 
-clean: clean-libiberty clean-texinfo clean-bfd clean-binutils clean-bison \
-	clean-byacc clean-ld clean-gas clean-gcc clean-gnulib clean-readline \
-	clean-glob clean-gdb clean-make clean-diff clean-grep clean-rcs \
-	clean-gdbm clean-cvs clean-emacs clean-ispell
+clean: clean-libiberty clean-texinfo clean-bfd clean-binutils \
+	clean-bison clean-byacc clean-flex clean-ld clean-gas \
+	clean-gcc clean-gnulib clean-readline clean-glob clean-gdb \
+	clean-make clean-diff clean-grep clean-rcs clean-gdbm \
+	clean-cvs clean-emacs clean-ispell
 	rm -rf *.a TEMP errs core *.o *~ \#* TAGS *.E
 
 install: $(INSTALL_TARGET)
 	$(INSTALL_DATA) configure.man $(man1dir)/configure.1
 
-install.all: install-dirs install-libiberty install-texinfo install-binutils install-bison \
-	install-byacc install-ld install-gas install-gcc install-gnulib \
-	install-readline install-glob install-gdb install-make install-cvs \
-	install-emacs install-ispell
+install.all: install-dirs install-libiberty install-texinfo \
+	install-binutils install-bison install-byacc install-flex \
+	install-ld install-gas install-gcc install-gnulib \
+	install-readline install-glob install-gdb install-make \
+	install-cvs install-emacs install-ispell
 install.cross: install-dirs install-libiberty install-binutils install-bison \
 	install-byacc install-ld install-gas install-gnulib \
 	install-readline install-glob install-gdb
@@ -1351,6 +1357,63 @@ install-ispell: install-rcs install-gdbm force
 		true ; \
 	fi
 
+### flex
+.PHONY: all-flex just-flex
+all-flex: just-flex
+just-flex: force
+	if [ -d $(unsubdir)/flex ] ; then \
+		(cd $(unsubdir)/flex$(subdir); \
+		$(MAKE) \
+			"against=$(against)" \
+			"AR=$(AR)" \
+			"AR_FLAGS=$(AR_FLAGS)" \
+			"CC=$(CC)" \
+			"RANLIB=$(RANLIB)" \
+			"LOADLIBES=$(LOADLIBES)" \
+			"LDFLAGS=$(LDFLAGS)" \
+			"BISON=$(BISON)" \
+			"MAKEINFO=$(MAKEINFO)" \
+			all) ; \
+	else \
+		true ; \
+	fi
+
+clean-flex: force
+	if [ -d $(unsubdir)/flex ] ; then \
+		(cd $(unsubdir)/flex$(subdir); \
+		$(MAKE) \
+			"against=$(against)" \
+			"AR=$(AR)" \
+			"AR_FLAGS=$(AR_FLAGS)" \
+			"CC=$(CC)" \
+			"RANLIB=$(RANLIB)" \
+			"LOADLIBES=$(LOADLIBES)" \
+			"LDFLAGS=$(LDFLAGS)" \
+			"BISON=$(BISON)" \
+			"MAKEINFO=$(MAKEINFO)" \
+			clean) ; \
+	else \
+		true ; \
+	fi
+
+install-flex: force
+	if [ -d $(unsubdir)/flex ] ; then \
+		(cd $(unsubdir)/flex$(subdir); \
+		$(MAKE) \
+			"against=$(against)" \
+			"AR=$(AR)" \
+			"AR_FLAGS=$(AR_FLAGS)" \
+			"CC=$(CC)" \
+			"RANLIB=$(RANLIB)" \
+			"LOADLIBES=$(LOADLIBES)" \
+			"LDFLAGS=$(LDFLAGS)" \
+			"BISON=$(BISON)" \
+			"MAKEINFO=$(MAKEINFO)" \
+			install) ; \
+	else \
+		true ; \
+	fi
+
 ### other supporting targets
 # this is a bad hack.
 all.xclib:	all.normal
diff --git a/configure.in b/configure.in
index 60928b123a..f72c957fe4 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@
 # script appropriate for this directory.  For more information, check
 # any existing configure script.
 
-configdirs="libiberty texinfo bfd binutils byacc bison gcc readline glob ld gas gnulib clib gdb emacs ispell make grep diff rcs gdbm cvs prms"
+configdirs="libiberty texinfo bfd binutils byacc bison gcc readline glob flex ld gas gnulib clib gdb emacs ispell make grep diff rcs gdbm cvs prms"
 srctrigger=README
 srcname="gnu development package"