X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=Makefile;h=8596f204b601ccda817889075986de0b0a9420da;hp=a2052616a669a0a304a5ffc21144aaf139197ff5;hb=8549519ed54637e38ceb0fea6edb7d417668fd8a;hpb=c4bef96ecaee63c8a679fb4b08ea2885e7be57e3

diff --git a/Makefile b/Makefile
index a205261..8596f20 100644
--- a/Makefile
+++ b/Makefile
@@ -3,38 +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
 
-AUTO_TOPLEVELS := $(foreach m, filamentspool, $(shell ./toplevel-find $m))
+USING_AUTOS ?= filamentspool xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover
+AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m))
+
+scads:		$(addsuffix .auto.scad, $(AUTO_TOPLEVELS))
+stls:		$(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
 
-scads:		$(addsuffix .ascad, $(AUTO_TOPLEVELS))
-stls:		$(addsuffix .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 $@ $<
-
-%.stl:		%.ascad
-		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) $<
 
 %.gcode:	manual-gcode-generator %.m-g
-		./$^ >$@.tmp && mv -f $@.tmp $@
+		$(PLAY)/$^ >$@.tmp && mv -f $@.tmp $@
 
 dovecliptest.stl: doveclip.scad
 
-%.ascad: toplevel-make Makefile toplevel-find
+%.auto.scad: $(PLAY)/toplevel-make Makefile $(PLAY)/toplevel-find
 		@echo ' write $@'
-		./$< $@ >$@.tmp
+		$< $@ >$@.tmp
 	        @mv -f $@.tmp $@
 
+.PRECIOUS:	%.stl %.gcode
+
 clean:
-		rm -f *~ *.stl *,*.scad *.gcode .*.d
+		rm -f *~ *.stl *.auto.scad *.gcode .*.d