From: Akim Demaille Date: Mon, 5 Mar 2001 14:52:12 +0000 (+0000) Subject: * automake.in (&file_contents): Map MAINTAINER-MODE to X-Git-Tag: handle-languages~176 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=27d3ec9fb4bb6ee9baa0d9bd452a72c0b0aa51d7;p=automake.git * 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 94db73fd..2b6a0d49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-03-05 Akim Demaille + + * 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 * 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 * 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 * automake.in: Require AC_PROG_INSTALL in... (&scan_autoconf_files): here. - 2001-03-05 Akim Demaille * 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 * automake.in (&pretty_print_internal): Don't output useless @@ -70,10 +73,9 @@ 2001-03-05 Akim Demaille - * 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 * 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 * 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 * automake.texi (Invoking Automake): Remove dead options. diff --git a/automake.in b/automake.in index e461f365..2cd2d0c2 100755 --- 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 571817d9..fd83b4aa 100644 --- 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 571817d9..fd83b4aa 100644 --- 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 045446e4..c6d5c330 100644 --- 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 fb0414c7..2576096c 100644 --- 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 045446e4..c6d5c330 100644 --- 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 2293eaff..30a9680c 100644 --- 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 fb0414c7..2576096c 100644 --- 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%