Make X·M·L types take priority over plaintext ones

[Shushe] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index a6741782f2a6b3114bd6f705b382f352703728f3..e698262a0b221e79c627b243ca1f97e69417da9e 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -139,6 +139,8 @@ MAGICDIR := $(patsubst ./%,%,$(THISDIR)/magic)
 # a period.
 FINDOPTS := -PE
 FINDRULES := -flags -nohidden -and -not -name '.*'
+FINDINCLUDEOPTS := $(FINDOPTS)
+FINDINCLUDERULES := $(FINDRULES)
 
 # The list of parsers for plaintext file types.
 #
@@ -209,20 +211,16 @@ endif
 
 # Get the list of supported plaintext file types from the parser.
 ifneq ($(wildcard $(BUILDDIR)/parser.xslt),)
-override plaintexttypes := $(shell $(XSLTPROC) $(call quote,$(THISDIR)/lib/parser2types.xslt) $(call quote,$(BUILDDIR)/parser.xslt))
+override plaintexttypes := $(filter-out $(XMLTYPES),$(shell $(XSLTPROC) $(call quote,$(THISDIR)/lib/parser2types.xslt) $(call quote,$(BUILDDIR)/parser.xslt)))
 endif
 
-# Simplify the file type by only taking the first component (image,
-# text, ⁊·c).
-override simpletypes := $(shell $(TR) ' ' '\n' <<< $(call quote,$(types)) | $(SED) 's`/[^/]*$$``g')
-
 # (callable) Get all of the files (source and includes) which have the
 # given types.
 override filesoftype = $(foreach type,$1,$(patsubst %?type=$(type),%,$(filter %?type=$(type),$(types))))
 
 # Build up collections of various file types.
-override plaintextfiles := $(call filesoftype,$(plaintexttypes))
-override xmlfiles := $(filter-out $(plaintextfiles),$(call filesoftype,$(XMLTYPES)))
+override xmlfiles := $(call filesoftype,$(XMLTYPES))
+override plaintextfiles := $(filter-out $(xmlfiles),$(call filesoftype,$(plaintexttypes)))
 override assetfiles := $(filter-out $(xmlfiles) $(plaintextfiles),$(sourcefiles) $(sourceincludes))
 
 # (callable) Get the types of the given files.