Makefile

2 files changed, 27 insertions, 14 deletions

diff --git a/.gitignore b/.gitignore
index 928e078..bc35029 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.gcode
-*.stl
+stlout/
+pngout/
diff --git a/Makefile b/Makefile
index a47a419..2c2899e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,37 +1,49 @@
 SCAD=openscad
 
 STLOPTS= --export-format binstl
-PNGOPTS= --viewall --autocenter --imgsize 400,400 --render
+PNGOPTS= --colorscheme BeforeDawn --viewall --autocenter --imgsize 800,800 \
+	 --render
+
+STLDIR = stlout
+PNGDIR = pngout
 
 SRC = $(wildcard *.scad)
 
-STL = $(SRC:.scad=.stl)
-PNG = $(SRC:.scad=.png)
+STL = $(addprefix $(STLDIR)/,$(SRC:.scad=.stl))
+PNG = $(addprefix $(PNGDIR)/,$(SRC:.scad=.png))
 
+.PHONY: _default
 _default: stl
 
+.PHONY: all
 all: clean stl png
 
-stl: $(STL)
+.PHONY: stl
+stl: $(STLDIR) $(STL)
 
-gridfinity.stl: gridfinity.scad
+$(STLDIR)/gridfinity.stl: gridfinity.scad
 	@echo
 
-%.stl: %.scad
+$(STLDIR)/%.stl: %.scad
 	@echo [ STL ] $<
 	@$(SCAD) $(STLOPTS) -o $@ $<
 
+png: $(PNGDIR) $(PNG)
 
-png: $(PNG)
-
-gridfinity.png: gridfinity.scad
+$(PNGDIR)/gridfinity.png: gridfinity.scad
 	@echo
 
-%.png: %.scad
+$(PNGDIR)/%.png: %.scad
 	@echo [ PNG ] $<
-	@$(SCAD) $(SCADOPTS) -o $@ $<
+	@$(SCAD) $(PNGOPTS) -o $@ $<
+
+$(PNGDIR):
+	@mkdir -p $(PNGDIR)/
+
+$(STLDIR):
+	@mkdir -p $(STLDIR)/
 
 .PHONY: clean
 clean:
-	@rm -f *.stl
-	@rm -f *.png
+	@rm -rf $(STLDIR)/
+	@rm -rf $(PNGDIR)/