From 1a168cb7ecabbf3f1764583b8ea64658c7c354cc Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Wed, 19 Nov 2003 20:09:43 +0000 Subject: [PATCH] * lib/am/configure.am (%MAKEFILE%): Remove %MAINTAINER-MODE%, mistakenly added on 2001-03-05. * tests/remake5.test: New file. * tests/Makefile.am (TESTS): Add remake5.test. Report from Ralf Corsepius. --- ChangeLog | 8 ++++ Makefile.in | 2 +- doc/Makefile.in | 2 +- lib/Automake/Makefile.in | 2 +- lib/Automake/tests/Makefile.in | 2 +- lib/Makefile.in | 2 +- lib/am/Makefile.in | 2 +- lib/am/configure.am | 2 +- m4/Makefile.in | 2 +- tests/Makefile.am | 1 + tests/Makefile.in | 3 +- tests/remake5.test | 76 ++++++++++++++++++++++++++++++++++ 12 files changed, 95 insertions(+), 9 deletions(-) create mode 100755 tests/remake5.test diff --git a/ChangeLog b/ChangeLog index 022c282c..46044a5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-11-19 Alexandre Duret-Lutz + + * lib/am/configure.am (%MAKEFILE%): Remove %MAINTAINER-MODE%, + mistakenly added on 2001-03-05. + * tests/remake5.test: New file. + * tests/Makefile.am (TESTS): Add remake5.test. + Report from Ralf Corsepius. + 2003-11-18 Alexandre Duret-Lutz * configure.ac, NEWS: Bump version to 1.7e. diff --git a/Makefile.in b/Makefile.in index ed37cdc6..1273068c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -185,7 +185,7 @@ $(srcdir)/Makefile.in: Makefile.am $(am__configure_deps) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile .PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ echo ' $(SHELL) ./config.status'; \ diff --git a/doc/Makefile.in b/doc/Makefile.in index 43ed6b6c..0d19f79e 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -156,7 +156,7 @@ $(srcdir)/Makefile.in: Makefile.am $(am__configure_deps) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu doc/Makefile .PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index f87bfb2f..219dd9d9 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -179,7 +179,7 @@ $(srcdir)/Makefile.in: Makefile.am $(am__configure_deps) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu lib/Automake/Makefile .PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in index 2e2597ff..282c6b7d 100644 --- a/lib/Automake/tests/Makefile.in +++ b/lib/Automake/tests/Makefile.in @@ -138,7 +138,7 @@ $(srcdir)/Makefile.in: Makefile.am $(am__configure_deps) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu lib/Automake/tests/Makefile .PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ diff --git a/lib/Makefile.in b/lib/Makefile.in index c17568d3..f9ac9637 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -157,7 +157,7 @@ $(srcdir)/Makefile.in: Makefile.am $(am__configure_deps) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu lib/Makefile .PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index ebfcda5c..ac1b8872 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -143,7 +143,7 @@ $(srcdir)/Makefile.in: Makefile.am $(am__configure_deps) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu lib/am/Makefile .PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ diff --git a/lib/am/configure.am b/lib/am/configure.am index 20f4eefa..ede227ba 100644 --- a/lib/am/configure.am +++ b/lib/am/configure.am @@ -58,7 +58,7 @@ endif %?TOPDIR_P% ## ./config.status to recreate the lost Makefile. .PRECIOUS: %MAKEFILE% ## This rule remakes the Makefile. -%MAKEFILE%: %MAINTAINER-MODE% %MAKEFILE-DEPS% $(top_builddir)/config.status +%MAKEFILE%: %MAKEFILE-DEPS% $(top_builddir)/config.status ## If Makefile is to be updated because of config.status, then run ## config.status without argument in order to (i) rerun all the ## AC_CONFIG_COMMANDS including those that are not visible to diff --git a/m4/Makefile.in b/m4/Makefile.in index 4d5eb31c..e4846f40 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -169,7 +169,7 @@ $(srcdir)/Makefile.in: Makefile.am $(am__configure_deps) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu m4/Makefile .PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 8625e336..cc46859b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -390,6 +390,7 @@ remake.test \ remake2.test \ remake3.test \ remake4.test \ +remake5.test \ req.test \ reqd.test \ reqd2.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 74b7f500..8f6a273d 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -504,6 +504,7 @@ remake.test \ remake2.test \ remake3.test \ remake4.test \ +remake5.test \ req.test \ reqd.test \ reqd2.test \ @@ -648,7 +649,7 @@ $(srcdir)/Makefile.in: Makefile.am $(am__configure_deps) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu tests/Makefile .PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ diff --git a/tests/remake5.test b/tests/remake5.test new file mode 100755 index 00000000..1769936d --- /dev/null +++ b/tests/remake5.test @@ -0,0 +1,76 @@ +#! /bin/sh +# Copyright (C) 2003 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. + +# Check that AM_MAINTAINER_MODE disable some rebuild rules, +# but not all. +# Report from Ralf Corsepius. + +required=GNUmake +. ./defs || exit 1 + +set -e + +cat >>configure.in <<'EOF' +AM_MAINTAINER_MODE +m4_include(foo.m4) +if test ! -f rebuild_ok; then + ACLOCAL=false + AUTOMAKE=false + AUTOCONF=false +fi +AC_OUTPUT +EOF + +: > foo.m4 +: > Makefile.am + +$ACLOCAL +$AUTOCONF +$AUTOMAKE --add-missing +./configure +$MAKE + +# Make sure the rules to rebuild configure/Makefile.in are not +# triggered by default. ($MAKE will fail if they are, because the +# tools are set to false.) +$sleep +touch aclocal.m4 Makefile.am configure.in foo.m4 +$MAKE + +# Make sure the rebuild rule for Makefile is triggered. +$sleep +echo '# GrEpMe' >>Makefile.in +$MAKE +grep GrEpMe Makefile + +# Make sure the rebuild rule for config.status is triggered. +$sleep +grep 'AUTOCONF.*=.*false' Makefile +: > rebuild_ok +./configure --no-create +$MAKE +grep 'AUTOCONF.*=.*false' Makefile && exit 1 + +# Make sure rebuild rules do work if --enable-maintainer-mode is given. +./configure --enable-maintainer-mode +$sleep +echo 'AC_SUBST([YIPPY_YIPPY_YEAH])' >foo.m4 +$MAKE +grep YIPPY_YIPPY_YEAH Makefile -- 2.43.5