Makefile: Simplify variable names

3 files changed, 19 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index 480880d..5e7fcab 100644
--- a/Makefile
+++ b/Makefile
@@ -40,12 +40,12 @@ all:
 include deps.mk
 
 
-libs.a                 = $(libs.go:.go=.a)
-mains.a                = $(mains.go:.go=.a)
-mains.bin              = $(mains.go:.go=.bin)
-functional-tests/lib.a = $(functional-tests/lib.go:.go=.a)
-fuzz-targets/lib.a     = $(fuzz-targets/lib.go:.go=.a)
-benchmarks/lib.a       = $(benchmarks/lib.go:.go=.a)
+libs.a           = $(libs.go:.go=.a)
+mains.a          = $(mains.go:.go=.a)
+mains.bin        = $(mains.go:.go=.bin)
+functional/lib.a = $(functional/lib.go:.go=.a)
+fuzz/lib.a       = $(fuzz/lib.go:.go=.a)
+benchmarks/lib.a = $(benchmarks/lib.go:.go=.a)
 
 sources = \
 	src/$(NAME).go                 \
@@ -73,7 +73,7 @@ $(libs.a): Makefile deps.mk
 $(libs.a): src/$(NAME).go src/version.go
 
 
-$(fuzz-targets/lib.a):
+$(fuzz/lib.a):
 	go tool compile $(GOCFLAGS) -o $@ -p $(NAME) -d=libfuzzer \
 		$*.go src/$(NAME).go src/version.go
 
@@ -84,7 +84,7 @@ src/version.go: Makefile
 
 tests.bin-check = \
 	tests/main.bin-check \
-	$(functional-tests/main.go:.go=.bin-check) \
+	$(functional/main.go:.go=.bin-check) \
 
 $(tests.bin-check):
 	$(EXEC)$*.bin
@@ -111,12 +111,12 @@ check: check-unit check-integration
 
 
 FUZZSEC=1
-fuzz-targets/main.bin-check = $(fuzz-targets/main.go:.go=.bin-check)
-$(fuzz-targets/main.bin-check):
+fuzz/main.bin-check = $(fuzz/main.go:.go=.bin-check)
+$(fuzz/main.bin-check):
 	$(EXEC)$*.bin --test.fuzztime=$(FUZZSEC)s \
 		--test.fuzz='.*' --test.fuzzcachedir=tests/fuzz/corpus
 
-fuzz: $(fuzz-targets/main.bin-check)
+fuzz: $(fuzz/main.bin-check)
 
 
 
diff --git a/deps.mk b/deps.mk
index 3efeded..6e54d19 100644
--- a/deps.mk
+++ b/deps.mk
@@ -5,13 +5,13 @@ libs.go = \
 mains.go = \
 	tests/main.go \
 
-functional-tests/lib.go = \
+functional/lib.go = \
 
-functional-tests/main.go = \
+functional/main.go = \
 
-fuzz-targets/lib.go = \
+fuzz/lib.go = \
 
-fuzz-targets/main.go = \
+fuzz/main.go = \
 
 benchmarks/lib.go = \
 
diff --git a/mkdeps.sh b/mkdeps.sh
index e8da8a4..156954c 100755
--- a/mkdeps.sh
+++ b/mkdeps.sh
@@ -16,10 +16,10 @@ mains() {
 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/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'