Minimize yacc and lex output

This minimizes the "make" output from the yacc and lex rules,
following the same technique as the rest of the Makefile.

The lex rule had a special case to deal with the situation where flex
is not available.  I don't think this is needed, so I removed it.  If
flex is truly unavailable, the person building gdb can simply "touch"
the output file.

gdb/ChangeLog
2018-07-09  Tom Tromey  <tom@tromey.com>

	* Makefile.in (%.c: %.y): Use ECHO_YACC.
	(%.c: %.l): Use ECHO_LEX.  Just fail if flex not available.
	* silent-rules.mk (ECHO_YACC, ECHO_LEX): New variables.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b8bc5cfa3b9f086ec22a7157fdda2a7f9b86939e..d0902c7434266795bc2d20a3c8a00be2aa44735d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2018-07-09  Tom Tromey  <tom@tromey.com>
+
+       * Makefile.in (%.c: %.y): Use ECHO_YACC.
+       (%.c: %.l): Use ECHO_LEX.  Just fail if flex not available.
+       * silent-rules.mk (ECHO_YACC, ECHO_LEX): New variables.
+
 2018-07-09  Tom Tromey  <tom@tromey.com>
 
        * Makefile.in (ALLDEPFILES): Remove exec.c.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 047d06b6121cf395ef1a2901dc4bb27af3e73b2e..36d2c44a2a13eae2bca44850d2f04da473260446 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2477,9 +2477,9 @@ po/$(PACKAGE).pot: force
 # Makefile.in, but that was a pretty big annoyance.
 
 %.c: %.y
-       $(SHELL) $(YLWRAP) $< y.tab.c $@.tmp -- $(YACC) $(YFLAGS) \
-               || (rm -f $@.tmp; false)
-       sed -e '/extern.*malloc/d' \
+       $(ECHO_YACC) $(SHELL) $(YLWRAP) $< y.tab.c $@.tmp -- \
+               $(YACC) $(YFLAGS) || (rm -f $@.tmp; false)
+       @sed -e '/extern.*malloc/d' \
             -e '/extern.*realloc/d' \
             -e '/extern.*free/d' \
             -e '/include.*malloc.h/d' \
@@ -2493,8 +2493,7 @@ po/$(PACKAGE).pot: force
          rm -f $@.tmp && \
          mv $@.new $@
 %.c: %.l
-       if [ "$(FLEX)" ] && $(FLEX) --version >/dev/null 2>&1; then \
-           $(FLEX) -t $<  \
+       $(ECHO_LEX) $(FLEX) -t $<  \
            | sed -e '/extern.*malloc/d' \
                -e '/extern.*realloc/d' \
                -e '/extern.*free/d' \
@@ -2505,13 +2504,7 @@ po/$(PACKAGE).pot: force
                -e 's/\([ \t;,(]\)free$$/\1xfree/g' \
                -e 's/yy_flex_xrealloc/yyxrealloc/g' \
              > $@.new && \
-           mv $@.new $@; \
-       elif [ -f $@ ]; then \
-           echo "Warning: $*.c older than $*.l and flex not available."; \
-       else \
-           echo "$@ missing and flex not available."; \
-           false; \
-       fi
+           mv $@.new $@
 
 .PRECIOUS: ada-lex.c
 

diff --git a/gdb/silent-rules.mk b/gdb/silent-rules.mk
index ade77ad1c51a5b4dc1fe2b8023dbab9ac86937cc..7ed73a767c6876159bab3c503236077c0206db95 100644 (file)
--- a/gdb/silent-rules.mk
+++ b/gdb/silent-rules.mk
@@ -11,5 +11,7 @@ ECHO_GEN_XML_BUILTIN_GENERATED = \
               @echo "  GEN    xml-builtin-generated.c";
 ECHO_INIT_C =  echo "  GEN    init.c" ||
 ECHO_SIGN =   @echo "  SIGN   gdb";
+ECHO_YACC =   @echo "  YACC   $@";
+ECHO_LEX  =   @echo "  LEX    $@";
 SILENCE = @
 endif