aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile83
1 files changed, 42 insertions, 41 deletions
diff --git a/Makefile b/Makefile
index 80aa205..2e7680a 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ GOLDFLAGS = -L $(GOLIBDIR)
.SUFFIXES:
-.SUFFIXES: .go .a .ta .bin .bin-check
+.SUFFIXES: .go .a .bin .bin-check
.go.a:
go tool compile -I $(@D) $(GOCFLAGS) -o $@ -p $(*F) \
@@ -48,44 +48,44 @@ fuzz-targets/lib.a = $(fuzz-targets/lib.go:.go=.a)
benchmarks/lib.a = $(benchmarks/lib.go:.go=.a)
existing = \
- utf8 \
- ucd \
- error \
- compressor \
- spec/grammar \
- spec/grammar/parser \
- spec/test \
- grammar/symbol \
- grammar/lexical/parser \
- grammar/lexical/dfa \
- grammar/lexical \
- grammar \
- driver/lexer \
- driver/parser \
- tester \
+ src/urubu/utf8 \
+ src/urubu/ucd \
+ src/urubu/error \
+ src/urubu/compressor \
+ src/urubu/spec/grammar \
+ src/urubu/spec/grammar/parser \
+ src/urubu/spec/test \
+ src/urubu/grammar/symbol \
+ src/urubu/grammar/lexical/parser \
+ src/urubu/grammar/lexical/dfa \
+ src/urubu/grammar/lexical \
+ src/urubu/grammar \
+ src/urubu/driver/lexer \
+ src/urubu/driver/parser \
+ src/urubu/tester \
xtests = \
- compressor \
- grammar/symbol \
- spec/test \
- utf8 \
- spec/grammar/parser \
- grammar \
- tester \
- grammar/lexical/dfa \
- grammar/lexical/parser \
- grammar/lexical \
- driver/lexer \
- driver/parser \
+ tests/unit/compressor \
+ tests/unit/grammar/symbol \
+ tests/unit/spec/test \
+ tests/unit/utf8 \
+ tests/unit/spec/grammar/parser \
+ tests/unit/grammar \
+ tests/unit/tester \
+ tests/unit/grammar/lexical/dfa \
+ tests/unit/grammar/lexical/parser \
+ tests/unit/grammar/lexical \
+ tests/unit/driver/lexer \
+ tests/unit/driver/parser \
xmains = \
- cmd/ucdgen \
- cmd/vartan \
- cmd/vartan-go \
+ src/urubu/cmd/ucdgen \
+ src/urubu/cmd/vartan \
+ src/urubu/cmd/vartan-go \
existing.a = $(existing:=.a)
xmains.a = $(xmains:=.a)
-xtests.ta = $(xtests:=.ta)
+xtests.a = $(xtests:=.a)
xmains.bin = $(xmains:=.bin)
_xtests.bin = $(xtests:=.bin)
@@ -105,7 +105,7 @@ derived-assets = \
$(existing.a) \
$(xmains.a) \
$(xmains.bin) \
- $(xtests.ta) \
+ $(xtests.a) \
$(xtest.bin) \
side-assets = \
@@ -119,28 +119,29 @@ side-assets = \
all: $(derived-assets)
-$(existing.a) $(xmains.a): Makefile deps.mk
-$(libs.a): Makefile deps.mk
+#$(existing.a) $(xmains.a): Makefile deps.mk
+#$(libs.a): Makefile deps.mk
$(libs.a): src/$(NAME).go src/version.go
$(existing.a):
- go tool compile -I . -o $@ -p $* `find $*/*.go | grep -v _test`
+ go tool compile -I src -o $@ -p `echo $* | sed 's,^src/,,'` `find $*/*.go`
-$(xtests.ta):
- go tool compile -I . -o $@ -p $* $*/*.go
+$(xtests.a):
+ p="`echo $* | sed 's,^tests/unit/,urubu/,'`"; \
+ go tool compile -I src -o $@ -p $$p src/$$p/*.go $*/*.go
$(xmains.a):
- go tool compile -I . -o $@ -p main $*/*.go
+ go tool compile -I src -o $@ -p main $*/*.go
$(xmains.bin) $(xtests.bin):
- go tool link -L . -o $@ --extldflags '$(LDLIBS)' $*.a
+ go tool link -L src -o $@ --extldflags '$(LDLIBS)' $*.a
$(fuzz-targets/lib.a):
go tool compile $(GOCFLAGS) -o $@ -p $(NAME) -d=libfuzzer \
$*.go src/$(NAME).go src/version.go
-src/version.go: Makefile
+src/version.go: #Makefile
echo 'package $(NAME); const Version = "$(VERSION)"' > $@
$(NAME).bin: src/main.bin