X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=Makefile;h=2c677dc386c8b6ed1c2528ef20bc5b8a46da1b13;hp=881588b98529a9c85a47e44470ef609df2143776;hb=200fce22c4d13f7a9eddaf41383ed26ff082d44f;hpb=5fdc3fd6d60f4c345fda8cd777213eced3ecf666

diff --git a/Makefile b/Makefile
index 881588b..2c677dc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,53 @@
 
 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
+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:	$(CONFIG) %.stl
-		$(SLIC3R) --load $^ --output $@
+		$(SLIC3R) --load $^ --ignore-nonexistent-config --load $*.slic3r --output $@.tmp
+	        @mv -f $@.tmp $@
+
+#%.gcode:	%.stl
+#		$(SKEINFORGE) $<
 
 %.gcode:	manual-gcode-generator %.m-g
-		./$^ >$@.new && mv -f $@.new $@
+		$(PLAY)/$^ >$@.tmp && mv -f $@.tmp $@
+
+dovecliptest.stl: doveclip.scad
+
+%.auto.scad: $(PLAY)/toplevel-make Makefile $(PLAY)/toplevel-find
+		@echo ' write $@'
+		$< $@ >$@.tmp
+	        @mv -f $@.tmp $@
+
+.PRECIOUS:	%.stl %.gcode
+
+clean:
+		rm -f *~ *.stl *.auto.scad *.gcode .*.d