Make find more cross‐compatible

[Shushe] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index 8ce3537b3e72e32152a33b3938fa847ddae01d7a..1b82c08837056c7deeb1fa215455c57a0da13f8b 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -49,7 +49,7 @@ override define makefileinfo
 ║│                                                            │║
 ║│ • `make clean´: Remove `BUILDDIR´.                         │║
 ║│                                                            │║
 ║│                                                            │║
 ║│ • `make clean´: Remove `BUILDDIR´.                         │║
 ║│                                                            │║

-║│ • `make gone´: Remove installed files.                     │║
+║│ • `make gone´: Remove `BUILDDIR´ and installed files.      │║

 ║│                                                            │║
 ║│ • `make help´ (default): Print this message.               │║
 ║│                                                            │║
 ║│                                                            │║
 ║│ • `make help´ (default): Print this message.               │║
 ║│                                                            │║


@@ -59,6 +59,9 @@ override define makefileinfo
 ║│ • `make list´: List all recognized source files and their  │║
 ║│   classification (including media type and dependencies).  │║
 ║│                                                            │║
 ║│ • `make list´: List all recognized source files and their  │║
 ║│   classification (including media type and dependencies).  │║
 ║│                                                            │║

+║│ • `make uninstall´: Remove installed files, but not        │║
+║│   `BUILDDIR´.                                              │║
+║│                                                            │║

 ║│ Set `VERBOSE=1´ to see the text of commands as they are    │║
 ║│ executed.                                                  │║
 ║│                                                            │║
 ║│ Set `VERBOSE=1´ to see the text of commands as they are    │║
 ║│ executed.                                                  │║
 ║│                                                            │║


@@ -141,8 +144,8 @@ MAGICDIR := $(patsubst ./%,%,$(THISDIR)/magic)
 
 # Configuration of `find´.
 #
 
 # Configuration of `find´.
 #

-# By default, `find´ will ignore hidden files, those which begin with a period, and those which are likely to cause problems for `make´.
-FINDRULES := -flags -nohidden -and ! '(' '(' -name '[.-]*' -or -name '*[][*?:|$$%\#;]*' ')' -and -prune ')'
+# By default, `find´ will ignore files which begin with a period and those which are likely to cause problems for `make´.
+FINDRULES := ! '(' '(' -name '[.-]*' -o -name '*[][*?:|$$%\#;]*' ')' -a -prune ')'

 FINDINCLUDERULES := $(FINDRULES)
 
 # The list of parsers for plaintext file types.
 FINDINCLUDERULES := $(FINDRULES)
 
 # The list of parsers for plaintext file types.


