X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=Makefile;h=3116b1b8c21e9ecd6d1538f6316158da62724536;hp=17510585119a47760056cfc01c38ec14db7b5e75;hb=cf502aeac948cda14d782c318aefdcae416a0a49;hpb=c48402da50adbd9ee807ccd78835187a1af3f950

diff --git a/Makefile b/Makefile
index 1751058..3116b1b 100644
--- a/Makefile
+++ b/Makefile
@@ -8,22 +8,32 @@ 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
 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 $*.tmp.stl $<
-	        @mv -f $*.tmp.stl $@
-
-%.gcode:	$(CONFIG) %.stl
-		$(SLIC3R) --load $^ --output $@.tmp
+		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