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
sewing-table: Remove a spurious z coord from a translate
[reprap-play.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 28d308cba61878eb95d9ba8d12958126cae5dccf..bd47f9cb668467df11f6c0d95ad627dc6ae4fc84 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
misc
.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)
@@
-71,6
+70,7
@@
AUTOBASE=$(shell echo $(1) | perl -pe 's/,\w+\.auto$$//')
%.gcode-sd: %.gcode
mount /media/sd
%.gcode-sd: %.gcode
mount /media/sd
+ rm -f /media/sd/JOB.* /media/sd/job.*
cp $^ /media/sd/JOB.G
sleep 0.5
umount /media/sd
cp $^ /media/sd/JOB.G
sleep 0.5
umount /media/sd
@@
-135,7
+135,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)