* automake.in (&file_contents): Map MAINTAINER-MODE to

@MAINTAINER_MODE_TRUE@ or nothing.
* configure.am, remake-hdr.am, remake.am, texi-vers.am: Adjust.
Suggested by Tom.

diff --git a/ChangeLog b/ChangeLog
index 94db73fd3d1dd277f929157ad57cabf9c718d16b..2b6a0d49b2aef67fd1da0f9e369fbb171a652baa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-05  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&file_contents): Map MAINTAINER-MODE to
+       @MAINTAINER_MODE_TRUE@ or nothing.
+       * configure.am, remake-hdr.am, remake.am, texi-vers.am: Adjust.
+       Suggested by Tom.
+
 2001-03-05  Akim Demaille  <akim@epita.fr>
 
        * automake.in (&do_one_merge_target): Remove, was only called from...
@@ -32,7 +39,6 @@
        * texinfos.am: Build info, dvi, and the corresponding -am or
        -recursive targets.
 
-       
 2001-03-05  Akim Demaille  <akim@epita.fr>
 
        * automake.in (&am_install_var): Remove $cygxform, unused.
@@ -43,13 +49,11 @@
        (&am_install_var): Remove $ltxform.
        * ltlib.am, progs.am: Adjust.
 
-       
 2001-03-05  Akim Demaille  <akim@epita.fr>
 
        * automake.in: Require AC_PROG_INSTALL in...
        (&scan_autoconf_files): here.
 
-       
 2001-03-05  Akim Demaille  <akim@epita.fr>
 
        * configure.am: New file.
@@ -60,7 +64,6 @@
        * remake-hdr.am, remake.am, texi-vers.am: Adjust to
        MAINTAINER-MODE and CONFIGURE-AC.
 
-       
 2001-03-05  Akim Demaille  <akim@epita.fr>
 
        * automake.in (&pretty_print_internal): Don't output useless
@@ -70,10 +73,9 @@
 
 2001-03-05  Akim Demaille  <akim@epita.fr>
 
-       * automake.in (&generate_makefile): Call &initialize_per_input
+       * automake.in (&generate_makefile): Invoke &initialize_per_input
        *before* setting $am_file_name and $in_file_name.
 
-       
 2001-03-05  Akim Demaille  <akim@epita.fr>
 
        * automake.in ($in_file_name, $am_file_name, $relative_dirs):
@@ -119,7 +121,6 @@
        initialization of the constants to the top, from...
        (&initialize_global_constants): here.
 
-
 2001-03-05  Akim Demaille  <akim@epita.fr>
 
        * automake.in (&handle_single_transform_list, &add_depend2): Let
@@ -296,7 +297,6 @@
        Use it.
        (&usage): Display your full name.
 
-
 2001-02-26  Akim Demaille  <akim@epita.fr>
 
        * automake.texi (Invoking Automake): Remove dead options.

