X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=b5d73e6122ecb4c268e2e06b34a9bccebcdc1cdf;hb=0af14d8ca23ad6e142c4aa6e6690ce7a5bff6421;hp=df8862d648336ffb5e0dfde465375e33bfa5ae47;hpb=e85299dee50423877921c0940f814700540f18ba;p=reprap-play.git

diff --git a/Makefile b/Makefile
index df8862d..b5d73e6 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,8 @@ HRR=/home/reprap
 SLIC3R=$(HRR)/Slic3r/bin/slic3r
 SKEINFORGE=python $(HRR)/reprappro-software.git/skeinforge/skeinforge_application/skeinforge_utilities/skeinforge_craft.py
 
-PLAY ?= .
+CWD := $(shell pwd)
+PLAY ?= $(CWD)
 
 CONFIG=slic3r-config.ini
 
@@ -18,10 +19,15 @@ default:
 -include .*.d
 
 %.stl:		%.scad
-		openscad -d .$@.d -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 $^ --output $@.tmp
+	        @mv -f $@.tmp $@
 
 #%.gcode:	%.stl
 #		$(SKEINFORGE) $<
@@ -36,5 +42,7 @@ dovecliptest.stl: doveclip.scad
 		$< $@ >$@.tmp
 	        @mv -f $@.tmp $@
 
+.PRECIOUS:	%.stl %.gcode
+
 clean:
 		rm -f *~ *.stl *.auto.scad *.gcode .*.d