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
xeno-drivebay-bracket: remove obsolete setting
[reprap-play.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index a2052616a669a0a304a5ffc21144aaf139197ff5..4942b59f727476a3b2f3ffeb27d0df54a57d09b9 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-3,38
+3,53
@@
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 xeno-drivebay-bracket
+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 .ascad, $(AUTO_TOPLEVELS))
-stls: $(addsuffix .stl, $(AUTO_TOPLEVELS))
+%.auto.scads:
+ $(MAKE) $(addsuffix .auto.scad, $(shell $(PLAY)/toplevel-find $*))
+%.auto.stls:
+ $(MAKE) $(addsuffix .auto.stl, $(shell $(PLAY)/toplevel-find $*))
default:
-include .*.d
%.stl: %.scad
default:
-include .*.d
%.stl: %.scad
- openscad -d .$@.d -o $@ $<
-
-%.stl: %.ascad
- openscad -d .$@.d -o $@ $<
-
-%.gcode: $(CONFIG) %.stl
- $(SLIC3R) --load $^ --output $@
+ 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: %.stl $(CONFIG)
+ $(SLIC3R) --load $(CONFIG) \
+ --ignore-nonexistent-config --load $*.slic3r \
+ --output $@.tmp $<
+ @mv -f $@.tmp $@
#%.gcode: %.stl
# $(SKEINFORGE) $<
%.gcode: manual-gcode-generator %.m-g
#%.gcode: %.stl
# $(SKEINFORGE) $<
%.gcode: manual-gcode-generator %.m-g
-
.
/$^ >$@.tmp && mv -f $@.tmp $@
+
$(PLAY)
/$^ >$@.tmp && mv -f $@.tmp $@
dovecliptest.stl: doveclip.scad
dovecliptest.stl: doveclip.scad
-%.a
scad: toplevel-make Makefile
toplevel-find
+%.a
uto.scad: $(PLAY)/toplevel-make Makefile $(PLAY)/
toplevel-find
@echo ' write $@'
@echo ' write $@'
-
./
$< $@ >$@.tmp
+ $< $@ >$@.tmp
@mv -f $@.tmp $@
@mv -f $@.tmp $@
+.PRECIOUS: %.stl %.gcode
+
clean:
clean:
- rm -f *~ *.stl *
,*
.scad *.gcode .*.d
+ rm -f *~ *.stl *
.auto
.scad *.gcode .*.d