From 6efa789abec58dacf7ee348063d46ba46dd08084 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 16 Sep 2023 12:39:09 +0100
Subject: [PATCH] Introduce i alias for mv $@

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 reprap-objects.make | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

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