pawn 3 skirts

[reprap-play.git] / Makefile

diff --git a/Makefile b/Makefile
index feb5c2876ea4697a8194869f9e65cb471600e797..cf4539157cc98d5025f519ec1519e45cfc852ca3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,16 +14,28 @@ 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 $@.tmp $<
-               @mv -f $@.tmp $@
-
-%.gcode:       $(CONFIG) %.stl
-               $(SLIC3R) --load $^ --output $@.tmp
+               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 $@
+
+%.slic3r:
+
+%.gcode:       %.stl %.slic3r $(CONFIG)
+               $(SLIC3R) --load $(CONFIG) \
+                       --ignore-nonexistent-config --load $*.slic3r \
+                       --output $@.tmp $<
                @mv -f $@.tmp $@
 
 #%.gcode:      %.stl