X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=Makefile;h=8654e5b0d1180124ec3f227f129f812a59738d99;hp=317fe3987b334c153c4819ce5356e7be6eb68439;hb=9290c3e754ce326a16d15d8f033897cf97be6897;hpb=949c67dd9deab6f8359127e646a8f038498ef2d1

diff --git a/Makefile b/Makefile
index 317fe39..8654e5b 100644
--- a/Makefile
+++ b/Makefile
@@ -8,21 +8,33 @@ PLAY ?= $(CWD)
 
 CONFIG=slic3r-config.ini
 
-USING_AUTOS ?= filamentspool
+USING_AUTOS ?= filamentspool xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck.scad
 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 -d .$@.d -o $@ $<
-
-%.gcode:	$(CONFIG) %.stl
-		$(SLIC3R) --load $^ --output $@
+		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) $<
@@ -37,5 +49,7 @@ dovecliptest.stl: doveclip.scad
 		$< $@ >$@.tmp
 	        @mv -f $@.tmp $@
 
+.PRECIOUS:	%.stl %.gcode
+
 clean:
 		rm -f *~ *.stl *.auto.scad *.gcode .*.d