sewing-table: InterlockEdgePlan: edge nearly there

[reprap-play.git] / Makefile

diff --git a/Makefile b/Makefile
index edd6f7a04a6f7d66a325c0ffc4a599a41961bd66..bd47f9cb668467df11f6c0d95ad627dc6ae4fc84 100644 (file)
--- 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,24 @@ 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 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; $(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 $*))
@@ -63,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
@@ -119,6 +127,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 \
+       $(PLAY)/toplevel-find $(PLAY)/$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 +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 $@'