tighten up meson includes

Author: rick

.gitmodules

@@ -1027,3 +1027,6 @@
 [submodule "submodules/libnsgif"]
 	path = submodules/libnsgif
 	url = https://github.com/netsurf-plan9/libnsgif
+[submodule "submodules/optparse99-master"]
+	path = submodules/optparse99-master
+	url = https://github.com/hippie68/optparse99

etc/introspect.mk

@@ -5,17 +5,17 @@ meson-introspect-targets:
 meson-binaries:
 	@$(MESON) introspect --targets build -i | $(JQ) 'map(select(.type == "executable").filename)|flatten|join("\n")' -Mrc|grep submodules -v|$(XARGS) -I % $(BASENAME) %|$(SORT) -u
 meson-binaries-paths:
-	@$(MAKE) meson-binaries | $(XARGS) -I % echo ./build/%/%
+	@$(MAKE) -s meson-binaries | $(XARGS) -I % echo ./build/%/%
 meson-introspect-build-files:
 	@$(MESON) introspect --buildsystem-files build |$(JQ) -rM|grep '"'|$(CUT) -d'"' -f2|$(SORT) -u|$(SED) "s|$(shell pwd)/||g"|$(SORT) -u
 meson-get-source-files:
 	@$(MESON) introspect build --targets|$(JQ) '.[].target_sources[0].sources' -Mrc|$(CUT) -d'"' -f2|$(SORT) -u|$(SED)  "s|$(shell pwd)/||g"
 
 meson-get-source-dirs:
-	@$(MAKE) meson-introspect-build-files -B \
+	@$(MAKE) -s meson-introspect-build-files -B \
 			|egrep 'submodules|subprojects|meson/deps' -v|grep 'meson.build'\
 			|gsed 's|/meson.build$$||g'|grep '^[a-z].*'|sort -u\
 			|tr '\n' ' '
 
 meson-get-c-files:
-	@$(FIND) $(shell $(MAKE) meson-get-source-dirs -B) -type f -name "*.c" -or -name "*.h"|sort -u|egrep -v '/\.'
+	@$(FIND) $(shell $(MAKE) -s meson-get-source-dirs) -type f -name "*.c" -or -name "*.h"|sort -u|egrep -v '/\.'|$(GREP) -v 'meson/deps|submodules|subprojects'

etc/tidy.mk

@@ -2,11 +2,11 @@ TIDIED_FILES ?=*/*.c */*.h */*/*.c */*/*.h */*/test/*.h */*/test/*.c
 EXCLUDED_TIDIED_FILES = kfc-utils-colors.c|xxxxxxxxx.c
 
 get-tidied-files-lines-qty:
-	@wc -l < $(shell $(MAKE) -B get-tidied-files)|grep total|tail -n1|tr -s ' '|cut -d' ' -f2
+	@wc -l < $(shell $(MAKE) -s get-tidied-files)|grep total|tail -n1|tr -s ' '|cut -d' ' -f2
 get-tidied-files-qty:
-	@$(MAKE) -B get-tidied-files|wc -l
+	@$(MAKE) -s get-tidied-files|wc -l
 get-tidied-files:
-	@$(MAKE) -B meson-get-c-files|egrep -v 'meson/deps|submodules|subprojects'
+	@$(MAKE) -s meson-get-c-files
 
 #$(FIND) -L $(TIDIED_FILES) -type f -maxdepth 3| $(SORT) -u
 
@@ -18,8 +18,7 @@ uncrustify:
 #	@make -B get-tidied-files|$(XARGS) -P 10 -I {} $(UNCRUSTIFY) -c ~/repos/c_deps/etc/uncrustify.cfg --replace "{}" 2>/dev/null||true
 
 uncrustify-clean:
-	true
-#	@$(FIND) -L . -type f -name "*unc-backup*" |$(GREP) -v 'submodules|subprojects'|$(XARGS) -I % $(REALPATH) % | $(SORT) -u|$(XARGS) -P 10 -I % $(UNLINK) % 2>/dev/null ||true
+	@$(FIND) . -type f -name "*unc-backup*" |$(GREP) -v 'submodules|subprojects'|$(XARGS) -I % $(REALPATH) % | $(SORT) -u|$(XARGS) -P 10 -I % $(UNLINK) % 2>/dev/null ||true
 
 fix-dbg:
 	@$(SED)   's|, %[[:space:]].*u);|, %u);|g'  -i $(TIDIED_FILES)
@@ -34,25 +33,21 @@ fix-dbg:
 	@$(SED)   's|, %[[:space:]].*zu);|, %zu);|g' -i $(TIDIED_FILES)
 
 shfmt:
-#	@if [[ -d scripts ]]; then $(FIND) scripts/*.sh -type f >/dev/null 2>&1 && $(MAKE) -B fmt-scripts 2>/dev/null||true; fi
-	@true
+	@if [[ -d scripts ]]; then $(FIND) scripts/*.sh -type f >/dev/null 2>&1 && $(MAKE) -s fmt-scripts 2>/dev/null||true; fi
 
 do-tidy: 
-	true
-#	@$(MAKE) -B uncrustify uncrustify-clean shfmt fix-dbg 2>/dev/null||true
+	@$(MAKE) -s uncrustify uncrustify-clean shfmt fix-dbg 2>/dev/null||true
 
 get-tidied-files-stats:
 	  @printf "%s files, %s lines\n" "$(shell make -B get-tidied-files-qty)" "$(shell make -B get-tidied-files-lines-qty)"
 
 do-timed-tidy: 
 	@ts=`$(DATE) +%s%3N` && \
 	  $(ANSI) --yellow "Uncrustifying $(shell make -B get-tidied-files-stats)" && \
-		$(MAKE) -B do-tidy >&2 && \
+		$(MAKE) -s do-tidy >&2 && \
 		end_ts=`$(DATE) +%s%3N` && \
 		$(ANSI) --up=1 -n --green  "Uncrustified  $(shell make -B get-tidied-files-stats) in " && \
 		bc <<< `printf "%s-%s" "$$end_ts" "$$ts"`|tr -d '\n' && \
 		ansi --blue ms && sleep 1
 
-tidy:
-	true
-#	@$(MAKE) -B do-timed-tidy
+tidy: do-timed-tidy