X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=Makefile;h=af3f76d779b9c460164c520595c1c90477859616;hp=628cbf1b5daf70fae90a1dfa614e652726c259a6;hb=7eedab3e04eae517f990017b5af5a3cd2afcf6dd;hpb=b4c42c12319e5304d22ab18e0eef20fe1ec6c008

diff --git a/Makefile b/Makefile
index 628cbf1..af3f76d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,32 @@
 
 HRR=/home/reprap
 SLIC3R=$(HRR)/Slic3r/bin/slic3r
+SKEINFORGE=python $(HRR)/reprappro-software.git/skeinforge/skeinforge_application/skeinforge_utilities/skeinforge_craft.py
+
+CONFIG=slic3r-config.ini
+
+AUTO_TOPLEVELS := $(foreach m, filamentspool, $(shell ./toplevel-find $m))
+
+scads:		$(addsuffix .scad, $(AUTO_TOPLEVELS))
+stls:		$(addsuffix .stl, $(AUTO_TOPLEVELS))
 
 default:
 
 %.stl:		%.scad
 		openscad -o $@ $<
 
-%.gcode:	%.stl
-		$(SLIC3R) --load slic3r-config.ini $< --output $@
+%.gcode:	$(CONFIG) %.stl
+		$(SLIC3R) --load $^ --output $@
+
+#%.gcode:	%.stl
+#		$(SKEINFORGE) $<
+
+%.gcode:	manual-gcode-generator %.m-g
+		./$^ >$@.new && mv -f $@.new $@
+
+dovecliptest.stl: doveclip.scad
 
+%.scad: toplevel-make Makefile toplevel-find
+		@echo ' write $@'
+		./$< $@ >$@.new
+	        @mv -f $@.new $@