From 7678a5904b06d8eb23165058a1b0a753ae0ed02e Mon Sep 17 00:00:00 2001 From: Eddie Hung Date: Tue, 12 Feb 2019 17:02:11 -0800 Subject: Decompress *.json.gz --- ice40/regressions/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ice40/regressions/Makefile b/ice40/regressions/Makefile index 241b41c..00243f8 100644 --- a/ice40/regressions/Makefile +++ b/ice40/regressions/Makefile @@ -19,7 +19,7 @@ ifeq ($(wildcard $(NPNR)),) $(error "$$(NPNR) must point to a nextpnr-ice40 binary (currently: $@)") endif -%: %.gz +%.json: %.json.gz gzip -dk $< $(JSON_OUTPUT): %_postpnr.v: %.json $(wildcard %.pcf) $(wildcard %.npnr) $(NPNR) @@ -27,6 +27,7 @@ $(JSON_OUTPUT): %_postpnr.v: %.json $(wildcard %.pcf) $(wildcard %.npnr) $(NPNR) icebox_vlog $*.asc > $@ $(SH_OUTPUT): %_postpnr.v: %.sh $(NPNR) + gzip -dk $*.json.gz cd $(dir $@) && NPNR=$(NPNR) bash $(notdir $*.sh) > /dev/null 2>&1 if [ -f "$*.asc" ]; then \ icebox_vlog $*.asc > $@; \ @@ -35,4 +36,4 @@ $(SH_OUTPUT): %_postpnr.v: %.sh $(NPNR) fi clean: - @rm -f */*.asc $(JSON_OUTPUT) $(SH_OUTPUT) + @rm -f */*.asc $(JSON) $(JSON_OUTPUT) $(SH_OUTPUT) -- cgit v1.2.3