Removes duplicated maturin build flags on rspy/Makefile

ankitects · May 1, 2020 · b6e7ab6 · b6e7ab6
1 parent b19b3a6
commit b6e7ab6
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/rspy/Makefile b/rspy/Makefile
@@ -41,6 +41,10 @@ RSPY_TARGET_DIR ?= target
 QT_FTL_TEMPLATES := ../qt/ftl
 QT_FTL_LOCALES := ../qt/ftl/repo/desktop
 
+BUILD_VARIABLES = FTL_TEMPLATE_DIRS="$(QT_FTL_TEMPLATES)" \
+	FTL_LOCALE_DIRS="$(QT_FTL_LOCALES)" \
+	CARGO_TARGET_DIR="$(RSPY_TARGET_DIR)"
+
 .PHONY: all develop build check fix clean
 
 all: develop
@@ -56,16 +60,16 @@ DEPS := .build/tools .build/vernum ../meta/buildhash \
 
 .build/develop: $(DEPS)
 	touch ../proto/backend.proto
-	FTL_TEMPLATE_DIRS="$(QT_FTL_TEMPLATES)" FTL_LOCALE_DIRS="$(QT_FTL_LOCALES)" \
-		CARGO_TARGET_DIR="$(RSPY_TARGET_DIR)" maturin develop $(DEVFLAGS)
+	${BUILD_VARIABLES} \
+		maturin develop $(DEVFLAGS)
 	touch $@
 
 build: .build/build
 
 .build/build: $(DEPS)
 	touch ../proto/backend.proto
-	FTL_TEMPLATE_DIRS="$(QT_FTL_TEMPLATES)" FTL_LOCALE_DIRS="$(QT_FTL_LOCALES)" \
-		CARGO_TARGET_DIR="$(RSPY_TARGET_DIR)" maturin build -i "${PYTHON_FILE}" -o "$(OUTDIR)" $(BUILDFLAGS)
+	${BUILD_VARIABLES} \
+		maturin build -i "${PYTHON_FILE}" -o "$(OUTDIR)" $(BUILDFLAGS)
 	touch $@
 
 check: .build/check