X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=e1d88738d5849b2137ee8f55d5e67a4271c9431f;hb=2132efba59634024b51ec9c19eb40a490081cfc9;hp=0ad7e19bd4549e54b8d2eea9ec33fd4707422fe6;hpb=8854484d9630e2f7378be57d79257d1c173233b3;p=reprap-play.git

diff --git a/Makefile b/Makefile
index 0ad7e19..e1d8873 100644
--- a/Makefile
+++ b/Makefile
@@ -16,73 +16,18 @@
 # You should have received a copy of the GNU General Public License
 # along with this work.  If not, see <http://www.gnu.org/licenses/>.
 
-
-HRR=/home/reprap
-SLIC3R=$(HRR)/Slic3r/bin/slic3r
-M4=m4
-SKEINFORGE=python $(HRR)/reprappro-software.git/skeinforge/skeinforge_application/skeinforge_utilities/skeinforge_craft.py
-
-CWD := $(shell pwd)
-PLAY ?= $(CWD)
-
-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
-
-AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m))
-
-AUTO_INCS = funcs.scad utils.scad sealing-box.scad
-
-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 )
-
-autoincs:	$(AUTO_INCS)
-scads:		$(addsuffix .auto.scad, $(AUTO_TOPLEVELS))
-stls:		$(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
-
-%.auto.scads: %.scad
-	$(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
+QUACKSES = $(addprefix quacks-ingredients-L, 1 2 3 4 5)
+QUACKS_SCADS = $(addsuffix .scad, $(QUACKSES))
 
-%:		%.cpp
-		cpp -nostdinc -P <$< >$@.tmp && mv -f $@.tmp $@
+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
 
-funcs.scad:
+AUTO_INCS += sealing-box.scad sewing-table.scad \
+	     poster-tube-lid-parametric.scad $(QUACKS_SCADS)
 
-#%.gcode:	%.stl
-#		$(SKEINFORGE) $<
-
-%.gcode:	manual-gcode-generator %.m-g
-		$(PLAY)/$^ >$@.tmp && mv -f $@.tmp $@
+include reprap-objects.make
 
 dovecliptest.stl: doveclip.scad $(AUTO_INCS)
 
@@ -113,6 +58,15 @@ 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)
@@ -133,7 +87,7 @@ FILAMENTSPOOL_DXFS=$(foreach n,$(FILAMENTSPOOL_NUMBERS), \
 	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)
 
@@ -154,31 +108,33 @@ 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 $@
-
-%:		%.m4
-		$(M4) -P >$@.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 <poster-tube-lid,CatchPreDistort.auto.stl \
+			set-fa $(notdir $*) project-cylinder 100 >$@.tmp
+		mv -f $@.tmp $@
 
-clean:
-		rm -f *~ *.stl *.auto.scad *.gcode .*.d $(AUTO_INCS)