From a15af8e2a701878628fc17f5abfdd088aeec4fa3 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Mon, 24 Aug 2009 05:55:55 +0000 Subject: [PATCH] Fix yacc and lex reruns with maintainer-mode off. gas/: * Makefile.am (am__skiplex, am__skipyacc): New. * Makefile.in: Regenerate. ld/: * Makefile.am (am__skiplex, am__skipyacc): New. * Makefile.in: Regenerate. binutils/: * Makefile.am (am__skiplex, am__skipyacc): New. * Makefile.in: Regenerate. gold/: * Makefile.am (am__skiplex, am__skipyacc): New. * Makefile.in: Regenerate. --- binutils/ChangeLog | 5 +++++ binutils/Makefile.am | 5 +++++ binutils/Makefile.in | 5 +++++ gas/ChangeLog | 5 +++++ gas/Makefile.am | 5 +++++ gas/Makefile.in | 5 +++++ gold/ChangeLog | 5 +++++ gold/Makefile.am | 5 +++++ gold/Makefile.in | 5 +++++ ld/ChangeLog | 5 +++++ ld/Makefile.am | 5 +++++ ld/Makefile.in | 5 +++++ 12 files changed, 60 insertions(+) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 218bb9a..7183818 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2009-08-24 Ralf Wildenhues + + * Makefile.am (am__skiplex, am__skipyacc): New. + * Makefile.in: Regenerate. + 2009-08-23 Ralf Wildenhues * Makefile.am (syslex.o): Depend on sysinfo.h config.h. diff --git a/binutils/Makefile.am b/binutils/Makefile.am index 98eefcd..d0a367c 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -17,6 +17,11 @@ YACC = `if [ -f ../bison/bison ]; then echo ../bison/bison -y -L$(srcdir)/../bis YFLAGS = -d LEX = `if [ -f ../flex/flex ]; then echo ../flex/flex; else echo @LEX@; fi` +# Automake 1.10+ disables lex and yacc output file regeneration if +# maintainer mode is disabled. Avoid this. +am__skiplex = +am__skipyacc = + WARN_CFLAGS = @WARN_CFLAGS@ NO_WERROR = @NO_WERROR@ AM_CFLAGS = $(WARN_CFLAGS) diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 833e726..5d3b28c 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -374,6 +374,11 @@ AUTOMAKE_OPTIONS = dejagnu no-dist foreign ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd SUBDIRS = doc po tooldir = $(exec_prefix)/$(target_alias) + +# Automake 1.10+ disables lex and yacc output file regeneration if +# maintainer mode is disabled. Avoid this. +am__skiplex = +am__skipyacc = AM_CFLAGS = $(WARN_CFLAGS) # these two are almost the same program diff --git a/gas/ChangeLog b/gas/ChangeLog index d4fdd63..e84da3b 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2009-08-24 Ralf Wildenhues + + * Makefile.am (am__skiplex, am__skipyacc): New. + * Makefile.in: Regenerate. + 2009-08-22 Ralf Wildenhues * Makefile.am (YFLAGS): Remove, not needed any more. diff --git a/gas/Makefile.am b/gas/Makefile.am index a3adf0b..27a7d1a 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -10,6 +10,11 @@ tooldir = $(exec_prefix)/$(target_alias) 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` +# Automake 1.10+ disables lex and yacc output file regeneration if +# maintainer mode is disabled. Avoid this. +am__skiplex = +am__skipyacc = + WARN_CFLAGS = @WARN_CFLAGS@ NO_WERROR = @NO_WERROR@ AM_CFLAGS = $(WARN_CFLAGS) diff --git a/gas/Makefile.in b/gas/Makefile.in index f385064..9f6f02e 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -280,6 +280,11 @@ AUTOMAKE_OPTIONS = 1.11 dejagnu foreign no-dist ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd SUBDIRS = doc po tooldir = $(exec_prefix)/$(target_alias) + +# Automake 1.10+ disables lex and yacc output file regeneration if +# maintainer mode is disabled. Avoid this. +am__skiplex = +am__skipyacc = AM_CFLAGS = $(WARN_CFLAGS) TARG_CPU = @target_cpu_type@ TARG_CPU_C = $(srcdir)/config/tc-@target_cpu_type@.c diff --git a/gold/ChangeLog b/gold/ChangeLog index 291c5d6..162e73f 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2009-08-24 Ralf Wildenhues + + * Makefile.am (am__skiplex, am__skipyacc): New. + * Makefile.in: Regenerate. + 2009-08-22 Ralf Wildenhues * Makefile.am (AM_CPPFLAGS): Renamed from ... diff --git a/gold/Makefile.am b/gold/Makefile.am index 876cc9b..8d8b617 100644 --- a/gold/Makefile.am +++ b/gold/Makefile.am @@ -29,6 +29,11 @@ endif AM_YFLAGS = -d +# Automake 1.10+ disables lex and yacc output file regeneration if +# maintainer mode is disabled. Avoid this. +am__skiplex = +am__skipyacc = + noinst_PROGRAMS = ld-new noinst_LIBRARIES = libgold.a diff --git a/gold/Makefile.in b/gold/Makefile.in index a240795..d4c689b 100644 --- a/gold/Makefile.in +++ b/gold/Makefile.in @@ -342,6 +342,11 @@ LIBIBERTY = ../libiberty/libiberty.a @PLUGINS_TRUE@LIBDL = -ldl @THREADS_TRUE@THREADSLIB = -lpthread AM_YFLAGS = -d + +# Automake 1.10+ disables lex and yacc output file regeneration if +# maintainer mode is disabled. Avoid this. +am__skiplex = +am__skipyacc = noinst_LIBRARIES = libgold.a CCFILES = \ archive.cc \ diff --git a/ld/ChangeLog b/ld/ChangeLog index 6b11a80..f83f113 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2009-08-24 Ralf Wildenhues + + * Makefile.am (am__skiplex, am__skipyacc): New. + * Makefile.in: Regenerate. + 2009-08-22 Ralf Wildenhues * Makefile.am (bin_PROGRAMS): Renamed from ... diff --git a/ld/Makefile.am b/ld/Makefile.am index a268898..bc4915c 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -12,6 +12,11 @@ YACC = `if [ -f ../bison/bison ]; then echo ../bison/bison -y -L$(srcdir)/../bis YFLAGS = -d LEX = `if [ -f ../flex/flex ]; then echo ../flex/flex; else echo @LEX@; fi` +# Automake 1.10+ disables lex and yacc output file regeneration if +# maintainer mode is disabled. Avoid this. +am__skiplex = +am__skipyacc = + WARN_CFLAGS = @WARN_CFLAGS@ NO_WERROR = @NO_WERROR@ AM_CFLAGS = $(WARN_CFLAGS) diff --git a/ld/Makefile.in b/ld/Makefile.in index 80105a2..f36e34c 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -323,6 +323,11 @@ ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex SUBDIRS = po tooldir = $(exec_prefix)/$(target_alias) + +# Automake 1.10+ disables lex and yacc output file regeneration if +# maintainer mode is disabled. Avoid this. +am__skiplex = +am__skipyacc = AM_CFLAGS = $(WARN_CFLAGS) # We put the scripts in the directory $(scriptdir)/ldscripts. -- 2.7.4