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/am/ChangeLog | 8 ++++++++ Build/source/am/bin_links.am | 29 +++++++++++++++-------------- Build/source/am/recurse.am | 34 ++++++++++++++++++---------------- 3 files changed, 41 insertions(+), 30 deletions(-) (limited to 'Build/source/am') 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) -- cgit v1.2.3