Merge branch 'master' of chiark:/u/ianmdlvl/reprap/play

[reprap-play.git] / Makefile

diff --git a/Makefile b/Makefile
index a5307298986a1df7a56042f25b62725de27e8070..af3f76d779b9c460164c520595c1c90477859616 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,16 +5,28 @@ SKEINFORGE=python $(HRR)/reprappro-software.git/skeinforge/skeinforge_applicatio
 
 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
-               $(SKEINFORGE) $<
+%.gcode:       $(CONFIG) %.stl
+               $(SLIC3R) --load $^ --output $@
 
-#$(CONFIG) 
-#              $(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 $@