Adapt to latest golang Makefile skeleton

1 files changed, 53 insertions, 30 deletions

diff --git a/Makefile b/Makefile
index 35fc78c..15c9795 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ MANDIR       = $(SHAREDIR)/man
 EXEC         = ./
 ## Where to store the installation.  Empty by default.
 DESTDIR      =
-LDLIBS       =
+LDLIBS       = --static
 GOCFLAGS     = -I $(GOLIBDIR)
 GOLDFLAGS    = -L $(GOLIBDIR)
 
@@ -26,17 +26,26 @@ GOLDFLAGS    = -L $(GOLIBDIR)
 .SUFFIXES:
 .SUFFIXES: .go .a .bin .bin-check
 
+.go.a:
+	go tool compile $(GOCFLAGS)  -I $(@D) -o $@ -p $(*F) \
+		`find $< $$(if [ $(*F) != main ]; then \
+			echo src/$(NAME).go src/version.go; fi) | uniq`
+
+.a.bin:
+	go tool link    $(GOLDFLAGS) -L $(@D) -o $@ --extldflags '$(LDLIBS)' $<
+
 
 
 all:
 include deps.mk
 
 
-objects = \
-	src/$(NAME).a                  \
-	src/main.a                     \
-	tests/$(NAME).a                \
-	tests/main.a                   \
+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)
 
 sources = \
 	src/$(NAME).go                 \
@@ -46,14 +55,16 @@ sources = \
 
 derived-assets = \
 	src/version.go                 \
-	$(objects)                     \
-	src/main.bin                   \
-	tests/main.bin                 \
+	$(libs.a)                      \
+	$(mains.a)                     \
+	$(mains.bin)                   \
 	$(NAME).bin                    \
 
 side-assets = \
-	$(NAME).socket                 \
 	glaze.socket                   \
+	$(NAME).socket                 \
+	tests/fuzz/corpus/             \
+	tests/benchmarks/*/main.txt    \
 
 
 
@@ -62,36 +73,26 @@ side-assets = \
 all: $(derived-assets)
 
 
-$(objects): Makefile
-
-src/$(NAME).a: src/$(NAME).go src/version.go
-	go tool compile $(GOCFLAGS) -o $@ -p $(*F) -I $(@D) $*.go src/version.go
+$(libs.a): Makefile deps.mk
+$(libs.a): src/$(NAME).go src/version.go
 
-src/main.a: src/main.go src/$(NAME).a
-tests/main.a: tests/main.go tests/$(NAME).a
-src/main.a tests/main.a:
-	go tool compile $(GOCFLAGS) -o $@ -p $(*F) -I $(@D) $*.go
 
-tests/$(NAME).a: tests/$(NAME).go src/$(NAME).go src/version.go
-	go tool compile $(GOCFLAGS) -o $@ -p $(*F) $*.go src/$(*F).go src/version.go
+$(fuzz-targets/lib.a):
+	go tool compile $(GOCFLAGS) -o $@ -p $(NAME) -d=libfuzzer \
+		$*.go src/$(NAME).go src/version.go
 
-src/main.bin: src/main.a
-tests/main.bin: tests/main.a
-src/main.bin tests/main.bin:
-	go tool link   $(GOLDFLAGS) -o $@ -L $(@D) --extldflags '$(LDLIBS)' $*.a
+src/version.go: Makefile
+	echo 'package $(NAME); const Version = "$(VERSION)"' > $@
 
 $(NAME).bin: src/main.bin
 	ln -fs $? $@
 
-src/version.go: Makefile
-	echo 'package $(NAME); const Version = "$(VERSION)"' > $@
-
 
 
 tests.bin-check = \
-	tests/main.bin-check           \
+	tests/main.bin-check \
+	$(functional-tests/main.go:.go=.bin-check) \
 
-tests/main.bin-check: tests/main.bin
 $(tests.bin-check):
 	$(EXEC)$*.bin
 
@@ -108,6 +109,7 @@ $(integration-tests): ALWAYS
 	sh $@
 
 check-integration: $(integration-tests)
+check-integration: fuzz
 
 
 ## Run all tests.  Each test suite is isolated, so that a parallel
@@ -117,6 +119,27 @@ check: check-unit check-integration
 
 
 
+FUZZSEC=1
+fuzz-targets/main.bin-check = $(fuzz-targets/main.go:.go=.bin-check)
+$(fuzz-targets/main.bin-check):
+	$(EXEC)$*.bin --test.fuzztime=$(FUZZSEC)s \
+		--test.fuzz='.*' --test.fuzzcachedir=tests/fuzz/corpus
+
+fuzz: $(fuzz-targets/main.bin-check)
+
+
+
+benchmarks/main.bin-check = $(benchmarks/main.go:.go=.bin-check)
+$(benchmarks/main.bin-check):
+	rm -f $*.txt
+	printf '%s\n' '$(EXEC)$*.bin'           >> $*.txt
+	LANG=POSIX.UTF-8 time -p $(EXEC)$*.bin 2>> $*.txt
+	printf '%s\n' '$*.txt'
+
+bench: $(benchmarks/main.bin-check)
+
+
+
 ## Remove *all* derived artifacts produced during the build.
 ## A dedicated test asserts that this is always true.
 clean:
@@ -150,7 +173,7 @@ uninstall:
 run: all
 	rm -f $(NAME).socket
 	rm -f glaze.socket
-	./$(NAME).bin cert.pem key.pem tls.socket glaze.socket
+	./$(NAME).bin cert.pem privkey.pem tls.socket glaze.socket
 
 
 ALWAYS: