X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=bd47f9cb668467df11f6c0d95ad627dc6ae4fc84;hb=a650f332ffa97b047e9714bb41da7f51697201e8;hp=6bff3bf02ec9a7a0ebca32c907ab97326bcc8c11;hpb=654ad9f16a362a2f6a2af9fda297e5f51f7ba996;p=reprap-play.git

diff --git a/Makefile b/Makefile
index 6bff3bf..bd47f9c 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,7 @@
 
 HRR=/home/reprap
 SLIC3R=$(HRR)/Slic3r/bin/slic3r
+M4=m4
 SKEINFORGE=python $(HRR)/reprappro-software.git/skeinforge/skeinforge_application/skeinforge_utilities/skeinforge_craft.py
 
 CWD := $(shell pwd)
@@ -27,22 +28,23 @@ PLAY ?= $(CWD)
 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
+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
+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))
 stls:		$(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
 
-%.auto.scads:
+%.auto.scads: %.scad
 	$(MAKE) $(addsuffix .auto.scad, $(shell $(PLAY)/toplevel-find $*))
 %.auto.stls:
 	$(MAKE) $(addsuffix .auto.stl, $(shell $(PLAY)/toplevel-find $*))
@@ -68,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
@@ -132,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)
 
@@ -168,6 +171,9 @@ lemon-stand.stl: lemon-stand.scad
 %:		%.pl
 		./$< >$@.tmp && mv -f $@.tmp $@
 
+%:		%.m4
+		$(M4) -P >$@.tmp $< && mv -f $@.tmp $@
+
 .PRECIOUS: %.auto.scad
 %.auto.scad: $(PLAY)/toplevel-make Makefile $(PLAY)/toplevel-find
 		@echo ' write $@'