diff --git a/automake.in b/automake.in
index e461f36579e12d0ca0692ca4e4d42920cdd1df8e..2cd2d0c2062c4784e3b1d9463702c69fb0aa410c 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -6749,7 +6749,8 @@ sub file_contents
       # prevents us from matching the end of line.
       "s/##([^#\n].*)?\\n//gmo;"
        . &transform ('CYGNUS'          => $cygnus_mode,
-                     'MAINTAINER-MODE' => $seen_maint_mode,
+                     'MAINTAINER-MODE'
+                     => $seen_maint_mode ? '@MAINTAINER_MODE_TRUE@' : '',
 
                      'SHAR'        => $options{'dist-shar'},
                      'BZIP2'       => $options{'dist-bzip2'},

diff --git a/configure.am b/configure.am
index 571817d93256118b5dbd4bc9c81febab4e536cf0..fd83b4aaca855278c0e5b5aa18bcee022cf63e51 100644 (file)
--- a/configure.am
+++ b/configure.am
@@ -18,14 +18,12 @@
 ## 02111-1307, USA.
 
 ## This rule remakes the Makefile.in.
-?MAINTAINER-MODE?%MAKEFILE-IN%: @MAINTAINER_MODE_TRUE@ %MAKEFILE-AM% %MAKEFILE-IN-DEPS% $(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4)
-?!MAINTAINER-MODE?%MAKEFILE-IN%: %MAKEFILE-AM% %MAKEFILE-IN-DEPS% $(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4)
+%MAKEFILE-IN%: %MAINTAINER-MODE% %MAKEFILE-AM% %MAKEFILE-IN-DEPS% $(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4)
        cd $(top_srcdir) && \
          $(AUTOMAKE) --%STRICTNESS% %USE-DEPS% %MAKEFILE-AM-SOURCES%
 
 ## This rule remakes the Makefile.
-?MAINTAINER-MODE?%MAKEFILE%: @MAINTAINER_MODE_TRUE@ %MAKEFILE-IN% %MAKEFILE-DEPS% $(top_builddir)/config.status
-?!MAINTAINER-MODE?%MAKEFILE%: %MAKEFILE-IN% %MAKEFILE-DEPS% $(top_builddir)/config.status
+%MAKEFILE%: %MAINTAINER-MODE% %MAKEFILE-IN% %MAKEFILE-DEPS% $(top_builddir)/config.status
        cd $(top_builddir) && \
          CONFIG_HEADERS= CONFIG_LINKS= \
          CONFIG_FILES=%CONFIG-MAKEFILE% $(SHELL) ./config.status

diff --git a/lib/am/configure.am b/lib/am/configure.am
index 571817d93256118b5dbd4bc9c81febab4e536cf0..fd83b4aaca855278c0e5b5aa18bcee022cf63e51 100644 (file)
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -18,14 +18,12 @@
 ## 02111-1307, USA.
 
 ## This rule remakes the Makefile.in.
-?MAINTAINER-MODE?%MAKEFILE-IN%: @MAINTAINER_MODE_TRUE@ %MAKEFILE-AM% %MAKEFILE-IN-DEPS% $(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4)
-?!MAINTAINER-MODE?%MAKEFILE-IN%: %MAKEFILE-AM% %MAKEFILE-IN-DEPS% $(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4)
+%MAKEFILE-IN%: %MAINTAINER-MODE% %MAKEFILE-AM% %MAKEFILE-IN-DEPS% $(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4)
        cd $(top_srcdir) && \
          $(AUTOMAKE) --%STRICTNESS% %USE-DEPS% %MAKEFILE-AM-SOURCES%
 
 ## This rule remakes the Makefile.
-?MAINTAINER-MODE?%MAKEFILE%: @MAINTAINER_MODE_TRUE@ %MAKEFILE-IN% %MAKEFILE-DEPS% $(top_builddir)/config.status
-?!MAINTAINER-MODE?%MAKEFILE%: %MAKEFILE-IN% %MAKEFILE-DEPS% $(top_builddir)/config.status
+%MAKEFILE%: %MAINTAINER-MODE% %MAKEFILE-IN% %MAKEFILE-DEPS% $(top_builddir)/config.status
        cd $(top_builddir) && \
          CONFIG_HEADERS= CONFIG_LINKS= \
          CONFIG_FILES=%CONFIG-MAKEFILE% $(SHELL) ./config.status

diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index 045446e4f134dc0c9a76c6d73d04f38b82227bac..c6d5c33046bba0e61f0c951d7b71b81c86d26eea 100644 (file)
--- a/lib/am/remake-hdr.am
+++ b/lib/am/remake-hdr.am
@@ -37,8 +37,7 @@
        @mv %STAMP%T %STAMP%
 ## Explicitly look in srcdir for benefit of non-GNU makes.
 ## SRC_STAMP takes into account a possible subdir where CONFIG_HEADER_IN is
-?MAINTAINER-MODE?$(srcdir)/%CONFIG_HEADER_IN%: @MAINTAINER_MODE_TRUE@$(srcdir)/%SRC_STAMP%.in
-?!MAINTAINER-MODE?$(srcdir)/%CONFIG_HEADER_IN%: $(srcdir)/%SRC_STAMP%.in
+$(srcdir)/%CONFIG_HEADER_IN%: %MAINTAINER-MODE% $(srcdir)/%SRC_STAMP%.in
 ## Recover from removal of CONFIG_HEADER_IN
        @if test ! -f $@; then \
                rm -f $(srcdir)/%SRC_STAMP%.in; \

diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am
index fb0414c70a9281ce7f56a143ab950468217b1c48..2576096c89ac9d8871442a4c19b4cc13deccb2dd 100644 (file)
--- a/lib/am/texi-vers.am
+++ b/lib/am/texi-vers.am
@@ -16,8 +16,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
-?MAINTAINER-MODE?$(srcdir)/%VTEXI%: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-%VTI%
-?!MAINTAINER-MODE?$(srcdir)/%VTEXI%: $(srcdir)/stamp-%VTI%
+$(srcdir)/%VTEXI%: %MAINTAINER-MODE% $(srcdir)/stamp-%VTI%
        @:
 
 ## Depend on %CONFIGURE-AC% so that version number updates cause a
@@ -43,7 +42,6 @@ mostlyclean-%VTI%:
 
 maintainer-clean-am: maintainer-clean-%VTI%
 maintainer-clean-%VTI%:
-?MAINTAINER-MODE?@MAINTAINER_MODE_TRUE@        -rm -f $(srcdir)/stamp-%VTI% $(srcdir)/%VTEXI%
-?!MAINTAINER-MODE?     -rm -f $(srcdir)/stamp-%VTI% $(srcdir)/%VTEXI%
+%MAINTAINER-MODE%      -rm -f $(srcdir)/stamp-%VTI% $(srcdir)/%VTEXI%
 
 .PHONY: mostlyclean-%VTI% maintainer-clean-%VTI%

diff --git a/remake-hdr.am b/remake-hdr.am
index 045446e4f134dc0c9a76c6d73d04f38b82227bac..c6d5c33046bba0e61f0c951d7b71b81c86d26eea 100644 (file)
--- a/remake-hdr.am
+++ b/remake-hdr.am
@@ -37,8 +37,7 @@
        @mv %STAMP%T %STAMP%
 ## Explicitly look in srcdir for benefit of non-GNU makes.
 ## SRC_STAMP takes into account a possible subdir where CONFIG_HEADER_IN is
-?MAINTAINER-MODE?$(srcdir)/%CONFIG_HEADER_IN%: @MAINTAINER_MODE_TRUE@$(srcdir)/%SRC_STAMP%.in
-?!MAINTAINER-MODE?$(srcdir)/%CONFIG_HEADER_IN%: $(srcdir)/%SRC_STAMP%.in
+$(srcdir)/%CONFIG_HEADER_IN%: %MAINTAINER-MODE% $(srcdir)/%SRC_STAMP%.in
 ## Recover from removal of CONFIG_HEADER_IN
        @if test ! -f $@; then \
                rm -f $(srcdir)/%SRC_STAMP%.in; \

diff --git a/remake.am b/remake.am
index 2293eaff8f13ec014a570349b0974dda146aa8fa..30a9680c248a7eb08907b23b50c5a9f60024c6a0 100644 (file)
--- a/remake.am
+++ b/remake.am
@@ -20,6 +20,5 @@
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        $(SHELL) ./config.status --recheck
 ## Explicitly look in srcdir for benefit of non-GNU makes.
-?MAINTAINER-MODE?$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-?!MAINTAINER-MODE?$(srcdir)/configure: $(srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure: %MAINTAINER-MODE% $(srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)

diff --git a/texi-vers.am b/texi-vers.am
index fb0414c70a9281ce7f56a143ab950468217b1c48..2576096c89ac9d8871442a4c19b4cc13deccb2dd 100644 (file)
--- a/texi-vers.am
+++ b/texi-vers.am
@@ -16,8 +16,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
-?MAINTAINER-MODE?$(srcdir)/%VTEXI%: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-%VTI%
-?!MAINTAINER-MODE?$(srcdir)/%VTEXI%: $(srcdir)/stamp-%VTI%
+$(srcdir)/%VTEXI%: %MAINTAINER-MODE% $(srcdir)/stamp-%VTI%
        @:
 
 ## Depend on %CONFIGURE-AC% so that version number updates cause a
@@ -43,7 +42,6 @@ mostlyclean-%VTI%:
 
 maintainer-clean-am: maintainer-clean-%VTI%
 maintainer-clean-%VTI%:
-?MAINTAINER-MODE?@MAINTAINER_MODE_TRUE@        -rm -f $(srcdir)/stamp-%VTI% $(srcdir)/%VTEXI%
-?!MAINTAINER-MODE?     -rm -f $(srcdir)/stamp-%VTI% $(srcdir)/%VTEXI%
+%MAINTAINER-MODE%      -rm -f $(srcdir)/stamp-%VTI% $(srcdir)/%VTEXI%
 
 .PHONY: mostlyclean-%VTI% maintainer-clean-%VTI%