X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=c26906088324f5d48a2ccd3e044829ec2b0cc74b;hb=6a319b7ceeca0d02fbeac92c0737e976919d87a1;hp=8bf5fadf251bdb7bcdb9c5e099024045b20c00d1;hpb=989d64e4afd73950f27b8218cfa9799d20cf4282;p=reprap-play.git
diff --git a/Makefile b/Makefile
index 8bf5fad..c269060 100644
--- a/Makefile
+++ b/Makefile
@@ -1,64 +1,33 @@
-
-HRR=/home/reprap
-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=$(PLAY)/slic3r-config.ini
-
-USING_AUTOS ?= filamentspool xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook knifeblock pandemic-counter
-AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m))
-
-AUTO_INCS = funcs.scad
-
-default: autoincs scads
-
-autoincs: $(AUTO_INCS)
-scads: $(addsuffix .auto.scad, $(AUTO_TOPLEVELS))
-stls: $(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
-
-%.auto.scads:
- $(MAKE) $(addsuffix .auto.scad, $(shell $(PLAY)/toplevel-find $*))
-%.auto.stls:
- $(MAKE) $(addsuffix .auto.stl, $(shell $(PLAY)/toplevel-find $*))
-
--include .*.d
-
-%.stl: %.scad $(AUTO_INCS)
- 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 $@
-
-AUTOBASE=$(shell echo $(1) | perl -pe 's/,\w+\.auto$$//')
-
-%.gcode: %.stl $(CONFIG)
- $(SLIC3R) --load $(CONFIG) \
- --ignore-nonexistent-config \
- --load $(call AUTOBASE,$*).slic3r \
- --load $*.slic3r \
- --output $@.tmp $<
- @mv -f $@.tmp $@
-
-%.gcode-sd: %.gcode
- mount /media/sd
- cp $^ /media/sd/JOB.G
- sleep 0.5
- umount /media/sd
-
-%: %.cpp
- cpp -nostdinc -P <$< >$@.tmp && mv -f $@.tmp $@
-
-funcs.scad:
-
-#%.gcode: %.stl
-# $(SKEINFORGE) $<
-
-%.gcode: manual-gcode-generator %.m-g
- $(PLAY)/$^ >$@.tmp && mv -f $@.tmp $@
+# reprap-objects Makefile
+#
+# Build scripts for various 3D designs
+# Copyright 2012-2016 Ian Jackson
+#
+# This work is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This work is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this work. If not, see .
+
+FILAMENTSPOOL_AUTOS = filamentspool filamentspool-lt filamentspool-sm
+FILAMENTSPOOL_AUTOS += filamentspool-storarm3
+
+QUACKSES = $(addprefix quacks-ingredients-L, 1 2 3 4 5)
+QUACKS_SCADS = $(addsuffix .scad, $(QUACKSES))
+
+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 sewing-table-test sewing-table-jig maglite-holder poster-tube-lid poster-tube-lid-coarse fairphone-case fairphone-battery-case lock-inframe-bracket ksafe-base $(QUACKSES) quacks-ingredients-demos mic-table-clamp nook-case nook-case-test scaffold-clamp-common.scad scaffold-clamp-tensioner scaffold-clamp-straphook
+
+AUTO_INCS += sealing-box.scad sewing-table.scad \
+ poster-tube-lid-parametric.scad $(QUACKS_SCADS)
+
+include reprap-objects.make
dovecliptest.stl: doveclip.scad $(AUTO_INCS)
@@ -81,13 +50,47 @@ PANDEMICCOUNTER_LETTERS=30 31 32 33 34 35
PANDEMICCOUNTER_DXFS=$(foreach l,$(PANDEMICCOUNTER_LETTERS), \
pandemic-counter-l$l.dxf)
-pandemic-counter-letters pandemic-counter%.stl: $(PANDEMICCOUNTER_DXFS)
+pandemic-counter-letters: $(PANDEMICCOUNTER_DXFS)
+pandemic-counter%.stl: $(PANDEMICCOUNTER_DXFS)
.PRECIOUS: pandemic-counter-l%.eps
pandemic-counter-l%.eps: pandemic-counter-letters.fig
fig2dev -D +$(notdir $*) -L eps <$< >$@.tmp
@mv -f $@.tmp $@
+.PRECIOUS: maglite-holder-torch-curve.eps
+maglite-holder-torch-curve.eps: maglite-holder-torch.fig
+ fig2dev -D +1:70 -L eps <$< >$@.tmp
+ @mv -f $@.tmp $@
+
+maglite-holder-torch-curve.dxf: maglite-holder-torch-curve.eps
+ pstoedit -dt -flat 0.05 -f "dxf: -polyaslines -mm" $< $@
+
+
+PANDEMICQUARANTINES_NUMBERS=1 2
+PANDEMICQUARANTINES_DXFS=$(foreach l,$(PANDEMICQUARANTINES_NUMBERS), \
+ pandemic-quarantine-l$l.dxf)
+
+pandemic-quarantine-numbers: $(PANDEMICQUARANTINES_DXFS)
+pandemic-quarantine%.stl: $(PANDEMICQUARANTINES_DXFS)
+
+.PRECIOUS: pandemic-quarantine-l%.eps
+pandemic-quarantine-l%.eps: pandemic-quarantine-numbers.fig
+ fig2dev -D +$(notdir $*) -L eps <$< >$@.tmp
+ @mv -f $@.tmp $@
+
+FILAMENTSPOOL_NUMBERS=$(shell seq 300 100 1500)
+filamentspool-number-n%.eps: filamentspool-number.eps.pl
+ ./$< $* >$@.tmp && mv -f $@.tmp $@
+
+FILAMENTSPOOL_DXFS=$(foreach n,$(FILAMENTSPOOL_NUMBERS), \
+ filamentspool-number-n$n.dxf)
+
+$(addsuffix .auto.stl, $(foreach f,$(FILAMENTSPOOL_AUTOS),$(shell \
+ $(PLAY)/toplevel-find $(PLAY)/$f))): $(FILAMENTSPOOL_DXFS)
+
+filamentspool-numbers filamentspool.stl: $(FILAMENTSPOOL_DXFS)
+
SCREWRECESSTEST_SIZES= 2 3 4 5 6
SCREWRECESSTEST_DXFS=$(foreach s,$(SCREWRECESSTEST_SIZES), \
screw-recess-test-number-s$s.dxf)
@@ -101,24 +104,37 @@ screw-recess-test-number-s%.eps: screw-recess-test-number-s%.fig
screw-recess-test-numbers screw-recess-test.stl: $(SCREWRECESSTEST_DXFS)
+question-question.eps: question-question.fig
+ fig2dev -L eps <$< >$@.tmp
+ @mv -f $@.tmp $@
+
+sewing-table%.stl: sewing-table-rear-profile.dxf
+sewing-table%.stl: sewing-table-front-profile.dxf
+sewing-table%.stl: sewing-table-end-profile.dxf
+
+sewing-table-%-profile.eps: sewing-table-%-profile.fig
+ fig2dev -L eps -D +40 <$< >$@.tmp
+ @mv -f $@.tmp $@
+
+question-token.stl: question-question.dxf
+
+lemon-stand.stl: lemon-stand.scad
+
+electron-token.stl: electron-token.scad
+
+quacks-scads: $(addsuffix .auto.scads, $(QUACKSES))
+quacks-scads: quacks-ingredients-demos.auto.scads
+
+quacks-stls: $(addsuffix .auto.stls, $(QUACKSES))
+
.PRECIOUS: $(SCREWRECESSTEST_DXFS) $(SCREWRECESSTEST_DXFS) \
$(foreach s,$(SCREWRECESSTEST_SIZES), \
screw-recess-test-number-s$s.fig \
screw-recess-test-number-s$s.eps)
-%.dxf: %.eps
- pstoedit -dt -f "dxf: -polyaslines -mm" $< $@
-
-%: %.pl
- ./$< >$@.tmp && mv -f $@.tmp $@
-
-.PRECIOUS: %.auto.scad
-%.auto.scad: $(PLAY)/toplevel-make Makefile $(PLAY)/toplevel-find
- @echo ' write $@'
- $< $@ >$@.tmp
- @mv -f $@.tmp $@
-
-.PRECIOUS: %.stl %.gcode %.eps %.dxf
+poster-tube-lid,CatchPostDistort-fa%.stl: \
+ distort-stl poster-tube-lid,CatchPreDistort.auto.stl
+ ./distort-stl $@.tmp
+ mv -f $@.tmp $@
-clean:
- rm -f *~ *.stl *.auto.scad *.gcode .*.d $(AUTO_INCS)