minor improvement to scaffolding_for_c/Makefile-wip.nw

ctarbide · May 28, 2024 · 5e708cd · 5e708cd
1 parent ce9dd16
commit 5e708cd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/pages/2024/2024-03-27_00h04m58_scaffolding_for_c/Makefile-wip b/pages/2024/2024-03-27_00h04m58_scaffolding_for_c/Makefile-wip
@@ -3,9 +3,6 @@
 
 SH = sh -eu
 
-SOURCES = \
-    Makefile-wip.nw wip.nw
-
 TARGETS = \
     wip.c wip
 
@@ -24,4 +21,3 @@ wip: \
 
 clean:
 	-rm -f $(TARGETS)
-
diff --git a/pages/2024/2024-03-27_00h04m58_scaffolding_for_c/Makefile-wip.nw b/pages/2024/2024-03-27_00h04m58_scaffolding_for_c/Makefile-wip.nw
@@ -25,12 +25,16 @@ set -eu
 SH=${SH:-sh -eu}; export SH
 <<function cmd_push_to_argv>>
 <<function list_set_sources>>
-set -- <<Makefile prefix>>.nw
-nofake --error -R'generate build.sh' "$@" | ${SH}
+<<gen build.sh>>
 eval "set --; `list_set_sources`"
 nofake --error -R'generate Makefile' "$@" | ${SH} ><<Makefile prefix>>
 @
 
+<<gen build.sh>>=
+set -- <<Makefile prefix>>.nw
+nofake --error -R'generate build.sh' "$@" | ${SH}
+@
+
 <<function cmd_push_to_argv>>=
 cmd_push_to_argv(){
     normalize-args.sh | perl -lpe'$_=qq{set -- \042\$\@\042 ${_};}' |
@@ -60,16 +64,10 @@ indent_args(){
 indent_args "$@"
 @
 
-<<output SH= and SOURCES=>>=
-eval "set --; ${set_sources}"
-printf -- 'SH = %s\n\nSOURCES = \\\n' "${SH}"
-<<indent "$@">>
-@
-
 <<output TARGETS=>>=
 set --
 <<targets>>
-printf -- '\nTARGETS = \\\n'
+printf -- 'TARGETS = \\\n'
 <<indent "$@">>
 @
 
@@ -96,10 +94,10 @@ SH=${SH:-sh -eu}; export SH
 <<function indent_args>>
 printf -- '\n# automatically generated from <<Makefile prefix>>.nw\n\n'
 set_sources=`list_set_sources`
-<<output SH= and SOURCES=>>
+printf -- 'SH = %s\n\n' "${SH}"
 <<output TARGETS=>>
 <<output all:>>
-printf -- 'clean:\n\t-rm -f $(TARGETS)\n\n'
+printf -- 'clean:\n\t-rm -f $(TARGETS)\n'
 @
 
 <<generate build.sh>>=