* Makefile.in: Better lex support.

	* Makefile.in (dist):  Generate flex and bison outputs
	for distribution.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 74ef97d..6cc398e 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,18 @@
+Fri May 22 13:40:37 1992  Per Bothner  (bothner@cygnus.com)
+
+       * arlex.l:  Make work with lex, for what it's worth.
+       * Makefile.in:  Better lex support.
+       * Makefile.in (dist):  Generate flex and bison outputs
+       for distribution.
+
+Thu May 14 17:17:59 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+       * Makefile.in: get BISON definition right.
+
+Fri May  8 07:47:08 1992  K. Richard Pixley  (rich@cygnus.com)
+
+       * sanity.sh: default TMPDIR to ".".
+
 Thu May  7 12:34:50 1992  Roland H. Pesch  (pesch@fowanton.cygnus.com)
 
        * binutils.texi: add doc for ar command language.

diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 8ec1d35..df3d5cd 100644 (file)
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -53,13 +53,16 @@ INSTALL_DATA = $(INSTALL)
 AR = ar
 AR_FLAGS = qv
 CFLAGS = -g
-BISON = bison -y
-FLEX = flex
 MAKEINFO = makeinfo
 RANLIB = ranlib
 BISONFLAGS = -tvd
 TEXI2ROFF=texi2roff
 
+BISON = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/ ; else echo bison -y ; fi`
+# Comment these out if using lex.
+LEX_OPTIONS = -I -Cem 
+LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex -S../flex/flex.skel ; else echo flex ; fi`
+
 # Distribution version
 VERSION=1.97
 # Distribution name
@@ -166,7 +169,7 @@ arparse.c:arparse.y
 
 
 arlex.c:arlex.l
-       $(FLEX) -I -Cem -t $(VPATH)/arlex.l >arlex.c
+       $(LEX) $(LEX_OPTIONS) -t $(VPATH)/arlex.l >arlex.c
 
 $(AR_PROG): $(ADDL_LIBS) ar.o arparse.o arlex.o not-ranlib.o $(BFD) arsup.o
        $(CC) $(LDFLAGS) $(CFLAGS) -o $(AR_PROG) ar.o arparse.o arlex.o arsup.o not-ranlib.o $(ADDL_LIBS) $(LOADLIBES)
@@ -327,8 +330,8 @@ dist: $(DIST_NAME).tar.Z
 
 $(DIST_NAME).tar.Z:
        cd ../..; rm -f $(DIST_NAME); ln -s devo $(DIST_NAME)
-       make binutils.mm -f Makefile.in
-       cd ../ld; make ld.mm -f Makefile.in
+       make arparse.c arlex.c binutils.mm -f Makefile.in
+       cd ../ld; make ldgram.c ldgram.h ldlex.c ld.mm -f Makefile.in
        cd ../..; tar chf - $(DIST_NAME) | compress >$(DIST_NAME).tar.Z
        rm -rf ../../$(DIST_NAME)