* 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.

diff --git a/ChangeLog b/ChangeLog
index 022c282c85e1714acfc55c3ab3ec4d28acd1d9be..46044a5fa588e4ca78cef5b213b5e230ea9838d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-11-19  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * 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  <adl@gnu.org>
 
        * configure.ac, NEWS: Bump version to 1.7e.

diff --git a/Makefile.in b/Makefile.in
index ed37cdc6c271c8094c4623192964773f72c3b8b0..1273068c3a4436192aa8fe9319be465c467a9931 100644 (file)
--- 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 43ed6b6c0a581515e82afab01639867fbb405b82..0d19f79ebcfcb9149001b3bc21bd66731dbfddba 100644 (file)
--- 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 f87bfb2fe524c1b41c6d467004ed6fa9562f8a74..219dd9d9b6626f5ab4e8474021db7f6c2fd8f920 100644 (file)
--- 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 2e2597ff14e2a0aa26107a84d917ef1bed960dc3..282c6b7daf41a8cf3884d5be78b9b6d7c34b8d5e 100644 (file)
--- 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 c17568d3b1ff6592c4377b0f264a86934a988305..f9ac9637b4c5dd076d86f0a48c118d0eb5f33b83 100644 (file)
--- 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 ebfcda5c90aec321dd3318946f91961d427b1bda..ac1b88727f09d08922b4bdc0f030075c3c4f719e 100644 (file)
--- 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 20f4eefa8c744a0f8dfb120755976cbd9a3da1fa..ede227ba0fc1ffeb6421894281b6faa43a9cefcc 100644 (file)
--- 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 4d5eb31c6a22752d0514af95ce905b84e083eea3..e4846f4069994a15f3737e9dd55cdd10a1968bc4 100644 (file)
--- 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 8625e336a76b4b13c5aaaa197c876a4c202d3a75..cc46859bae1fba990f74c97633f82f9247f2504e 100644 (file)
--- 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 74b7f50041e18865a30db9155c6a15f0947dff7f..8f6a273d1e2475634c9054746fa6a5f5922b6b81 100644 (file)
--- 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 (executable)
index 0000000..1769936
--- /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