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
filamentspool: deeper cups (hope to avoid tangles) - actually, on big spool, this...
[reprap-play.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 397b7cdf1654cb8ddc3be6475d681b95e5c3b6a2..688c7cec6cbb507a462b8b2686c475d0d342d481 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-28,16
+28,17
@@
PLAY ?= $(CWD)
CONFIG=$(PLAY)/slic3r-config.ini
FILAMENTSPOOL_AUTOS = filamentspool filamentspool-lt filamentspool-sm
CONFIG=$(PLAY)/slic3r-config.ini
FILAMENTSPOOL_AUTOS = filamentspool filamentspool-lt filamentspool-sm
+FILAMENTSPOOL_AUTOS += filamentspool-storarm3
-USING_AUTOS ?= $(FILAMENTSPOOL_AUTOS) xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook knifeblock pandemic-counter pattress-boxes-3-cover
+USING_AUTOS ?= $(FILAMENTSPOOL_AUTOS) xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook knifeblock pandemic-counter pattress-boxes-3-cover
bike-lipo-box earring-stand bike-stalk-led-mount sewing-table
AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m))
AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m))
-AUTO_INCS = funcs.scad utils.scad sealing-box.scad
+AUTO_INCS = funcs.scad utils.scad sealing-box.scad
sewing-table.scad
default: autoincs scads
default: autoincs scads
-$(shell set -xe;
.
/commitid.scad.pl >commitid.scad.tmp; cmp commitid.scad.tmp commitid.scad || mv -f commitid.scad.tmp commitid.scad )
+$(shell set -xe;
$(PLAY)
/commitid.scad.pl >commitid.scad.tmp; cmp commitid.scad.tmp commitid.scad || mv -f commitid.scad.tmp commitid.scad )
autoincs: $(AUTO_INCS)
scads: $(addsuffix .auto.scad, $(AUTO_TOPLEVELS))
autoincs: $(AUTO_INCS)
scads: $(addsuffix .auto.scad, $(AUTO_TOPLEVELS))
@@
-48,8
+49,6
@@
stls: $(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
%.auto.stls:
$(MAKE) $(addsuffix .auto.stl, $(shell $(PLAY)/toplevel-find $*))
%.auto.stls:
$(MAKE) $(addsuffix .auto.stl, $(shell $(PLAY)/toplevel-find $*))
-bike-lipo-box.scad:
-
-include .*.d
%.stl: %.scad $(AUTO_INCS)
-include .*.d
%.stl: %.scad $(AUTO_INCS)
@@
-135,7
+134,7
@@
FILAMENTSPOOL_DXFS=$(foreach n,$(FILAMENTSPOOL_NUMBERS), \
filamentspool-number-n$n.dxf)
$(addsuffix .auto.stl, $(foreach f,$(FILAMENTSPOOL_AUTOS),$(shell \
filamentspool-number-n$n.dxf)
$(addsuffix .auto.stl, $(foreach f,$(FILAMENTSPOOL_AUTOS),$(shell \
-
./toplevel-find
$f))): $(FILAMENTSPOOL_DXFS)
+
$(PLAY)/toplevel-find $(PLAY)/
$f))): $(FILAMENTSPOOL_DXFS)
filamentspool-numbers filamentspool.stl: $(FILAMENTSPOOL_DXFS)
filamentspool-numbers filamentspool.stl: $(FILAMENTSPOOL_DXFS)