Simplify recursive dependency error printing

[Shushe] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index 0b644c2d2e06ec369e77ba39b618ebeb032340b4..a16e29c149ec0491ff5865a618b3d778d9f6208f 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -149,9 +149,7 @@ MAGICDIR := $(patsubst ./%,%,$(THISDIR)/magic)
 # By default, `find´ will not follow symlinks and will use extended
 # regular expressions, ignoring hidden files and those which begin with
 # a period.
-FINDOPTS := -PE
-FINDRULES := -flags -nohidden -and -not -name '.*'
-FINDINCLUDEOPTS := $(FINDOPTS)
+FINDRULES := -flags -nohidden -and ! '(' '(' -name '[.-]*' -or -name '*[:|$$%]*' ')' -and -prune ')'
 FINDINCLUDERULES := $(FINDRULES)
 
 # The list of parsers for plaintext file types.
@@ -368,8 +366,8 @@ list:
 
 # Raise an error when attempting to build any files with recursive
 # dependencies.
-$(call compiled,$(recursivefiles)): $(BUILDDIR)/public/%:
-       @$(PRINTF) '%b\n' $(call quote,\0033[93;41mError:\0033[39;49m `$*´ has recursive dependencies:\n$(subst :, ,$(subst $(space),$(newline),$(foreach recursive,$(call recursives,$(SRCDIR)/$*),•:$(patsubst $(SRCDIR)/%,%,$(recursive)))))) && false
+$(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
 
 # ─ ¶ Special Targets ─────────────────────────────────────────────────