From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 16 Sep 2012 17:34:31 +0000 (+0100)
Subject: Makefile autogenerates scads are now .auto.scad
X-Git-Tag: filamentspool-v2-release~796
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=commitdiff_plain;h=11e8ce2de1cb7a6843037ab0e9d52c93b4b68104

Makefile autogenerates scads are now .auto.scad
---

diff --git a/.gitignore b/.gitignore
index 960d8cb..b6c47e6 100644
--- 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 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