X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=Makefile;h=bd47f9cb668467df11f6c0d95ad627dc6ae4fc84;hp=55175070a06e0522d5108a8d65bd8e9d8a2205ef;hb=55000fa41db8d2fb6c8aba14cc5e47148c8fc189;hpb=f54b16a6f824dea85adbe3011a0223610e9cff89

diff --git a/Makefile b/Makefile
index 5517507..bd47f9c 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 bike-stalk-led-mount
+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 bike-stalk-led-mount 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))
@@ -70,6 +70,7 @@ AUTOBASE=$(shell echo $(1) | perl -pe 's/,\w+\.auto$$//')
 
 %.gcode-sd:	%.gcode
 		mount /media/sd
+		rm -f /media/sd/JOB.* /media/sd/job.*
 		cp $^ /media/sd/JOB.G
 		sleep 0.5
 		umount /media/sd
@@ -134,7 +135,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)