chiark
/
gitweb
/
~ianmdlvl
/
reprap-play.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8ff1b6a
)
Makefile support out of tree
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 20 Sep 2012 03:27:41 +0000
(
04:27
+0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 20 Sep 2012 03:27:41 +0000
(
04:27
+0100)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index b21432af57457d8f10a82ca030455a78619db099..df8862d648336ffb5e0dfde465375e33bfa5ae47 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-3,9
+3,12
@@
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
+PLAY ?= .
+
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 .auto.scad, $(AUTO_TOPLEVELS))
stls: $(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
scads: $(addsuffix .auto.scad, $(AUTO_TOPLEVELS))
stls: $(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
@@
-24,13
+27,13
@@
default:
# $(SKEINFORGE) $<
%.gcode: manual-gcode-generator %.m-g
# $(SKEINFORGE) $<
%.gcode: manual-gcode-generator %.m-g
-
.
/$^ >$@.tmp && mv -f $@.tmp $@
+
$(PLAY)
/$^ >$@.tmp && mv -f $@.tmp $@
dovecliptest.stl: doveclip.scad
dovecliptest.stl: doveclip.scad
-%.auto.scad:
toplevel-make Makefile
toplevel-find
+%.auto.scad:
$(PLAY)/toplevel-make Makefile $(PLAY)/
toplevel-find
@echo ' write $@'
@echo ' write $@'
-
./
$< $@ >$@.tmp
+ $< $@ >$@.tmp
@mv -f $@.tmp $@
clean:
@mv -f $@.tmp $@
clean: