X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=1ae233f50ebdee944c2704e7f25ac3a020a16c52;hb=2601060e2190c116ad7a3d743cef43a60afc9ad8;hp=ce63b8dc9dfc9a648a88c45fb098155500ccefed;hpb=779a304ce2ba43b18d2467807c4325b52ab4aa90;p=reprap-play.git

diff --git a/Makefile b/Makefile
index ce63b8d..1ae233f 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ 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
+USING_AUTOS ?= filamentspool xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook knifeblock
 AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m))
 
 AUTO_INCS = funcs.scad
@@ -48,6 +48,8 @@ stls:		$(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
 %:		%.cpp
 		cpp -nostdinc -P <$< >$@.tmp && mv -f $@.tmp $@
 
+funcs.scad:
+
 #%.gcode:	%.stl
 #		$(SKEINFORGE) $<
 
@@ -56,17 +58,27 @@ stls:		$(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
 
 dovecliptest.stl: doveclip.scad $(AUTO_INCS)
 
-KNIFEBLOCK_LAYERS=1 2 3 4 5 6
-KNIFEBLOCK_LAYER_FILES=$(foreach l,$(KNIFEBLOCK_LAYERS), \
-	knifeblock-knives-l$l.dxf)
+KNIFEBLOCK_KNIVES= 0 1 2
+KNIFEBLOCK_TEMPLATES= bl hl
+KNIFEBLOCK_TEMPLATE_FILES=\
+	$(foreach k,$(KNIFEBLOCK_KNIVES), \
+	$(foreach t,$(KNIFEBLOCK_TEMPLATES), \
+	knifeblock-knives-t$k$t.dxf))
 
-knifeblock-knives-layers: $(KNIFEBLOCK_LAYER_FILES)
+knifeblock-knives-templates knifeblock.stl: $(KNIFEBLOCK_TEMPLATE_FILES)
 
-knifeblock-knives-l%.dxf: knifeblock-knives-filter knifeblock-knives-trace.fig
-		./$< $* <$(filter %.fig, $^) >$@.tmp.fig
-		fig2dev -L eps <$@.tmp.fig >$@.tmp.eps
+knifeblock-knives-t%.dxf: knifeblock-knives-filter knifeblock-knives-trace.fig
+		./$< $(notdir $*) <$(filter %.fig, $^) >$@.tmp.fig
+		fig2dev -D -30 -L eps <$@.tmp.fig >$@.tmp.eps
 		pstoedit -dt -f "dxf: -polyaslines -mm" $@.tmp.eps $@
 
+pandemic-counter-l%.eps: pandemic-counter-letters.fig
+		fig2dev -D +$(notdir $*) -L eps <$< >$@.tmp
+	        @mv -f $@.tmp $@
+
+%.dxf:		%.eps
+		pstoedit -dt -f "dxf: -polyaslines -mm" $< $@
+
 %:		%.pl
 		./$< >$@.tmp && mv -f $@.tmp $@