X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=Makefile;h=a3c57c5a6389954a610d2a53b3e9c4f22df7b201;hp=055b0d41682de916a3ff9b84d966a1d616dfffaf;hb=4b018134510db18e479a5b80073ade0e9a412561;hpb=58673dbf6777842342f4dc8ad0dc219403cbba09

diff --git a/Makefile b/Makefile
index 055b0d4..a3c57c5 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 pandemic-counter pattress-boxes-3-cover
 AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m))
 
 AUTO_INCS = funcs.scad
@@ -33,9 +33,13 @@ stls:		$(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
 		@rm .$@.d.tmp
 	        mv -f $*.tmp.stl $@
 
+AUTOBASE=$(shell echo $(1) | perl -pe 's/,\w+\.auto$$//')
+
 %.gcode:	%.stl $(CONFIG)
 		$(SLIC3R) --load $(CONFIG) \
-			--ignore-nonexistent-config --load $*.slic3r \
+			--ignore-nonexistent-config \
+			--load $(call AUTOBASE,$*).slic3r \
+			--load $*.slic3r \
 			--output $@.tmp $<
 	        @mv -f $@.tmp $@
 
@@ -48,6 +52,8 @@ stls:		$(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
 %:		%.cpp
 		cpp -nostdinc -P <$< >$@.tmp && mv -f $@.tmp $@
 
+funcs.scad:
+
 #%.gcode:	%.stl
 #		$(SKEINFORGE) $<
 
@@ -57,28 +63,81 @@ stls:		$(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
 dovecliptest.stl: doveclip.scad $(AUTO_INCS)
 
 KNIFEBLOCK_KNIVES= 0 1 2
-KNIFEBLOCK_TEMPLATES= b h
+KNIFEBLOCK_TEMPLATES= bl hl
 KNIFEBLOCK_TEMPLATE_FILES=\
 	$(foreach k,$(KNIFEBLOCK_KNIVES), \
 	$(foreach t,$(KNIFEBLOCK_TEMPLATES), \
 	knifeblock-knives-t$k$t.dxf))
 
-knifeblock-knives-templates: $(KNIFEBLOCK_TEMPLATE_FILES)
+knifeblock-knives-templates knifeblock.stl: $(KNIFEBLOCK_TEMPLATE_FILES)
 
+.PRECIOUS: knifeblock-knives-t%.dxf
 knifeblock-knives-t%.dxf: knifeblock-knives-filter knifeblock-knives-trace.fig
-		./$< $* <$(filter %.fig, $^) >$@.tmp.fig
-		fig2dev -L eps <$@.tmp.fig >$@.tmp.eps
+		./$< $(notdir $*) <$(filter %.fig, $^) >$@.tmp.fig
+		fig2dev -D -30 -L eps <$@.tmp.fig >$@.tmp.eps
 		pstoedit -dt -f "dxf: -polyaslines -mm" $@.tmp.eps $@
 
+PANDEMICCOUNTER_LETTERS=30 31 32 33 34 35
+PANDEMICCOUNTER_DXFS=$(foreach l,$(PANDEMICCOUNTER_LETTERS), \
+	pandemic-counter-l$l.dxf)
+
+pandemic-counter-letters: $(PANDEMICCOUNTER_DXFS)
+pandemic-counter%.stl: $(PANDEMICCOUNTER_DXFS)
+
+.PRECIOUS: pandemic-counter-l%.eps
+pandemic-counter-l%.eps: pandemic-counter-letters.fig
+		fig2dev -D +$(notdir $*) -L eps <$< >$@.tmp
+	        @mv -f $@.tmp $@
+
+PANDEMICQUARANTINES_NUMBERS=1 2
+PANDEMICQUARANTINES_DXFS=$(foreach l,$(PANDEMICQUARANTINES_NUMBERS), \
+	pandemic-quarantine-l$l.dxf)
+
+pandemic-quarantine-numbers: $(PANDEMICQUARANTINES_DXFS)
+pandemic-quarantine%.stl: $(PANDEMICQUARANTINES_DXFS)
+
+.PRECIOUS: pandemic-quarantine-l%.eps
+pandemic-quarantine-l%.eps: pandemic-quarantine-numbers.fig
+		fig2dev -D +$(notdir $*) -L eps <$< >$@.tmp
+	        @mv -f $@.tmp $@
+
+SCREWRECESSTEST_SIZES= 2 3 4 5 6
+SCREWRECESSTEST_DXFS=$(foreach s,$(SCREWRECESSTEST_SIZES), \
+	screw-recess-test-number-s$s.dxf)
+
+screw-recess-test-number-s%.fig: screw-recess-test-number.fig.pl
+	./$< $* >$@.tmp && mv -f $@.tmp $@
+
+screw-recess-test-number-s%.eps: screw-recess-test-number-s%.fig
+		fig2dev -L eps <$< >$@.tmp
+	        @mv -f $@.tmp $@
+
+screw-recess-test-numbers screw-recess-test.stl: $(SCREWRECESSTEST_DXFS)
+
+question-question.eps: question-question.fig
+		fig2dev -L eps <$< >$@.tmp
+	        @mv -f $@.tmp $@
+
+question-token.stl: question-question.dxf
+
+.PRECIOUS: $(SCREWRECESSTEST_DXFS) $(SCREWRECESSTEST_DXFS) \
+	$(foreach s,$(SCREWRECESSTEST_SIZES), \
+		screw-recess-test-number-s$s.fig \
+		screw-recess-test-number-s$s.eps)
+
+%.dxf:		%.eps
+		pstoedit -dt -f "dxf: -polyaslines -mm" $< $@
+
 %:		%.pl
 		./$< >$@.tmp && mv -f $@.tmp $@
 
+.PRECIOUS: %.auto.scad
 %.auto.scad: $(PLAY)/toplevel-make Makefile $(PLAY)/toplevel-find
 		@echo ' write $@'
 		$< $@ >$@.tmp
 	        @mv -f $@.tmp $@
 
-.PRECIOUS:	%.stl %.gcode
+.PRECIOUS:	%.stl %.gcode %.eps %.dxf
 
 clean:
 		rm -f *~ *.stl *.auto.scad *.gcode .*.d $(AUTO_INCS)