Makefile: Simplify variable names and use instool(1)

1 files changed, 11 insertions, 8 deletions

diff --git a/mkdeps.sh b/mkdeps.sh
index 14e475c..ae6fffc 100755
--- a/mkdeps.sh
+++ b/mkdeps.sh
@@ -5,8 +5,10 @@ export LANG=POSIX.UTF-8
 
 
 libs() {
-	find src tests -name '*.go' | grep -v '/main\.go$' |
-		grep -v '/meta\.go$'
+	find src tests -name '*.go' |
+		grep -Ev '/(main|meta)\.go$' |
+		grep -Ev '/_cgo_(import|gotypes)\.go$' |
+		grep -Ev '\.cgo1\.go$'
 }
 
 mains() {
@@ -24,19 +26,20 @@ xdocs() {
 }
 
 pos() {
-	find po/ -name '*.po' | grep -v '^po/doc/'
+	find po/ -name '*.po' | grep -Ev '^po/(doc|tests)/'
 }
 
+
 libs  | varlist 'libs.go'
 mains | varlist 'mains.go'
 docs  | varlist 'manpages.en.N.adoc'
-xdocs | varlist 'manpages.xx.N.adoc'
+xdocs | varlist 'manpages.XX.N.adoc'
 pos   | varlist 'sources.po'
 
-find tests/functional/*/*.go -not -name main.go | varlist 'functional-tests/lib.go'
-find tests/functional/*/main.go                 | varlist 'functional-tests/main.go'
-find tests/fuzz/*/*.go       -not -name main.go | varlist 'fuzz-targets/lib.go'
-find tests/fuzz/*/main.go                       | varlist 'fuzz-targets/main.go'
+find tests/functional/*/*.go -not -name main.go | varlist 'functional/lib.go'
+find tests/functional/*/main.go                 | varlist 'functional/main.go'
+find tests/fuzz/*/*.go       -not -name main.go | varlist 'fuzz/lib.go'
+find tests/fuzz/*/main.go                       | varlist 'fuzz/main.go'
 find tests/benchmarks/*/*.go -not -name main.go | varlist 'benchmarks/lib.go'
 find tests/benchmarks/*/main.go                 | varlist 'benchmarks/main.go'