[lmi-commits] [lmi] master 925e5fb6 4/5: Anticipatorily accommodate wine-7

[Greg Chicares]

branch: master
commit 925e5fb6759d2060b0af321a67463e0c72c85eb9
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Anticipatorily accommodate wine-7
    
    * GNUmakefile: Use neither $PERFORM nor $EXEEXT for test_coding_rules.
    * objects.make: Likewise.
    * test_coding_rules_test.sh: Likewise.
    
    * msw_generic.make: Use $EXEEXT wherever $PERFORM is used.
    * workhorse.make: Likewise.
    
    See:
      https://lists.nongnu.org/archive/html/lmi/2022-06/msg00041.html
---
 GNUmakefile               | 6 +++---
 msw_generic.make          | 2 +-
 objects.make              | 9 +++++----
 test_coding_rules_test.sh | 2 +-
 workhorse.make            | 2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 62b1096a..690ab33e 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -429,13 +429,13 @@ uninstall:
 
 # Custom tools built from source.
 
-TEST_CODING_RULES := $(build_dir)/test_coding_rules$(EXEEXT)
+TEST_CODING_RULES := $(build_dir)/test_coding_rules
 
 .PHONY: custom_tools
 custom_tools:
        @[ "$$LMI_TRIPLET" = "x86_64-pc-linux-gnu" ] \
          || ($(ECHO) "'$@' requires x86_64-pc-linux-gnu." && false)
-       @$(MAKE) test_coding_rules$(EXEEXT)
+       @$(MAKE) test_coding_rules
        @$(INSTALL) -c -m 0775 $(TEST_CODING_RULES) $(localbindir)
 
 
################################################################################
@@ -501,7 +501,7 @@ check_concinnity: source_clean custom_tools
              || $(ECHO) "... in file $$z"; \
          done;
        @$(ECHO) "  Miscellaneous problems:"
-       @-cd $(prefascicle_dir) && $(PERFORM) $(TEST_CODING_RULES) *
+       @-cd $(prefascicle_dir) && $(TEST_CODING_RULES) *
 
 
################################################################################
 
diff --git a/msw_generic.make b/msw_generic.make
index 3c465350..655fe651 100644
--- a/msw_generic.make
+++ b/msw_generic.make
@@ -105,7 +105,7 @@ WGET    := wget
 # Instead of requiring installation of the build system's own libxml2:
     XMLLINT := xmllint
 # use the one that lmi builds:
-#   XMLLINT := $(PERFORM) $(localbindir)/xmllint
+#   XMLLINT := $(PERFORM) $(localbindir)/xmllint$(EXEEXT)
 # but don't do that until 'wine' is fixed--see:
 #   https://lists.nongnu.org/archive/html/lmi/2019-01/msg00034.html
 
diff --git a/objects.make b/objects.make
index f8f89cea..bafd4a0f 100644
--- a/objects.make
+++ b/objects.make
@@ -1164,10 +1164,11 @@ rate_table_tool$(EXEEXT): \
   rate_table.o \
   rate_table_tool.o \
 
-test_coding_rules_test := PERFORM=$(PERFORM) 
$(srcdir)/test_coding_rules_test.sh
-test_coding_rules$(EXEEXT): EXTRA_LDFLAGS = $(pcre_ldflags)
-test_coding_rules$(EXEEXT): POST_LINK_COMMAND = $(test_coding_rules_test)
-test_coding_rules$(EXEEXT): \
+# pc-linux-gnu only:
+test_coding_rules_test := $(srcdir)/test_coding_rules_test.sh
+test_coding_rules: EXTRA_LDFLAGS = $(pcre_ldflags)
+test_coding_rules: POST_LINK_COMMAND = $(test_coding_rules_test)
+test_coding_rules: \
   $(main_auxiliary_common_objects) \
   miscellany.o \
   my_test_coding_rules.o \
diff --git a/test_coding_rules_test.sh b/test_coding_rules_test.sh
index 62380bd8..15afbf2d 100755
--- a/test_coding_rules_test.sh
+++ b/test_coding_rules_test.sh
@@ -433,7 +433,7 @@ touch another.unexpected.file
 
 # Compare observed to expected. Note that directory '.' is ignored.
 
-2>&1 $PERFORM ./test_coding_rules \
+2>&1 ./test_coding_rules \
   . \
   a_nonexistent_file \
   an_expungible_file.bak \
diff --git a/workhorse.make b/workhorse.make
index 469f8968..bc3f7e4f 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -1293,7 +1293,7 @@ wrap_fardel:
        @$(INSTALL) -m 0664 $(fardel_files) .
        printf "$(j1) $(j2)" >expiry
        @$(MD5SUM) --binary $(fardel_checksummed_files) >validated.md5
-       @$(PERFORM) $(bindir)/generate_passkey > passkey
+       @$(PERFORM) $(bindir)/generate_passkey$(EXEEXT) > passkey
        @$(TAR) \
          --bzip2 \
          --create \