X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=Makefile;h=937bcc9dc95ceeea0c2cb096f35c5e99c1af6afb;hp=da1772ea80f62f00ea0e940920c3f40e455042d7;hb=749afaadf7c82b0ff8e8a9216ea1b196a925deca;hpb=e34efeafaea0b18c0137a9f2fa9cc0655b51d88d

diff --git a/Makefile b/Makefile
index da1772e..937bcc9 100644
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,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
+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
 AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m))
 
+AUTO_INCS = funcs.scad
+
+default:	autoincs scads
+
+autoincs:	$(AUTO_INCS)
 scads:		$(addsuffix .auto.scad, $(AUTO_TOPLEVELS))
 stls:		$(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
 
@@ -19,37 +24,83 @@ stls:		$(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
 %.auto.stls:
 	$(MAKE) $(addsuffix .auto.stl, $(shell $(PLAY)/toplevel-find $*))
 
-default:
-
 -include .*.d
 
-%.stl:		%.scad
+%.stl:		%.scad $(AUTO_INCS)
 		openscad -d .$@.d.tmp -o $*.tmp.stl $<
 		@rm -f $@
 		@sed -e 's/\.tmp\.stl:/.stl:/' <.$@.d.tmp >.$@.d
 		@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 $@
 
+%.gcode-sd:	%.gcode
+		mount /media/sd
+		cp $^ /media/sd/JOB.G
+		sleep 0.5
+		umount /media/sd
+
+%:		%.cpp
+		cpp -nostdinc -P <$< >$@.tmp && mv -f $@.tmp $@
+
+funcs.scad:
+
 #%.gcode:	%.stl
 #		$(SKEINFORGE) $<
 
 %.gcode:	manual-gcode-generator %.m-g
 		$(PLAY)/$^ >$@.tmp && mv -f $@.tmp $@
 
-dovecliptest.stl: doveclip.scad
+dovecliptest.stl: doveclip.scad $(AUTO_INCS)
+
+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-templates knifeblock.stl: $(KNIFEBLOCK_TEMPLATE_FILES)
+
+.PRECIOUS: knifeblock-knives-t%.dxf
+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 $@
+
+PANDEMICCOUNTER_LETTERS=30 31 32 33 34 35
+PANDEMICCOUNTER_DXFS=$(foreach l,$(PANDEMICCOUNTER_LETTERS), \
+	pandemic-counter-l$l.dxf)
+
+pandemic-counter-letters 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 $@
+
+%.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
+		rm -f *~ *.stl *.auto.scad *.gcode .*.d $(AUTO_INCS)