X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=Makefile;h=a5e5278c54d9c6d643999ccf3ac443a5e1944f50;hp=98ebc48987c80c3cdecc27b3eacceae423b3605b;hb=382b1f42ea067bfa5ea594bc2a971057b5105ad4;hpb=53a30809514a5f7530f2b8d4158da21cec2e6657

diff --git a/Makefile b/Makefile
index 98ebc48..a5e5278 100644
--- a/Makefile
+++ b/Makefile
@@ -6,14 +6,19 @@ SKEINFORGE=python $(HRR)/reprappro-software.git/skeinforge/skeinforge_applicatio
 CWD := $(shell pwd)
 PLAY ?= $(CWD)
 
-CONFIG=slic3r-config.ini
+CONFIG=$(PLAY)/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,10 +30,15 @@ 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 $@
 
+%:		%.cpp
+		cpp -nostdinc -P <$< >$@.tmp && mv -f $@.tmp $@
+
 #%.gcode:	%.stl
 #		$(SKEINFORGE) $<