Reformulate "let" helper into "with"

3 files changed, 13 insertions, 12 deletions

diff --git a/desktop/libffi/gen.rc b/desktop/libffi/gen.rc
index 9638e1bd..fa073b8e 100644
--- a/desktop/libffi/gen.rc
+++ b/desktop/libffi/gen.rc
@@ -4,13 +4,13 @@ cflags\
 	-I '$outdir'/include\
 	-I '$srcdir'/include
 
-exprs=(\
+build '$outdir'/include/ffi.h sed '$srcdir'/include/ffi.h.in ; exprs=(\
 	-e s,@VERSION@,3.2.1,\
 	-e s,@TARGET@,X86_64,\
 	-e s,@HAVE_LONG_DOUBLE@,1,\
 	-e s,@HAVE_LONG_DOUBLE_VARIANT@,0,\
 	-e s,@FFI_EXEC_TRAMPOLINE_TABLE@,0,\
-) let expr $"exprs -- build '$outdir'/include/ffi.h sed '$srcdir'/include/ffi.h.in
+) with expr $"exprs
 build '$outdir'/include/ffitarget.h copy '$srcdir'/src/x86/ffitarget.h
 
 hdrs=include/^(ffi.h ffitarget.h)
diff --git a/desktop/pixman/gen.rc b/desktop/pixman/gen.rc
index ad424741..1c853ec5 100644
--- a/desktop/pixman/gen.rc
+++ b/desktop/pixman/gen.rc
@@ -4,12 +4,11 @@ cflags\
 	-I '$dir' \
 	-I '$outdir'/include
 
-exprs=(\
+build '$outdir'/include/pixman-version.h sed '$srcdir'/pixman/pixman-version.h.in ; exprs=(\
 	-e s,@PIXMAN_VERSION_MAJOR@,0,\
 	-e s,@PIXMAN_VERSION_MINOR@,34,\
 	-e s,@PIXMAN_VERSION_MICRO@,0,\
-) let expr $"exprs --\
-	build '$outdir'/include/pixman-version.h sed '$srcdir'/pixman/pixman-version.h.in
+) with expr $"exprs
 build '$outdir'/include/pixman.h copy '$srcdir'/pixman/pixman.h
 
 phony headers '$outdir'/include/^(pixman.h pixman-version.h)
@@ -18,9 +17,9 @@ deps='phony/$dir/headers'
 
 # processor-specific features
 cflags -D 'USE_SSE2=1' -D 'USE_SSSE3=1' -D 'USE_X86_MMX=1'
-let cflags '$cflags -mmmx -Winline' -- cc pixman/pixman-mmx.c || $deps
-let cflags '$cflags -msse2 -Winline' -- cc pixman/pixman-sse2.c || $deps
-let cflags '$cflags -mssse3 -Winline' -- cc pixman/pixman-ssse3.c || $deps
+cc pixman/pixman-mmx.c || $deps ; with cflags '$cflags -mmmx -Winline'
+cc pixman/pixman-sse2.c || $deps ; with cflags '$cflags -msse2 -Winline'
+cc pixman/pixman-ssse3.c || $deps ; with cflags '$cflags -mssse3 -Winline'
 cpuobjs=(pixman-mmx.c pixman-sse2.c pixman-ssse3.c)^.o
 
 lib libpixman.a -d $"deps pixman/^(\
diff --git a/desktop/wayland/gen.rc b/desktop/wayland/gen.rc
index c45eb3e4..63d93444 100644
--- a/desktop/wayland/gen.rc
+++ b/desktop/wayland/gen.rc
@@ -6,12 +6,12 @@ cflags\
 	-I '$outdir'/include \
 	-I '$srcdir'/src
 
-exprs=(\
+build '$outdir'/wayland-version.h sed '$srcdir'/src/wayland-version.h.in ; exprs=(\
 	-e s,@WAYLAND_VERSION_MAJOR@,1,\
 	-e s,@WAYLAND_VERSION_MINOR@,11,\
 	-e s,@WAYLAND_VERSION_MICRO@,0,\
 	-e s,@WAYLAND_VERSION@,1.11.0,\
-) let expr $"exprs -- build '$outdir'/wayland-version.h sed '$srcdir'/src/wayland-version.h.in
+) with expr $"exprs
 
 cc src/wayland-util.c
 cc src/wayland-os.c
@@ -22,8 +22,9 @@ exe wayland-scanner -d phony/desktop/expat/headers\
 	'$builddir'/desktop/expat/libexpat.a
 
 for(type in client server) {
-	let type $type-header -- build '$outdir'/include/wayland-$type-protocol.h\
+	build '$outdir'/include/wayland-$type-protocol.h\
 		wayland_proto '$srcdir'/protocol/wayland.xml
+	with type $type-header
 }
 hdrs=wayland-^(client-core client egl-core egl server-core server util version)^.h
 for(hdr in $hdrs) build '$outdir'/include/$hdr copy '$srcdir'/src/$hdr
@@ -31,8 +32,9 @@ build '$outdir'/include/wayland-cursor.h copy '$srcdir'/cursor/wayland-cursor.h
 
 phony headers include/^($hdrs wayland-^(cursor.h (client server)^-protocol.h))
 
-let type code -- build '$outdir'/wayland-protocol.c\
+build '$outdir'/wayland-protocol.c\
 	wayland_proto '$srcdir'/protocol/wayland.xml
+with type code
 cc '$outdir'/wayland-protocol.c
 
 lib libwayland-server.a -d 'phony/$dir/headers' src/^(\