From 3f648eba668a2daef8e7f3365108ccac99aa1347 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Mon, 24 Feb 2020 19:02:12 +1000 Subject: [PATCH] make sure rslib changes trigger rspy rebuild --- rspy/Makefile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/rspy/Makefile b/rspy/Makefile index 0f6883262..f14d513f0 100644 --- a/rspy/Makefile +++ b/rspy/Makefile @@ -9,7 +9,7 @@ $(shell mkdir -p .build ../dist) OUTDIR := ../dist BUILDFLAGS := --release --strip -FTLS := ../qt/ftl +QT_FTLS := ../qt/ftl .PHONY: all develop build check fix clean @@ -17,15 +17,19 @@ all: develop develop: .build/develop -.build/develop: .build/tools .build/vernum ../meta/buildhash $(wildcard $(FTLS)/*.ftl) +DEPS := .build/tools .build/vernum ../meta/buildhash $(wildcard $(QT_FTLS)/*.ftl) \ + $(shell find ../rslib/src -name '*.rs') $(wildcard ../proto/*) \ + $(shell find ../rslib/ftl -type f) + +.build/develop: $(DEPS) touch ../proto/backend.proto - FTL_TEMPLATE_DIRS="$(FTLS)" maturin develop $(BUILDFLAGS) + FTL_TEMPLATE_DIRS="$(QT_FTLS)" maturin develop $(BUILDFLAGS) touch $@ -build: .build/tools .build/vernum ../meta/buildhash $(wildcard $(FTLS)/*.ftl) +build: $(DEPS) rm -rf $(OUTDIR)/ankirspy* touch ../proto/backend.proto - FTL_TEMPLATE_DIRS="$(FTLS)" maturin build -i $(shell which python3) -o $(OUTDIR) $(BUILDFLAGS) + FTL_TEMPLATE_DIRS="$(QT_FTLS)" maturin build -i $(shell which python3) -o $(OUTDIR) $(BUILDFLAGS) check: .build/check