From 4a5ef7a84c529abb477957f6a8cddcd4af06d09f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 16 Sep 2023 12:10:48 +0100 Subject: [PATCH] Introduce DUTILS variable to replace PLAY Signed-off-by: Ian Jackson --- Makefile | 2 +- diziet-utils/reprap-objects.make | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 2821dee..3514caa 100644 --- a/Makefile +++ b/Makefile @@ -94,7 +94,7 @@ FILAMENTSPOOL_DXFS=$(foreach n,$(FILAMENTSPOOL_NUMBERS), \ filamentspool-number-n$n.dxf) $(addsuffix .auto.stl, $(foreach f,$(FILAMENTSPOOL_AUTOS),$(shell \ - $(PLAY)/toplevel-find $(PLAY)/$f))): $(FILAMENTSPOOL_DXFS) + $(DUTILS)/toplevel-find $(CWD)/$f))): $(FILAMENTSPOOL_DXFS) filamentspool-numbers filamentspool.stl: $(FILAMENTSPOOL_DXFS) diff --git a/diziet-utils/reprap-objects.make b/diziet-utils/reprap-objects.make index 0d8d6c6..bf60636 100644 --- a/diziet-utils/reprap-objects.make +++ b/diziet-utils/reprap-objects.make @@ -20,24 +20,25 @@ M4=m4 CWD := $(shell pwd) -PLAY ?= $(CWD) +DUTILS ?= $(CWD)/diziet-utils +PLAY ?= $(CWD) # deprecated, for compatibility only -AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m)) +AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(DUTILS)/toplevel-find $m)) AUTO_INCS += funcs.scad default: autoincs scads -$(shell set -xe; $(PLAY)/commitid.scad.pl >commitid.scad.tmp; cmp commitid.scad.tmp commitid.scad || mv -f commitid.scad.tmp commitid.scad ) +$(shell set -xe; $(DUTILS)/commitid.scad.pl >commitid.scad.tmp; cmp commitid.scad.tmp commitid.scad || mv -f commitid.scad.tmp commitid.scad ) autoincs: $(AUTO_INCS) $(AUTO_STLS_INCS) scads: $(addsuffix .auto.scad, $(AUTO_TOPLEVELS)) stls: $(addsuffix .auto.stl, $(AUTO_TOPLEVELS)) %.auto.scads: %.scad - $(MAKE) $(addsuffix .auto.scad, $(shell $(PLAY)/toplevel-find $*)) + $(MAKE) $(addsuffix .auto.scad, $(shell $(DUTILS)/toplevel-find $*)) %.auto.stls: - $(MAKE) $(addsuffix .auto.stl, $(shell $(PLAY)/toplevel-find $*)) + $(MAKE) $(addsuffix .auto.stl, $(shell $(DUTILS)/toplevel-find $*)) -include .*.d @@ -56,7 +57,7 @@ AUTOBASE=$(shell echo $(1) | perl -pe 's/,\w+\.auto$$//') funcs.scad: %.gcode: manual-gcode-generator %.m-g - $(PLAY)/$^ >$@.tmp && mv -f $@.tmp $@ + $(CWD)/$^ >$@.tmp && mv -f $@.tmp $@ %.dxf: %.eps pstoedit -dt -f "dxf: -polyaslines -mm" $< $@ @@ -68,7 +69,7 @@ funcs.scad: $(M4) -P >$@.tmp $< && mv -f $@.tmp $@ .PRECIOUS: %.auto.scad -%.auto.scad: $(PLAY)/toplevel-make Makefile $(PLAY)/toplevel-find +%.auto.scad: $(DUTILS)/toplevel-make Makefile $(DUTILS)/toplevel-find @echo ' write $@' $< $@ >$@.tmp @mv -f $@.tmp $@ -- 2.30.2