chiark
/
gitweb
/
~ianmdlvl
/
reprap-play.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pawn cooler is good, try bigger
[reprap-play.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index af3f76d779b9c460164c520595c1c90477859616..b5d73e6122ecb4c268e2e06b34a9bccebcdc1cdf 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-3,30
+3,46
@@
HRR=/home/reprap
SLIC3R=$(HRR)/Slic3r/bin/slic3r
SKEINFORGE=python $(HRR)/reprappro-software.git/skeinforge/skeinforge_application/skeinforge_utilities/skeinforge_craft.py
SLIC3R=$(HRR)/Slic3r/bin/slic3r
SKEINFORGE=python $(HRR)/reprappro-software.git/skeinforge/skeinforge_application/skeinforge_utilities/skeinforge_craft.py
+CWD := $(shell pwd)
+PLAY ?= $(CWD)
+
CONFIG=slic3r-config.ini
CONFIG=slic3r-config.ini
-AUTO_TOPLEVELS := $(foreach m, filamentspool, $(shell ./toplevel-find $m))
+USING_AUTOS ?= filamentspool
+AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m))
-scads: $(addsuffix .scad, $(AUTO_TOPLEVELS))
-stls: $(addsuffix .stl, $(AUTO_TOPLEVELS))
+scads: $(addsuffix .
auto.
scad, $(AUTO_TOPLEVELS))
+stls: $(addsuffix .
auto.
stl, $(AUTO_TOPLEVELS))
default:
default:
+-include .*.d
+
%.stl: %.scad
%.stl: %.scad
- openscad -o $@ $<
+ 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 $@
%.gcode: $(CONFIG) %.stl
%.gcode: $(CONFIG) %.stl
- $(SLIC3R) --load $^ --output $@
+ $(SLIC3R) --load $^ --output $@.tmp
+ @mv -f $@.tmp $@
#%.gcode: %.stl
# $(SKEINFORGE) $<
%.gcode: manual-gcode-generator %.m-g
#%.gcode: %.stl
# $(SKEINFORGE) $<
%.gcode: manual-gcode-generator %.m-g
-
./$^ >$@.new && mv -f $@.new
$@
+
$(PLAY)/$^ >$@.tmp && mv -f $@.tmp
$@
dovecliptest.stl: doveclip.scad
dovecliptest.stl: doveclip.scad
-%.
scad: toplevel-make Makefile
toplevel-find
+%.
auto.scad: $(PLAY)/toplevel-make Makefile $(PLAY)/
toplevel-find
@echo ' write $@'
@echo ' write $@'
- ./$< $@ >$@.new
- @mv -f $@.new $@
+ $< $@ >$@.tmp
+ @mv -f $@.tmp $@
+
+.PRECIOUS: %.stl %.gcode
+
+clean:
+ rm -f *~ *.stl *.auto.scad *.gcode .*.d