From 507a94e7a5161b9272bdee7845c519004df84732 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 11 Jan 2022 22:54:49 +0000 Subject: do not propagate leading comments from Makefile.in, do add trailing comment for some *.am git-svn-id: svn://tug.org/texlive/trunk@61576 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/Makefile.in | 19 ++------------ Build/source/am/ChangeLog | 8 ++++++ Build/source/am/bin_links.am | 29 +++++++++++----------- Build/source/am/recurse.am | 34 ++++++++++++++------------ Build/source/libs/Makefile.in | 19 ++------------ Build/source/texk/Makefile.in | 19 ++------------ Build/source/texk/cjkutils/Makefile.in | 17 ++----------- Build/source/texk/dviljk/Makefile.in | 17 ++----------- Build/source/texk/dvipdfm-x/Makefile.in | 17 ++----------- Build/source/texk/dvipng/Makefile.in | 17 ++----------- Build/source/texk/web2c/Makefile.in | 17 ++----------- Build/source/texk/web2c/omegafonts/Makefile.in | 17 ++----------- Build/source/utils/Makefile.in | 19 ++------------ 13 files changed, 61 insertions(+), 188 deletions(-) (limited to 'Build/source') diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in index b5d51ef0064..37c770e9d25 100644 --- a/Build/source/Makefile.in +++ b/Build/source/Makefile.in @@ -494,23 +494,6 @@ SUBDIRS = . doc $(MAKE_SUBDIRS) libs utils texk DIST_SUBDIRS = auxdir/auxsub doc $(CONF_SUBDIRS) libs utils texk recurse_this = recurse_top = - -# am/recurse.am: Makefile fragment to configure and build subdirs. -# -# Copyright 2017-2020 Karl Berry -# Copyright 2013 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. -# -# Requires $(recurse_this) and $(recurse_top). -# Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4). -# -# For subdirs not required for the current set of configure options -# we append '--disable-build' so they can skip tests that would -# fail because, e.g., some required libraries were not built. -# (By manually testing $enable_build in configure, e.g., dvisvgm/configure.) -# -# Code inspired by automake's way to handle recursive targets. -# cf_silent = $(cf_silent_@AM_V@) cf_silent_ = $(cf_silent_@AM_DEFAULT_V@) cf_silent_0 = --silent @@ -1044,6 +1027,8 @@ $(CONFIG_AUX): @echo "configure in $(recurse_top)auxdir/auxsub failed to create the file $@" exit 1 +# (end of recurse.am) + # This (world) is the default target for the ./Build script in TeX Live. .PHONY: world world: all diff --git a/Build/source/am/ChangeLog b/Build/source/am/ChangeLog index cf4170e688d..f5995687c4d 100644 --- a/Build/source/am/ChangeLog +++ b/Build/source/am/ChangeLog @@ -1,3 +1,11 @@ +2022-01-11 Karl Berry + + * bin_links.am, + * recurse.am: comment out comments (##) again; turns out + the leading comments all end up at the beginning of Makefile.in, + which is not useful. On the other hand, insert # (end of ...) + comments, which do show up in the normal place. + 2017-02-17 Karl Berry * bin_links.am, diff --git a/Build/source/am/bin_links.am b/Build/source/am/bin_links.am index 2ff85d0cbe1..0d619a155b4 100644 --- a/Build/source/am/bin_links.am +++ b/Build/source/am/bin_links.am @@ -1,18 +1,18 @@ ## $Id$ -# am/bin_links.am: Makefile fragment for bindir links. -# -# Copyright 2017-2020 Karl Berry -# Copyright 2011-2013 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. -# -# requires conditional WIN32 -# requires $(bin_links) -# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE -# for binaries and scripts use, e.g., -# binprog$(EXEEXT):foo -# script:bar -# respectively, such that the links created on cygwin are -# 'foo->binprog.exe' and 'bar->script'. +## am/bin_links.am: Makefile fragment for bindir links. +## +## Copyright 2017-2022 Karl Berry +## Copyright 2011-2013 Peter Breitenlohner +## You may freely use, modify and/or distribute this file. +## +## requires conditional WIN32 +## requires $(bin_links) +## Symlinks within $(bindir): FILE:LINK indicates LINK->FILE +## for binaries and scripts use, e.g., +## binprog$(EXEEXT):foo +## script:bar +## respectively, such that the links created on cygwin are +## 'foo->binprog.exe' and 'bar->script'. .PHONY: install-bin-links uninstall-bin-links @@ -37,3 +37,4 @@ if !WIN32 done endif !WIN32 +# (end of bin_links.am) diff --git a/Build/source/am/recurse.am b/Build/source/am/recurse.am index 7bfe320c99d..3392e507461 100644 --- a/Build/source/am/recurse.am +++ b/Build/source/am/recurse.am @@ -1,20 +1,20 @@ ## $Id$ -# am/recurse.am: Makefile fragment to configure and build subdirs. -# -# Copyright 2017-2020 Karl Berry -# Copyright 2013 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. -# -# Requires $(recurse_this) and $(recurse_top). -# Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4). -# -# For subdirs not required for the current set of configure options -# we append '--disable-build' so they can skip tests that would -# fail because, e.g., some required libraries were not built. -# (By manually testing $enable_build in configure, e.g., dvisvgm/configure.) -# -# Code inspired by automake's way to handle recursive targets. -# +## am/recurse.am: Makefile fragment to configure and build subdirs. +## +## Copyright 2017-2022 Karl Berry +## Copyright 2013 Peter Breitenlohner +## You may freely use, modify and/or distribute this file. +## +## Requires $(recurse_this) and $(recurse_top). +## Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4). +## +## For subdirs not required for the current set of configure options +## we append '--disable-build' so they can skip tests that would +## fail because, e.g., some required libraries were not built. +## (By manually testing $enable_build in configure, e.g., dvisvgm/configure.) +## +## Code inspired by automake's way to handle recursive targets. + cf_silent = $(cf_silent_@AM_V@) cf_silent_ = $(cf_silent_@AM_DEFAULT_V@) cf_silent_0 = --silent @@ -56,3 +56,5 @@ recurse: $(CONFIG_AUX) $(CONFIG_AUX): @echo "configure in $(recurse_top)auxdir/auxsub failed to create the file $@" exit 1 + +# (end of recurse.am) diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in index 6d6eca2a8c9..80c1ed5aa4e 100644 --- a/Build/source/libs/Makefile.in +++ b/Build/source/libs/Makefile.in @@ -420,23 +420,6 @@ NEVER_NAMES_LT = -o -name .libs -o -name '*.lo' # Files not to be distributed recurse_this = libs/ recurse_top = ../ - -# am/recurse.am: Makefile fragment to configure and build subdirs. -# -# Copyright 2017-2020 Karl Berry -# Copyright 2013 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. -# -# Requires $(recurse_this) and $(recurse_top). -# Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4). -# -# For subdirs not required for the current set of configure options -# we append '--disable-build' so they can skip tests that would -# fail because, e.g., some required libraries were not built. -# (By manually testing $enable_build in configure, e.g., dvisvgm/configure.) -# -# Code inspired by automake's way to handle recursive targets. -# cf_silent = $(cf_silent_@AM_V@) cf_silent_ = $(cf_silent_@AM_DEFAULT_V@) cf_silent_0 = --silent @@ -947,6 +930,8 @@ $(CONFIG_AUX): @echo "configure in $(recurse_top)auxdir/auxsub failed to create the file $@" exit 1 +# (end of recurse.am) + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in index 03622713306..b44cc7fb3c5 100644 --- a/Build/source/texk/Makefile.in +++ b/Build/source/texk/Makefile.in @@ -420,23 +420,6 @@ NEVER_NAMES_LT = -o -name .libs -o -name '*.lo' # Files not to be distributed recurse_this = texk/ recurse_top = ../ - -# am/recurse.am: Makefile fragment to configure and build subdirs. -# -# Copyright 2017-2020 Karl Berry -# Copyright 2013 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. -# -# Requires $(recurse_this) and $(recurse_top). -# Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4). -# -# For subdirs not required for the current set of configure options -# we append '--disable-build' so they can skip tests that would -# fail because, e.g., some required libraries were not built. -# (By manually testing $enable_build in configure, e.g., dvisvgm/configure.) -# -# Code inspired by automake's way to handle recursive targets. -# cf_silent = $(cf_silent_@AM_V@) cf_silent_ = $(cf_silent_@AM_DEFAULT_V@) cf_silent_0 = --silent @@ -950,6 +933,8 @@ $(CONFIG_AUX): @echo "configure in $(recurse_top)auxdir/auxsub failed to create the file $@" exit 1 +# (end of recurse.am) + # Special target to run TRIP and TRAP tests and create diffs. .PHONY: triptrap triptrap: diff --git a/Build/source/texk/cjkutils/Makefile.in b/Build/source/texk/cjkutils/Makefile.in index 5d3c45a9e52..542122b7f9f 100644 --- a/Build/source/texk/cjkutils/Makefile.in +++ b/Build/source/texk/cjkutils/Makefile.in @@ -14,21 +14,6 @@ @SET_MAKE@ -# am/bin_links.am: Makefile fragment for bindir links. -# -# Copyright 2017-2020 Karl Berry -# Copyright 2011-2013 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. -# -# requires conditional WIN32 -# requires $(bin_links) -# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE -# for binaries and scripts use, e.g., -# binprog$(EXEEXT):foo -# script:bar -# respectively, such that the links created on cygwin are -# 'foo->binprog.exe' and 'bar->script'. - VPATH = @srcdir@ @@ -1644,6 +1629,8 @@ uninstall-bin-links: @WIN32_FALSE@ rm -f $(DESTDIR)$(bindir)/$$link; \ @WIN32_FALSE@ done +# (end of bin_links.am) + @KPATHSEA_RULE@ @WIN32_TRUE@install-exec-hook: @WIN32_TRUE@ @cd $(DESTDIR)$(bindir) && \ diff --git a/Build/source/texk/dviljk/Makefile.in b/Build/source/texk/dviljk/Makefile.in index 8804f707125..8eaddd21d4c 100644 --- a/Build/source/texk/dviljk/Makefile.in +++ b/Build/source/texk/dviljk/Makefile.in @@ -14,21 +14,6 @@ @SET_MAKE@ -# am/bin_links.am: Makefile fragment for bindir links. -# -# Copyright 2017-2020 Karl Berry -# Copyright 2011-2013 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. -# -# requires conditional WIN32 -# requires $(bin_links) -# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE -# for binaries and scripts use, e.g., -# binprog$(EXEEXT):foo -# script:bar -# respectively, such that the links created on cygwin are -# 'foo->binprog.exe' and 'bar->script'. - VPATH = @srcdir@ @@ -1325,6 +1310,8 @@ uninstall-bin-links: @WIN32_FALSE@ link=`echo $$s | sed 's,.*:,,'`; \ @WIN32_FALSE@ rm -f $(DESTDIR)$(bindir)/$$link; \ @WIN32_FALSE@ done + +# (end of bin_links.am) .PHONY: install-man1-links uninstall-man1-links install-man1-links: diff --git a/Build/source/texk/dvipdfm-x/Makefile.in b/Build/source/texk/dvipdfm-x/Makefile.in index 55906857d63..e9dfb9d532c 100644 --- a/Build/source/texk/dvipdfm-x/Makefile.in +++ b/Build/source/texk/dvipdfm-x/Makefile.in @@ -14,21 +14,6 @@ @SET_MAKE@ -# am/bin_links.am: Makefile fragment for bindir links. -# -# Copyright 2017-2020 Karl Berry -# Copyright 2011-2013 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. -# -# requires conditional WIN32 -# requires $(bin_links) -# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE -# for binaries and scripts use, e.g., -# binprog$(EXEEXT):foo -# script:bar -# respectively, such that the links created on cygwin are -# 'foo->binprog.exe' and 'bar->script'. - VPATH = @srcdir@ @@ -1982,6 +1967,8 @@ uninstall-bin-links: @WIN32_FALSE@ link=`echo $$s | sed 's,.*:,,'`; \ @WIN32_FALSE@ rm -f $(DESTDIR)$(bindir)/$$link; \ @WIN32_FALSE@ done + +# (end of bin_links.am) .PHONY: install-man1-links uninstall-man1-links install-man1-links: diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in index c728a692221..eb72975f80e 100644 --- a/Build/source/texk/dvipng/Makefile.in +++ b/Build/source/texk/dvipng/Makefile.in @@ -14,21 +14,6 @@ @SET_MAKE@ -# am/bin_links.am: Makefile fragment for bindir links. -# -# Copyright 2017-2020 Karl Berry -# Copyright 2011-2013 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. -# -# requires conditional WIN32 -# requires $(bin_links) -# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE -# for binaries and scripts use, e.g., -# binprog$(EXEEXT):foo -# script:bar -# respectively, such that the links created on cygwin are -# 'foo->binprog.exe' and 'bar->script'. - VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -1609,6 +1594,8 @@ uninstall-bin-links: @WIN32_FALSE@ link=`echo $$s | sed 's,.*:,,'`; \ @WIN32_FALSE@ rm -f $(DESTDIR)$(bindir)/$$link; \ @WIN32_FALSE@ done + +# (end of bin_links.am) @WIN32_FALSE@@have_gif_TRUE@install-exec-hook: install-bin-links @WIN32_FALSE@@have_gif_TRUE@uninstall-hook: uninstall-bin-links dvipng.log: dvipng$(EXEEXT) diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 1c55873c5bc..ee84cb64eaa 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -14,21 +14,6 @@ @SET_MAKE@ -# am/bin_links.am: Makefile fragment for bindir links. -# -# Copyright 2017-2020 Karl Berry -# Copyright 2011-2013 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. -# -# requires conditional WIN32 -# requires $(bin_links) -# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE -# for binaries and scripts use, e.g., -# binprog$(EXEEXT):foo -# script:bar -# respectively, such that the links created on cygwin are -# 'foo->binprog.exe' and 'bar->script'. - @@ -22541,6 +22526,8 @@ uninstall-bin-links: @WIN32_FALSE@ rm -f $(DESTDIR)$(bindir)/$$link; \ @WIN32_FALSE@ done +# (end of bin_links.am) + install-exec-hook: install-bin-links $(install_exe_links) uninstall-hook: uninstall-bin-links $(uninstall_exe_links) diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in index 923c6e10f1b..4382f48be6a 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.in +++ b/Build/source/texk/web2c/omegafonts/Makefile.in @@ -14,21 +14,6 @@ @SET_MAKE@ -# am/bin_links.am: Makefile fragment for bindir links. -# -# Copyright 2017-2020 Karl Berry -# Copyright 2011-2013 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. -# -# requires conditional WIN32 -# requires $(bin_links) -# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE -# for binaries and scripts use, e.g., -# binprog$(EXEEXT):foo -# script:bar -# respectively, such that the links created on cygwin are -# 'foo->binprog.exe' and 'bar->script'. - VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -1424,6 +1409,8 @@ uninstall-bin-links: @WIN32_FALSE@ rm -f $(DESTDIR)$(bindir)/$$link; \ @WIN32_FALSE@ done +# (end of bin_links.am) + @OTANGLE_TRUE@install-exec-hook: install-bin-links # same install happens in dvipdfmx. @OTANGLE_TRUE@@WIN32_TRUE@ for f in $(linked_programs); do \ diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in index ddd5887743f..83acaa44a30 100644 --- a/Build/source/utils/Makefile.in +++ b/Build/source/utils/Makefile.in @@ -420,23 +420,6 @@ NEVER_NAMES_LT = -o -name .libs -o -name '*.lo' # Files not to be distributed recurse_this = utils/ recurse_top = ../ - -# am/recurse.am: Makefile fragment to configure and build subdirs. -# -# Copyright 2017-2020 Karl Berry -# Copyright 2013 Peter Breitenlohner -# You may freely use, modify and/or distribute this file. -# -# Requires $(recurse_this) and $(recurse_top). -# Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4). -# -# For subdirs not required for the current set of configure options -# we append '--disable-build' so they can skip tests that would -# fail because, e.g., some required libraries were not built. -# (By manually testing $enable_build in configure, e.g., dvisvgm/configure.) -# -# Code inspired by automake's way to handle recursive targets. -# cf_silent = $(cf_silent_@AM_V@) cf_silent_ = $(cf_silent_@AM_DEFAULT_V@) cf_silent_0 = --silent @@ -947,6 +930,8 @@ $(CONFIG_AUX): @echo "configure in $(recurse_top)auxdir/auxsub failed to create the file $@" exit 1 +# (end of recurse.am) + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -- cgit v1.2.3