X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=Makefile;h=00ced6916ac6e0d8b97f3a18ef5583218668d619;hp=98ebc48987c80c3cdecc27b3eacceae423b3605b;hb=0c52fcdabe7e3b4a221edf19b5fabf91bbebe36a;hpb=2306d7a8081ca9b04c2101be7023a24c70014a9f

diff --git a/Makefile b/Makefile
index 98ebc48..00ced69 100644
--- a/Makefile
+++ b/Makefile
@@ -8,12 +8,17 @@ 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 crossbar-computer-led-mount
 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
@@ -25,8 +30,10 @@ default:
 		@rm .$@.d.tmp
 	        mv -f $*.tmp.stl $@
 
-%.gcode:	$(CONFIG) %.stl
-		$(SLIC3R) --load $^ --ignore-nonexistent-config --load $*.slic3r --output $@.tmp
+%.gcode:	%.stl $(CONFIG)
+		$(SLIC3R) --load $(CONFIG) \
+			--ignore-nonexistent-config --load $*.slic3r \
+			--output $@.tmp $<
 	        @mv -f $@.tmp $@
 
 #%.gcode:	%.stl