From: Mark Wooding Date: Wed, 13 Nov 2019 19:17:40 +0000 (+0000) Subject: subdirmk/*: Some simple whitespace cleanups X-Git-Tag: subdirmk/0.1~48^2 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=commitdiff_plain;h=51d204f72e2c292c0c6751109e54c4546d1ab41f;hp=b0ec8ee72de621b16191b1a06612c60156ec667e subdirmk/*: Some simple whitespace cleanups Zap trailing whitespace, and spaces-followed-by-tabs. This commit is empty in `git show -b'. Signed-off-by: Mark Wooding --- diff --git a/subdirmk/README b/subdirmk/README index d43c04b..9a53f93 100644 --- a/subdirmk/README +++ b/subdirmk/README @@ -14,7 +14,7 @@ style is not very ergonomic. The main difficulties are: - constantly having to write out long file and directory names - the lack of a per-directory make variable namespace means long make variables (or namespace clashes) - - it is difficult to arrange that one can cd to a subdirectory + - it is difficult to arrange that one can cd to a subdirectory and say `make all' and have something reasonable happen (to wit, build an appropriate subset) @@ -151,8 +151,8 @@ we describe the expansion at the top level, which is often a special case (in general in variable names we call that TOP rather than the empty string). -&CAPS => sub_dir_CAPS or TOP_CAPS -&lc => sub/dir/lc or lc +&CAPS => sub_dir_CAPS or TOP_CAPS +&lc => sub/dir/lc or lc Here CAPS is any ASCII letter A-Z and lc is a-z. The assumption is that filenames are usually lowercase and variables usually uppercase. Otherwise, use another syntax: diff --git a/subdirmk/generate b/subdirmk/generate index 7fc3809..8a5daa6 100755 --- a/subdirmk/generate +++ b/subdirmk/generate @@ -252,7 +252,7 @@ sub process_subtree ($$) { } print O "\n"; } - + return @targets; } diff --git a/subdirmk/regen.mk.in b/subdirmk/regen.mk.in index 948ef4e..bd56a24 100644 --- a/subdirmk/regen.mk.in +++ b/subdirmk/regen.mk.in @@ -4,11 +4,11 @@ # SPDX-License-Identifier: LGPL-2.0-or-later CONFIGURE ?= configure -CONFIGURE_AC ?= $(CONFIGURE).ac -CONFIG_STATUS ?= config.status +CONFIGURE_AC ?= $(CONFIGURE).ac +CONFIG_STATUS ?= config.status -CONFIGURE_ACS += $(CONFIGURE_AC) -CONFIGURE_ACS += subdirmk/subdirmk.ac +CONFIGURE_ACS += $(CONFIGURE_AC) +CONFIGURE_ACS += subdirmk/subdirmk.ac $(top_srcdir)/$(CONFIGURE): $(addprefix $(top_srcdir)/,$(CONFIGURE_ACS)) cd $(top_srcdir) && autoconf @@ -22,7 +22,7 @@ MAKEFILE_TEMPLATES += $(addprefix $(top_srcdir)/, $(addsuffix .in, \ )) main.mk $(MAKEFILES): .makefiles.stamp ; -.makefiles.stamp: \ +.makefiles.stamp: \ $(top_srcdir)/subdirmk/generate \ $(CONFIG_STATUS) \ $(MAKEFILE_TEMPLATES)