X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=b21432af57457d8f10a82ca030455a78619db099;hb=93e75099ed8f21131e5dfc83a9aaa6bfc7d39110;hp=a2052616a669a0a304a5ffc21144aaf139197ff5;hpb=c4bef96ecaee63c8a679fb4b08ea2885e7be57e3;p=reprap-play.git diff --git a/Makefile b/Makefile index a205261..b21432a 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,8 @@ CONFIG=slic3r-config.ini AUTO_TOPLEVELS := $(foreach m, filamentspool, $(shell ./toplevel-find $m)) -scads: $(addsuffix .ascad, $(AUTO_TOPLEVELS)) -stls: $(addsuffix .stl, $(AUTO_TOPLEVELS)) +scads: $(addsuffix .auto.scad, $(AUTO_TOPLEVELS)) +stls: $(addsuffix .auto.stl, $(AUTO_TOPLEVELS)) default: @@ -17,9 +17,6 @@ default: %.stl: %.scad openscad -d .$@.d -o $@ $< -%.stl: %.ascad - openscad -d .$@.d -o $@ $< - %.gcode: $(CONFIG) %.stl $(SLIC3R) --load $^ --output $@ @@ -31,10 +28,10 @@ default: dovecliptest.stl: doveclip.scad -%.ascad: toplevel-make Makefile toplevel-find +%.auto.scad: toplevel-make Makefile toplevel-find @echo ' write $@' ./$< $@ >$@.tmp @mv -f $@.tmp $@ clean: - rm -f *~ *.stl *,*.scad *.gcode .*.d + rm -f *~ *.stl *.auto.scad *.gcode .*.d