X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=Makefile;h=14769bc58a0c1c9285ab61c2876f4d43f96019da;hp=70d20e09a3a71db7e2262c10a4a3e7a8511f657d;hb=f79993b675194a1e13713da23cf27642d2a381e4;hpb=0b5fe59e9c483087f2aedbb113542faf849e3d2c

diff --git a/Makefile b/Makefile
index 70d20e0..14769bc 100644
--- a/Makefile
+++ b/Makefile
@@ -30,11 +30,12 @@ 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 bike-lipo-box earring-stand bike-stalk-led-mount sewing-table sewing-table-test
+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 lock-inframe-bracket ksafe-base
 
 AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m))
 
-AUTO_INCS = funcs.scad utils.scad sealing-box.scad sewing-table.scad
+AUTO_INCS += funcs.scad sealing-box.scad sewing-table.scad \
+	     poster-tube-lid-parametric.scad
 
 default:	autoincs scads
 
@@ -120,6 +121,10 @@ 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)
@@ -161,15 +166,31 @@ 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
+
 .PRECIOUS: $(SCREWRECESSTEST_DXFS) $(SCREWRECESSTEST_DXFS) \
 	$(foreach s,$(SCREWRECESSTEST_SIZES), \
 		screw-recess-test-number-s$s.fig \
 		screw-recess-test-number-s$s.eps)
 
+poster-tube-lid,CatchPostDistort-fa%.stl: \
+	distort-stl poster-tube-lid,CatchPreDistort.auto.stl
+		./distort-stl <poster-tube-lid,CatchPreDistort.auto.stl \
+			set-fa $(notdir $*) project-cylinder 100 >$@.tmp
+		mv -f $@.tmp $@
+
 %.dxf:		%.eps
 		pstoedit -dt -f "dxf: -polyaslines -mm" $< $@