Get LEX,FLEX from configure.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 9bc15bb109f1ea7d68773b062786adfa8cda85f5..175b90e2f92f3463a80507b1b29c24970c1c21a1 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,7 +1,12 @@
+2000-04-19  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+       * Makefile.am (FLEX, LEX): Get them from configure.
+       * Makefile.in: Regenerate.
+
 2000-04-18  H.J. Lu  (hjl@gnu.org)
 
        * config/tc-i386.c (offset_in_range): Use addressT instead of
-       bfd_vma for none bfd assemblers.
+       bfd_vma for non-bfd assemblers.
 
 2000-04-17  Alan Modra  <alan@linuxcare.com.au>
 

diff --git a/gas/Makefile.am b/gas/Makefile.am
index b0a65ba4303b2c0a976f277bf5b9ec6f1a2292d1..469ae53243a03b40bf9d70a38022b3108b46d014 100644 (file)
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -9,8 +9,8 @@ SUBDIRS = doc po
 
 tooldir = $(exec_prefix)/$(target_alias)
 
-YACC = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/bison ; else echo bison -y ; fi`
-LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex ;  else echo flex ; fi`
+YACC = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/bison ; else echo @YACC@ ; fi`
+LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex ; else echo @LEX@ ; fi`
 
 WARN_CFLAGS = @WARN_CFLAGS@
 AM_CFLAGS = $(WARN_CFLAGS)

diff --git a/gas/Makefile.in b/gas/Makefile.in
index f4ad64330a050337c0f5c4710fc340ab39e9a979..da15e66a99356477ebc9231d58f4225f6449c55f 100644 (file)
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -113,8 +113,8 @@ SUBDIRS = doc po
 
 tooldir = $(exec_prefix)/$(target_alias)
 
-YACC = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/bison ; else echo bison -y ; fi`
-LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex ;  else echo flex ; fi`
+YACC = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/bison ; else echo @YACC@ ; fi`
+LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex ; else echo @LEX@ ; fi`
 
 WARN_CFLAGS = @WARN_CFLAGS@
 AM_CFLAGS = $(WARN_CFLAGS)
@@ -145,6 +145,7 @@ CPU_TYPES = \
        alpha \
        arc \
        arm \
+       avr \
        d10v \
        d30v \
        fr30 \
@@ -309,6 +310,7 @@ TARGET_CPU_CFILES = \
        config/tc-alpha.c \
        config/tc-arc.c \
        config/tc-arm.c \
+       config/tc-avr.c \
        config/tc-d10v.c \
        config/tc-d30v.c \
        config/tc-fr30.c \
@@ -345,6 +347,7 @@ TARGET_CPU_HFILES = \
        config/tc-alpha.h \
        config/tc-arc.h \
        config/tc-arm.h \
+       config/tc-avr.h \
        config/tc-d10v.h \
        config/tc-d30v.h \
        config/tc-fr30.h \