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 Axle adjust height
[reprap-play.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index a2052616a669a0a304a5ffc21144aaf139197ff5..b21432af57457d8f10a82ca030455a78619db099 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-7,8
+7,8
@@
CONFIG=slic3r-config.ini
AUTO_TOPLEVELS := $(foreach m, filamentspool, $(shell ./toplevel-find $m))
AUTO_TOPLEVELS := $(foreach m, filamentspool, $(shell ./toplevel-find $m))
-scads: $(addsuffix .ascad, $(AUTO_TOPLEVELS))
-stls: $(addsuffix .stl, $(AUTO_TOPLEVELS))
+scads: $(addsuffix .a
uto.
scad, $(AUTO_TOPLEVELS))
+stls: $(addsuffix .
auto.
stl, $(AUTO_TOPLEVELS))
default:
default:
@@
-17,9
+17,6
@@
default:
%.stl: %.scad
openscad -d .$@.d -o $@ $<
%.stl: %.scad
openscad -d .$@.d -o $@ $<
-%.stl: %.ascad
- openscad -d .$@.d -o $@ $<
-
%.gcode: $(CONFIG) %.stl
$(SLIC3R) --load $^ --output $@
%.gcode: $(CONFIG) %.stl
$(SLIC3R) --load $^ --output $@
@@
-31,10
+28,10
@@
default:
dovecliptest.stl: doveclip.scad
dovecliptest.stl: doveclip.scad
-%.ascad: toplevel-make Makefile toplevel-find
+%.a
uto.
scad: toplevel-make Makefile toplevel-find
@echo ' write $@'
./$< $@ >$@.tmp
@mv -f $@.tmp $@
clean:
@echo ' write $@'
./$< $@ >$@.tmp
@mv -f $@.tmp $@
clean:
- rm -f *~ *.stl *
,*
.scad *.gcode .*.d
+ rm -f *~ *.stl *
.auto
.scad *.gcode .*.d