Makefile autogenerates scads are now .auto.scad

diff --git a/.gitignore b/.gitignore
index 960d8cbd9dff7d60ba42537bad5da1cecb32cd1d..b6c47e69e2138fe88ddbded1708615aae025b236 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,6 @@
 light-bracket.stl
 *.aside
 *.stl
-*,*.ascad
+*,*.auto.scad
 .*.d
 *.tmp

diff --git a/Makefile b/Makefile
index a2052616a669a0a304a5ffc21144aaf139197ff5..b21432af57457d8f10a82ca030455a78619db099 100644 (file)
--- 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