X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=339d710b25547b9755597b7a6020699ef7db0551;hb=81c9d59882fbf9f9f7a337c233d24383c4836c33;hp=b21432af57457d8f10a82ca030455a78619db099;hpb=11e8ce2de1cb7a6843037ab0e9d52c93b4b68104;p=reprap-play.git

diff --git a/Makefile b/Makefile
index b21432a..339d710 100644
--- a/Makefile
+++ b/Makefile
@@ -3,35 +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
+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) $<
 
 %.gcode:	manual-gcode-generator %.m-g
-		./$^ >$@.tmp && mv -f $@.tmp $@
+		$(PLAY)/$^ >$@.tmp && mv -f $@.tmp $@
 
 dovecliptest.stl: doveclip.scad
 
-%.auto.scad: 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 *.auto.scad *.gcode .*.d