X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=306f4f4979b5a398a0cc86253afa04217f64d314;hb=c269c6014b10f6f699f58155b773ce00d47b7bdf;hp=05ba8b3bb9bfa980fa184a5a8d006436beb171e4;hpb=0ffd00a22f02b870e4407414542f482a01b642e9;p=reprap-play.git diff --git a/Makefile b/Makefile index 05ba8b3..306f4f4 100644 --- a/Makefile +++ b/Makefile @@ -30,15 +30,15 @@ CONFIG=$(PLAY)/slic3r-config.ini FILAMENTSPOOL_AUTOS = filamentspool filamentspool-lt filamentspool-sm FILAMENTSPOOL_AUTOS += filamentspool-storarm3 -USING_AUTOS ?= $(FILAMENTSPOOL_AUTOS) xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook knifeblock pandemic-counter pattress-boxes-3-cover bike-lipo-box earring-stand +USING_AUTOS ?= $(FILAMENTSPOOL_AUTOS) xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook knifeblock pandemic-counter pattress-boxes-3-cover bike-lipo-box earring-stand sewing-table AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m)) -AUTO_INCS = funcs.scad utils.scad sealing-box.scad +AUTO_INCS = funcs.scad utils.scad sealing-box.scad sewing-table.scad default: autoincs scads -$(shell set -xe; ./commitid.scad.pl >commitid.scad.tmp; cmp commitid.scad.tmp commitid.scad || mv -f commitid.scad.tmp commitid.scad ) +$(shell set -xe; $(PLAY)/commitid.scad.pl >commitid.scad.tmp; cmp commitid.scad.tmp commitid.scad || mv -f commitid.scad.tmp commitid.scad ) autoincs: $(AUTO_INCS) scads: $(addsuffix .auto.scad, $(AUTO_TOPLEVELS)) @@ -134,7 +134,7 @@ FILAMENTSPOOL_DXFS=$(foreach n,$(FILAMENTSPOOL_NUMBERS), \ filamentspool-number-n$n.dxf) $(addsuffix .auto.stl, $(foreach f,$(FILAMENTSPOOL_AUTOS),$(shell \ - ./toplevel-find $f))): $(FILAMENTSPOOL_DXFS) + $(PLAY)/toplevel-find $(PLAY)/$f))): $(FILAMENTSPOOL_DXFS) filamentspool-numbers filamentspool.stl: $(FILAMENTSPOOL_DXFS)