X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=Makefile;h=00ced6916ac6e0d8b97f3a18ef5583218668d619;hp=628cbf1b5daf70fae90a1dfa614e652726c259a6;hb=c41c09aa5ed0cbecf95dcdd4f0271dd5196a032b;hpb=b4c42c12319e5304d22ab18e0eef20fe1ec6c008

diff --git a/Makefile b/Makefile
index 628cbf1..00ced69 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,55 @@
 
 HRR=/home/reprap
 SLIC3R=$(HRR)/Slic3r/bin/slic3r
+SKEINFORGE=python $(HRR)/reprappro-software.git/skeinforge/skeinforge_application/skeinforge_utilities/skeinforge_craft.py
+
+CWD := $(shell pwd)
+PLAY ?= $(CWD)
+
+CONFIG=slic3r-config.ini
+
+USING_AUTOS ?= filamentspool xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount
+AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m))
+
+scads:		$(addsuffix .auto.scad, $(AUTO_TOPLEVELS))
+stls:		$(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
+
+%.auto.scads:
+	$(MAKE) $(addsuffix .auto.scad, $(shell $(PLAY)/toplevel-find $*))
+%.auto.stls:
+	$(MAKE) $(addsuffix .auto.stl, $(shell $(PLAY)/toplevel-find $*))
 
 default:
 
+-include .*.d
+
 %.stl:		%.scad
-		openscad -o $@ $<
+		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 $@
+
+%.gcode:	%.stl $(CONFIG)
+		$(SLIC3R) --load $(CONFIG) \
+			--ignore-nonexistent-config --load $*.slic3r \
+			--output $@.tmp $<
+	        @mv -f $@.tmp $@
+
+#%.gcode:	%.stl
+#		$(SKEINFORGE) $<
+
+%.gcode:	manual-gcode-generator %.m-g
+		$(PLAY)/$^ >$@.tmp && mv -f $@.tmp $@
+
+dovecliptest.stl: doveclip.scad
+
+%.auto.scad: $(PLAY)/toplevel-make Makefile $(PLAY)/toplevel-find
+		@echo ' write $@'
+		$< $@ >$@.tmp
+	        @mv -f $@.tmp $@
 
-%.gcode:	%.stl
-		$(SLIC3R) --load slic3r-config.ini $< --output $@
+.PRECIOUS:	%.stl %.gcode
 
+clean:
+		rm -f *~ *.stl *.auto.scad *.gcode .*.d