X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=Makefile;h=0ad7e19bd4549e54b8d2eea9ec33fd4707422fe6;hp=edd6f7a04a6f7d66a325c0ffc4a599a41961bd66;hb=ba7cb05a57c78ed29fddd5a078336c397ff5b2fb;hpb=e4b128edf9330323e3baac3542706de67a691073

diff --git a/Makefile b/Makefile
index edd6f7a..0ad7e19 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,18 +27,23 @@ 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
+
+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
+
 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
 
+$(shell set -xe; ./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 $*))
@@ -119,6 +125,18 @@ pandemic-quarantine-l%.eps: pandemic-quarantine-numbers.fig
 		fig2dev -D +$(notdir $*) -L eps <$< >$@.tmp
 	        @mv -f $@.tmp $@
 
+FILAMENTSPOOL_NUMBERS=$(shell seq 300 100 1500)
+filamentspool-number-n%.eps:	filamentspool-number.eps.pl
+	./$< $* >$@.tmp && mv -f $@.tmp $@
+
+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
 SCREWRECESSTEST_DXFS=$(foreach s,$(SCREWRECESSTEST_SIZES), \
 	screw-recess-test-number-s$s.dxf)
@@ -151,6 +169,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 $@'