diff options
| -rw-r--r-- | Makefile | 30 | ||||
| -rw-r--r-- | deps.mk | 8 | ||||
| -rwxr-xr-x | mkdeps.sh | 9 |
3 files changed, 24 insertions, 23 deletions
@@ -48,15 +48,15 @@ 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) -manpages.N.adoc = $(manpages.en.N.adoc) $(manpages.XX.N.adoc) -manpages.N = $(manpages.N.adoc:.adoc=) -sources.mo = $(sources.po:.po=.mo) +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) +manpages.N.adoc = $(manpages.en.N.adoc) $(manpages.XX.N.adoc) +manpages.N = $(manpages.N.adoc:.adoc=) +sources.mo = $(sources.po:.po=.mo) cgo.go = \ src/_cgo_import.go \ @@ -121,12 +121,12 @@ src/_cgo_.o: src/$(NAME).go src/_cgo_import.go: src/_cgo_.o go tool cgo --dynpackage $(NAME) --dynimport src/_cgo_.o --dynout $@ -src/$(NAME).a tests/$(NAME).a $(functional-tests/lib.a) $(benchmarks/lib.a): +src/$(NAME).a tests/$(NAME).a $(functional/lib.a) $(benchmarks/lib.a): go tool compile $(GOCFLAGS) -o $@ -p $(*F) $(cgo.go) src/meta.go \ `find $*.go | grep -Ev '^src/$(NAME)\.go$$'` go tool pack r $@ $(cgo.o) -$(fuzz-targets/lib.a): +$(fuzz/lib.a): go tool compile $(GOCFLAGS) -o $@ -p $(NAME) -d=libfuzzer \ $*.go $(cgo.go) src/meta.go go tool pack r $@ $(cgo.o) @@ -151,7 +151,7 @@ locale/.gitignore: po/tests/de.mo po/tests/es.mo tests.bin-check = \ tests/main.bin-check \ - $(functional-tests/main.go:.go=.bin-check) \ + $(functional/main.go:.go=.bin-check) \ tests/functional/api-usage/bin-check: locale/dir.sentinel $(tests.bin-check): @@ -181,12 +181,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) @@ -30,20 +30,20 @@ sources.po = \ po/tests/de.po \ po/tests/es.po \ -functional-tests/lib.go = \ +functional/lib.go = \ tests/functional/api-usage/gotext.go \ tests/functional/extraction/gotext.go \ tests/functional/runtime/gotext.go \ -functional-tests/main.go = \ +functional/main.go = \ tests/functional/api-usage/main.go \ tests/functional/extraction/main.go \ tests/functional/runtime/main.go \ -fuzz-targets/lib.go = \ +fuzz/lib.go = \ tests/fuzz/api/gotext.go \ -fuzz-targets/main.go = \ +fuzz/main.go = \ tests/fuzz/api/main.go \ benchmarks/lib.go = \ @@ -29,16 +29,17 @@ pos() { find po/ -name '*.po' | grep -v '^po/doc/' } + libs | varlist 'libs.go' mains | varlist 'mains.go' docs | varlist 'manpages.en.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' |