From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 16 Sep 2023 11:40:48 +0000 (+0100)
Subject: Introduce o alias for capturing stdout to $@
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=commitdiff_plain;h=1f95cc3aea4e624e6bae1ff697a88dd0509d52eb

Introduce o alias for capturing stdout to $@

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/Makefile b/Makefile
index 8e727ab..b090325 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/diziet-utils/reprap-objects.make b/diziet-utils/reprap-objects.make
index f212f97..d47a23c 100644
--- a/diziet-utils/reprap-objects.make
+++ b/diziet-utils/reprap-objects.make
@@ -41,6 +41,7 @@ stls:		$(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
 	$(MAKE) $(addsuffix .auto.stl, $(shell $(DUTILS)/toplevel-find $*))
 
 i=mv -f $@.tmp $@
+o= >$@.tmp && $i
 
 -include .*.d
 
@@ -54,19 +55,19 @@ i=mv -f $@.tmp $@
 AUTOBASE=$(shell echo $(1) | perl -pe 's/,\w+\.auto$$//')
 
 %:		%.cpp
-		cpp -nostdinc -P <$< >$@.tmp && $i
+		cpp -nostdinc -P <$< $o
 
 funcs.scad:	diziet-utils/funcs.scad.cpp
-		cpp -nostdinc -P $< >$@.tmp && $i
+		cpp -nostdinc -P $< $o
 
 %.gcode:	manual-gcode-generator %.m-g
-		$(CWD)/$^ >$@.tmp && $i
+		$(CWD)/$^ $o
 
 %.dxf:		%.eps
 		pstoedit -dt -f "dxf: -polyaslines -mm" $< $@
 
 %:		%.pl
-		./$< >$@.tmp && $i
+		./$< $o
 
 %:		%.m4
 		$(M4) -P >$@.tmp $< && $i