X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=f2302b677e7a7a8417511901ba869f8ef7112d61;hb=HEAD;hp=8e727abc6cee5b7e8ee32ba259bf8825d8537b39;hpb=96414d1b53ab2d51f89405980d4d7b32524f3983;p=reprap-play.git

diff --git a/Makefile b/Makefile
index 8e727ab..f2302b6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # reprap-objects Makefile
 #
 # Build scripts for various 3D designs
-# Copyright 2012-2016 Ian Jackson
+# Copyright 2012-2023 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
@@ -22,7 +22,7 @@ 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 fairphone4-case fairphone4-case-coarse lock-inframe-bracket ksafe-base $(QUACKSES) quacks-ingredients-demos mic-table-clamp nook-case nook-case-test scaffold-clamp-common scaffold-clamp-tensioner scaffold-clamp-linear-bracket scaffold-clamp-straphook powerbank-bike-clamp topeak-mtx-tortec-expeditionrack-adapter lipo-flat-mount laptop-sound-cable-hooks $(foreach x,500 1000,adafruit-powerboost-$x)
+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 fairphone4-case fairphone4-case-coarse lock-inframe-bracket ksafe-base $(QUACKSES) quacks-ingredients-demos mic-table-clamp nook-case nook-case-test scaffold-clamp-common scaffold-clamp-tensioner scaffold-clamp-linear-bracket scaffold-clamp-straphook powerbank-bike-clamp topeak-mtx-tortec-expeditionrack-adapter lipo-flat-mount laptop-sound-cable-hooks digispark-with-cable chimney-cable-retainer $(foreach x,500 1000,adafruit-powerboost-$x)
 
 AUTO_INCS += sealing-box.scad sewing-table.scad nutbox.scad \
 	     powerbank-anker-10000.dxf \
@@ -88,7 +88,7 @@ pandemic-quarantine-l%.eps: pandemic-quarantine-numbers.fig
 
 FILAMENTSPOOL_NUMBERS=$(shell seq 300 100 1500)
 filamentspool-number-n%.eps:	filamentspool-number.eps.pl
-	./$< $* >$@.tmp && $i
+	./$< $* $o
 
 FILAMENTSPOOL_DXFS=$(foreach n,$(FILAMENTSPOOL_NUMBERS), \
 	filamentspool-number-n$n.dxf)
@@ -103,7 +103,7 @@ SCREWRECESSTEST_DXFS=$(foreach s,$(SCREWRECESSTEST_SIZES), \
 	screw-recess-test-number-s$s.dxf)
 
 screw-recess-test-number-s%.fig: screw-recess-test-number.fig.pl
-	./$< $* >$@.tmp && $i
+	./$< $* $o
 
 screw-recess-test-number-s%.eps: screw-recess-test-number-s%.fig
 		fig2dev -L eps <$< >$@.tmp