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 <mdw@distorted.org.uk>

diff --git a/subdirmk/README b/subdirmk/README
index d43c04b2c0c56922c11d300e272c66370f1f8004..9a53f93bbca48db9d27c631351fe95855a58532d 100644 (file)
--- 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)
   - 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)
 
     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).
 
 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:
        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 7fc3809e4d6895650addb7e8e5f0e1424031fc83..8a5daa6b0fc6269cfc6c2cba935b957a0c62e8e2 100755 (executable)
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -252,7 +252,7 @@ sub process_subtree ($$) {
        }
        print O "\n";
     }
        }
        print O "\n";
     }

-    
+

     return @targets;
 }
 
     return @targets;
 }
 

diff --git a/subdirmk/regen.mk.in b/subdirmk/regen.mk.in
index 948ef4e0791eccde5ab19c84215d20e5cc19a6a9..bd56a24e677174d10a57d362d272ecc0158e1d84 100644 (file)
--- a/subdirmk/regen.mk.in
+++ b/subdirmk/regen.mk.in
@@ -4,11 +4,11 @@
 # SPDX-License-Identifier: LGPL-2.0-or-later
 
 CONFIGURE      ?= configure
 # 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
 
 $(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 ;
        ))
 
 main.mk $(MAKEFILES): .makefiles.stamp ;

-.makefiles.stamp:                                              \
+.makefiles.stamp:                                              \

                $(top_srcdir)/subdirmk/generate                 \
                $(CONFIG_STATUS)                                \
                $(MAKEFILE_TEMPLATES)
                $(top_srcdir)/subdirmk/generate                 \
                $(CONFIG_STATUS)                                \
                $(MAKEFILE_TEMPLATES)