diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | doc/automake.texi | 4 | ||||
| -rw-r--r-- | doc/stamp-vti | 2 | ||||
| -rw-r--r-- | doc/version.texi | 2 | ||||
| -rw-r--r-- | lib/am/lex.am | 8 | ||||
| -rw-r--r-- | lib/am/yacc.am | 8 | ||||
| -rwxr-xr-x | tests/mmode-lexyacc.test | 67 |
8 files changed, 2 insertions, 100 deletions
@@ -1,11 +1,3 @@ -2004-07-26 Derek R. Price <derek@ximbiot.com> - - * lib/am/yacc.am, lib/am/lex.am: Only compile these targets in - maintainer mode. - * doc/automake.texi (Yacc and Lex): Note dependence on maintainer mode. - * NEWS: Note same dependency. - * tests/mmode-lexyacc.test: New file. - 2004-07-25 Alexandre Duret-Lutz <adl@gnu.org> * m4/mkdirp.m4 (AM_PROG_MKDIR_P): Remove `.' from the mkdir_p @@ -93,9 +93,6 @@ New in 1.8e: - The manual tells more about SUBDIRS vs. DIST_SUBDIRS. It also gives an example of nested packages using AC_CONFIG_SUBDIRS. - - - Yacc and Lex intermediate files are now only built when in maintainer mode - once AM_MAINTAINER_MODE has been invoked. Bugs fixed in 1.8.5: diff --git a/doc/automake.texi b/doc/automake.texi index 2b3692869..a01c6821b 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -3765,10 +3765,6 @@ When @code{lex} is invoked, it is passed @samp{LFLAGS} and @samp{AM_LFLAGS}. The former is a user variable and the latter is intended for the @file{Makefile.am} author. -Automake only rebuilds intermediate files for Yacc and Lex sources in -maintainer mode once AM_MAINTAINER_MODE has been invoked -(@pxref{maintainer-mode}). - @cindex ylwrap diff --git a/doc/stamp-vti b/doc/stamp-vti index 1868b47c6..cbd3d3131 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 22 July 2004 +@set UPDATED 25 July 2004 @set UPDATED-MONTH July 2004 @set EDITION 1.8e @set VERSION 1.8e diff --git a/doc/version.texi b/doc/version.texi index 1868b47c6..cbd3d3131 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 22 July 2004 +@set UPDATED 25 July 2004 @set UPDATED-MONTH July 2004 @set EDITION 1.8e @set VERSION 1.8e diff --git a/lib/am/lex.am b/lib/am/lex.am index c84b2c0a6..9ce16f9d0 100644 --- a/lib/am/lex.am +++ b/lib/am/lex.am @@ -18,7 +18,6 @@ ?GENERIC?%EXT%%DERIVED-EXT%: ?!GENERIC?%OBJ%: %SOURCE% -?MAINTAINER-MODE?if MAINTAINER_MODE if %?MORE-THAN-ONE% ?GENERIC? $(SHELL) $(YLWRAP) %SOURCE% $(LEX_OUTPUT_ROOT).c %OBJ% -- %COMPILE% ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%. @@ -31,10 +30,3 @@ else !%?MORE-THAN-ONE% sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|%OBJ%|' $(LEX_OUTPUT_ROOT).c >%OBJ% rm -f $(LEX_OUTPUT_ROOT).c endif !%?MORE-THAN-ONE% -?MAINTAINER-MODE?else !MAINTAINER_MODE -?MAINTAINER-MODE? @# Skip this target when not in maintainer mode (see the help on the -?MAINTAINER-MODE? @# `--enable-maintainer-mode' option to the `configure' script). -?MAINTAINER-MODE? @# Otherwise, the implicit build rules for .l.c built into make could -?MAINTAINER-MODE? @# be executed for this target. -?MAINTAINER-MODE? @: -?MAINTAINER-MODE?endif !MAINTAINER_MODE diff --git a/lib/am/yacc.am b/lib/am/yacc.am index 585a039e8..cc799c49a 100644 --- a/lib/am/yacc.am +++ b/lib/am/yacc.am @@ -18,7 +18,6 @@ ?GENERIC?%EXT%%DERIVED-EXT%: ?!GENERIC?%OBJ%: %SOURCE% -?MAINTAINER-MODE?if MAINTAINER_MODE if %?MORE-THAN-ONE% ?GENERIC? $(SHELL) $(YLWRAP) %SOURCE% y.tab.c %OBJ% y.tab.h %BASE%.h y.output %BASE%.output -- %COMPILE% ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%. @@ -49,10 +48,3 @@ else !%?MORE-THAN-ONE% sed '/^#/ s|y\.tab\.c|%OBJ%|' y.tab.c >%OBJ%t && mv %OBJ%t %OBJ% rm -f y.tab.c endif !%?MORE-THAN-ONE% -?MAINTAINER-MODE?else !MAINTAINER_MODE -?MAINTAINER-MODE? @# Skip this target when not in maintainer mode (see the help on the -?MAINTAINER-MODE? @# `--enable-maintainer-mode' option to the `configure' script). -?MAINTAINER-MODE? @# Otherwise, the implicit build rules for .y.c built into make could -?MAINTAINER-MODE? @# be executed for this target. -?MAINTAINER-MODE? @: -?MAINTAINER-MODE?endif !MAINTAINER_MODE diff --git a/tests/mmode-lexyacc.test b/tests/mmode-lexyacc.test deleted file mode 100755 index f6924288e..000000000 --- a/tests/mmode-lexyacc.test +++ /dev/null @@ -1,67 +0,0 @@ -#! /bin/sh -# Copyright (C) 1996, 2001, 2002 Free Software Foundation, Inc. -# -# This file is part of GNU Automake. -# -# GNU Automake is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# GNU Automake is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Automake; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - -# Contributed by Derek R. Price <derek@ximbiot.com> - -# Test to verify that intermediate files are only built from Yacc and Lex -# sources in maintainer mode. - -. ./defs || exit 1 - -cat >> configure.in << 'END' -AM_MAINTAINER_MODE -AC_PROG_CC -AM_PROG_LEX -AC_PROG_YACC -AC_OUTPUT -END - -cat > Makefile.am <<'END' -bin_PROGRAMS = zardoz -zardoz_SOURCES = zardoz.y joe.l -LDADD = @LEXLIB@ -END - -# The point of this test is that it is not dependant on a working lex or yacc. -cat > joe.c <<EOF -int joe (int arg) -{ - return arg * 2; -} -EOF -cat > zardoz.c <<EOF -int joe (int arg); -int main (int argc, char **argv) -{ - exit (joe (argc)); -} -EOF - -# Ensure a later timestamp for our Lex & Yacc sources. -sleep 1 -: > joe.l -: > zardoz.y - -$ACLOCAL || exit 1 -$AUTOCONF || exit 1 -$AUTOMAKE || exit 1 - -./configure -$MAKE YACC=false LEX=false |