@@ -207,10 +210,10 @@ override perenc = $(foreach unencoded,$1,$(call perdec,$(shell $(PRINTF) '%s' $(
 override pathenc = $(foreach path,$1,$(subst $(space),/,$(call perenc,$(subst /, ,$(path)))))
 
 # (overridable) Collect all of the applicable includes from the includes directory.
 override pathenc = $(foreach path,$1,$(subst $(space),/,$(call perenc,$(subst /, ,$(path)))))
 
 # (overridable) Collect all of the applicable includes from the includes directory.

-sourceincludes := $(shell $(FIND) $(foreach dir,$(INCLUDEDIR),$(call quote,$(dir))) -type f '(' $(FINDRULES) ')')
+sourceincludes := $(shell $(FIND) $(foreach dir,$(INCLUDEDIR),$(call quote,$(dir))) '(' $(FINDRULES) ')' -a -type f)

 
 # (overridable) Collect all of the applicable source files from the source directory, removing any which are also includes.
 
 # (overridable) Collect all of the applicable source files from the source directory, removing any which are also includes.

-sourcefiles := $(filter-out $(sourceincludes),$(shell $(FIND) $(foreach dir,$(SRCDIR),$(call quote,$(dir))) -type f '(' $(FINDRULES) ')'))
+sourcefiles := $(filter-out $(sourceincludes),$(shell $(FIND) $(foreach dir,$(SRCDIR),$(call quote,$(dir))) '(' $(FINDRULES) ')' -a -type f))

 
 ifdef GIT
 ifneq ($(wildcard $(THISDIR)/.git),)
 
 ifdef GIT
 ifneq ($(wildcard $(THISDIR)/.git),)


@@ -305,6 +308,11 @@ override recursivefiles := $(foreach file,$(filter-out $(assetfiles),$(sourcefil
 # This is all of the non·asset, nonrecursive files.
 override compilablefiles := $(filter-out $(assetfiles) $(recursivefiles),$(sourcefiles))
 
 # This is all of the non·asset, nonrecursive files.
 override compilablefiles := $(filter-out $(assetfiles) $(recursivefiles),$(sourcefiles))
 

+# Collect all files which can be installed.
+#
+# This is all of the comilable files and all asset sources.
+override installablefiles := $(compilablefiles) $(filter $(assetfiles),$(sourcefiles))
+

 ifneq ($(wildcard $(BUILDDIR)/destinations),)
 # Get the output of the destination transform.
 override destinations := $(shell $(CAT) $(BUILDDIR)/destinations)
 ifneq ($(wildcard $(BUILDDIR)/destinations),)
 # Get the output of the destination transform.
 override destinations := $(shell $(CAT) $(BUILDDIR)/destinations)


@@ -343,23 +351,26 @@ help:
        @$(PRINTF) '%b' '$(subst $(newline),\n,$(makefileinfo))'
 
 # Compile all files, or error if any are recursive.
        @$(PRINTF) '%b' '$(subst $(newline),\n,$(makefileinfo))'
 
 # Compile all files, or error if any are recursive.

-all: $(call compiled,$(recursivefiles) $(compilablefiles) $(filter $(sourcefiles),$(assetfiles)));
+all: $(call compiled,$(recursivefiles) $(compilablefiles));

 
 # Destroy buildfiles.
 clean:
 
 # Destroy buildfiles.
 clean:

-       $(silent)$(RM) -rf $(BUILDDIR)/
+       $(if $(BUILDDIR),$(silent)$(RM) -rf $(call quote,$(BUILDDIR)/),)

 
 

-# Destroy buildfiles and the install directory.
-gone:
-       $(silent)$(RM) -rf $(BUILDDIR)/ $(call compiled,$(recursivefiles) $(compilablefiles))
+# Destroy build directory and installed files.
+gone: clean uninstall;

 
 

-# Install the compiled files into `DESTDIR´.
-install: $(call installed,$(recursivefiles) $(compilablefiles) $(filter $(sourcefiles),$(assetfiles)));
+# Install the compiled files into `DESTDIR´, or error if any are recursive.
+install: $(call installed,$(recursivefiles) $(installablefiles));

 
 # List all source files and includes and their computed types.
 list:
        @$(PRINTF) '%b' $(call quote,$(foreach file,$(sort $(sourcefiles)) $(sort $(sourceincludes)),\0033[1m$(file)\0033[22m|$(call typeoffile,$(file))|[\0033[3m$(if $(filter $(file),$(xmlfiles)),xml,$(if $(filter $(file),$(plaintextfiles)),text,asset))$(if $(filter $(file),$(sourceincludes)),|include,)\0033[23m]$(if $(call dependencies,$(file))$(call recursives,$(file)), $(strip $(foreach recursive,$(call recursives,$(file)),\0033[93;41m•|Recursive|Dependency|\0033[39;49m|$(recursive)) $(foreach dependency,$(call dependencies,$(file)),\0033[2m•|Dependency|\0033[22m|$(dependency))))$(if $(filter $(file),$(sourcefiles)), →|<\0033[4m/$(call destination,$(file))\0033[24m>,) )) | $(TR) ' |' '\n '
 
 
 # List all source files and includes and their computed types.
 list:
        @$(PRINTF) '%b' $(call quote,$(foreach file,$(sort $(sourcefiles)) $(sort $(sourceincludes)),\0033[1m$(file)\0033[22m|$(call typeoffile,$(file))|[\0033[3m$(if $(filter $(file),$(xmlfiles)),xml,$(if $(filter $(file),$(plaintextfiles)),text,asset))$(if $(filter $(file),$(sourceincludes)),|include,)\0033[23m]$(if $(call dependencies,$(file))$(call recursives,$(file)), $(strip $(foreach recursive,$(call recursives,$(file)),\0033[93;41m•|Recursive|Dependency|\0033[39;49m|$(recursive)) $(foreach dependency,$(call dependencies,$(file)),\0033[2m•|Dependency|\0033[22m|$(dependency))))$(if $(filter $(file),$(sourcefiles)), →|<\0033[4m/$(call destination,$(file))\0033[24m>,) )) | $(TR) ' |' '\n '
 

+# Destroy build directory and installed files.
+uninstall:
+       $(foreach file,$(installablefiles),$(if $(wildcard $(call installed,$(file))),$(silent)$(PRINTF) '%s\n' $(call quote,Removing </$(patsubst $(DESTDIR)/%,%,$(call installed,$(file)))>…)$(newline)$(silent)$(RM) -f $(call quote,$(call installed,$(file)))$(newline),))
+

 # Raise an error when attempting to build any files with recursive dependencies.
 $(call compiled,$(recursivefiles)):
        @$(PRINTF) '%b\n' $(call quote,\0033[93;41mError:\0033[39;49m `$(call uncompiled,$@)´ has recursive dependencies:\n$(subst |, ,$(subst $(space),$(newline),$(foreach recursive,$(call recursives,$(call uncompiled,$@)),•|$(recursive))))) && false
 # Raise an error when attempting to build any files with recursive dependencies.
 $(call compiled,$(recursivefiles)):
        @$(PRINTF) '%b\n' $(call quote,\0033[93;41mError:\0033[39;49m `$(call uncompiled,$@)´ has recursive dependencies:\n$(subst |, ,$(subst $(space),$(newline),$(foreach recursive,$(call recursives,$(call uncompiled,$@)),•|$(recursive))))) && false


@@ -372,8 +383,8 @@ $(call compiled,$(recursivefiles)):
 # Don’t use any implicit rules.
 .SUFFIXES: ;
 
 # Don’t use any implicit rules.
 .SUFFIXES: ;
 

-# Phony rules; always consider these out‐of‐date.
-.PHONY: all default clean gone info install list $(call compiled,$(recursivefiles));
+# Phony rules; always consider these out·of·date.
+.PHONY: all default clean gone info install list uninstall $(call compiled,$(recursivefiles));

 
 ifneq ($(wildcard $(BUILDDIR)/.update-types)$(wildcard $(BUILDDIR)/dependencies),)
 # Reload this make·file if the dependency graph has changed.
 
 ifneq ($(wildcard $(BUILDDIR)/.update-types)$(wildcard $(BUILDDIR)/dependencies),)
 # Reload this make·file if the dependency graph has changed.