X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=339d710b25547b9755597b7a6020699ef7db0551;hb=75409ef6f0bfe2b535f66af16333180adebf88df;hp=d31e0a909e4c5747a1d7de2e86e11c6066e512d6;hpb=aec6f62c61e0d41677238ce144d37755443e855b;p=reprap-play.git

diff --git a/Makefile b/Makefile
index d31e0a9..339d710 100644
--- a/Makefile
+++ b/Makefile
@@ -3,20 +3,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 xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket
+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:
 
-%.stl:		%.scad
-		openscad -o $@ $<
+-include .*.d
 
-%.gcode:	$(CONFIG) %.stl
-		$(SLIC3R) --load $^ --output $@
+%.stl:		%.scad
+		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
-		./$^ >$@.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