Shoehorn project into default golang skeleton structure

1 files changed, 20 insertions, 9 deletions

diff --git a/mkdeps.sh b/mkdeps.sh
index 92427c6..e8da8a4 100755
--- a/mkdeps.sh
+++ b/mkdeps.sh
@@ -4,15 +4,26 @@ set -eu
 export LANG=POSIX.UTF-8
 
 
-find tests/functional/*.go | varlist 'functional-tests.go'
-find tests/fuzz/*.go       | varlist 'fuzz-targets.go'
-find tests/benchmarks/*.go | varlist 'benchmarks.go'
-
+libs() {
+	find src tests -name '*.go' | grep -v '/main\.go$' |
+		grep -v '/version\.go$'
+}
 
-tfiles() {
-	find tests/functional/*.go tests/fuzz/*.go tests/benchmarks/*.go | sort
+mains() {
+	find src tests -name '*.go' | grep    '/main\.go$'
 }
 
-tfiles | sed 's/^\(.*\)\.go$/\1.a:\t\1.go/'
-tfiles | sed 's/^\(.*\)\.go$/\1.bin:\t\1.a/'
-tfiles | sed 's/^\(.*\)\.go$/\1.bin-check:\t\1.bin/'
+libs  | varlist 'libs.go'
+mains | varlist 'mains.go'
+
+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/benchmarks/*/*.go -not -name main.go | varlist 'benchmarks/lib.go'
+find tests/benchmarks/*/main.go                 | varlist 'benchmarks/main.go'
+
+{ libs; mains; } | sort | sed 's/^\(.*\)\.go$/\1.a:\t\1.go/'
+mains            | sort | sed 's/^\(.*\)\.go$/\1.bin:\t\1.a/'
+mains            | sort | sed 's/^\(.*\)\.go$/\1.bin-check:\t\1.bin/'
+mains            | sort | sed 's|^\(.*\)/main\.go$|\1/main.a:\t\1/$(NAME).a|'