X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=2c677dc386c8b6ed1c2528ef20bc5b8a46da1b13;hb=fb7c54f97848578623c7f68e873d0dd9e7b2e2db;hp=af3f76d779b9c460164c520595c1c90477859616;hpb=fcd425d28e0fd254673250e4c5d13db7b98aab48;p=reprap-play.git

diff --git a/Makefile b/Makefile
index af3f76d..2c677dc 100644
--- a/Makefile
+++ b/Makefile
@@ -3,30 +3,51 @@ 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
 
-AUTO_TOPLEVELS := $(foreach m, filamentspool, $(shell ./toplevel-find $m))
+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))
 
-scads:		$(addsuffix .scad, $(AUTO_TOPLEVELS))
-stls:		$(addsuffix .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
 
-%.scad: toplevel-make Makefile toplevel-find
+%.auto.scad: $(PLAY)/toplevel-make Makefile $(PLAY)/toplevel-find
 		@echo ' write $@'
-		./$< $@ >$@.new
-	        @mv -f $@.new $@
+		$< $@ >$@.tmp
+	        @mv -f $@.tmp $@
+
+.PRECIOUS:	%.stl %.gcode
+
+clean:
+		rm -f *~ *.stl *.auto.scad *.gcode .*.d