X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=Makefile;h=05ba8b3bb9bfa980fa184a5a8d006436beb171e4;hp=3c6f1e9a496ff99e06e6add6556a1bff6c77b700;hb=a6c852f4e9fe862f2b66147ebcefada088452c9e;hpb=3b462ccc1bc389ce68873d61395ff05ed50693fa

diff --git a/Makefile b/Makefile
index 3c6f1e9..05ba8b3 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)
@@ -26,10 +27,14 @@ PLAY ?= $(CWD)
 
 CONFIG=$(PLAY)/slic3r-config.ini
 
-USING_AUTOS ?= filamentspool 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
+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
+
 AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m))
 
-AUTO_INCS = funcs.scad
+AUTO_INCS = funcs.scad utils.scad sealing-box.scad
 
 default:	autoincs scads
 
@@ -39,7 +44,7 @@ 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 $*))
@@ -128,6 +133,9 @@ filamentspool-number-n%.eps:	filamentspool-number.eps.pl
 FILAMENTSPOOL_DXFS=$(foreach n,$(FILAMENTSPOOL_NUMBERS), \
 	filamentspool-number-n$n.dxf)
 
+$(addsuffix .auto.stl, $(foreach f,$(FILAMENTSPOOL_AUTOS),$(shell \
+	./toplevel-find $f))): $(FILAMENTSPOOL_DXFS)
+
 filamentspool-numbers filamentspool.stl: $(FILAMENTSPOOL_DXFS)
 
 SCREWRECESSTEST_SIZES= 2 3 4 5 6
@@ -162,6 +170,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 $@'