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

diff --git a/Makefile b/Makefile
index 628cbf1..a205261 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,40 @@
 
 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 .ascad, $(AUTO_TOPLEVELS))
+stls:		$(addsuffix .stl, $(AUTO_TOPLEVELS))
 
 default:
 
+-include .*.d
+
 %.stl:		%.scad
-		openscad -o $@ $<
+		openscad -d .$@.d -o $@ $<
+
+%.stl:		%.ascad
+		openscad -d .$@.d -o $@ $<
+
+%.gcode:	$(CONFIG) %.stl
+		$(SLIC3R) --load $^ --output $@
+
+#%.gcode:	%.stl
+#		$(SKEINFORGE) $<
+
+%.gcode:	manual-gcode-generator %.m-g
+		./$^ >$@.tmp && mv -f $@.tmp $@
+
+dovecliptest.stl: doveclip.scad
 
-%.gcode:	%.stl
-		$(SLIC3R) --load slic3r-config.ini $< --output $@
+%.ascad: toplevel-make Makefile toplevel-find
+		@echo ' write $@'
+		./$< $@ >$@.tmp
+	        @mv -f $@.tmp $@
 
+clean:
+		rm -f *~ *.stl *,*.scad *.gcode .*.d