From 951c052776d667476784f255f6fe296d30c51757 Mon Sep 17 00:00:00 2001
From: Cody Boone Ferguson <53008573+xexyl@users.noreply.github.com>
Date: Mon, 3 Jul 2023 05:05:42 -0700
Subject: [PATCH] Improve how 1989/westley alt versions are built

The Makefile now has the other versions as alt targets. Running make
ver0 will generate ver0.c and then try compiling it. Running make ver1
will do the same for ver1.c and running make alt will do this on ver0,
ver1, ver2 and ver3. Error in compilation in these rules are not fatal
so that make alt can continue. This is important for clang.

I have some other enhancements on the presentation of this entry but
they have to be reworked and decided upon (it might be that it's not
necessary with the alt rule but then the README.md file really ought to
be updated too which it will be in another commit).

It might be that making these alt targets is not even the right approach
but for now it'll do as at least it's easier to generate and compile the
individual files even if one does not use make alt. This is all TBD
later.
---
 1989/westley/Makefile | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/1989/westley/Makefile b/1989/westley/Makefile
index a41108b1d..ec5e061e1 100644
--- a/1989/westley/Makefile
+++ b/1989/westley/Makefile
@@ -129,6 +129,7 @@ all: data ${TARGET}
 	supernova deep_magic magic charon pluto
 
 ${PROG}: ${PROG}.c
+	@echo "NOTE: This entry uses non-standard args to main() that do not work with some modern compilers."
 	${CC} ${CFLAGS} $< -o $@ ${LIBS}
 
 # alternative executable
@@ -136,23 +137,29 @@ ${PROG}: ${PROG}.c
 alt: data ${ALT_TARGET}
 	@${TRUE}
 
-ver0: ver0.c
-	${CC} ${CFLAGS} $< -o $@ ${LIBS}
+# alternative executable
+#
+alt: data ${ALT_TARGET}
+	@${TRUE}
 
-ver1: ver1.c
-	@echo "** NOTE: this version will not compile with clang **"
-	${CC} ${CFLAGS} $< -o $@ ${LIBS}
-	@echo "** NOTE: this version will not compile with clang **"
+ver0: ${PROG}
+	./${PROG} < westley.c > ver0.c
+	-${CC} ${CFLAGS} ver0.c -o $@ ${LIBS}
 
-ver2: ver2.c
-	@echo "** NOTE: this version will not compile with clang **"
-	${CC} ${CFLAGS} $< -o $@ ${LIBS}
+ver1: ${PROG}
+	./${PROG} 1 < westley.c > ver1.c
 	@echo "** NOTE: this version will not compile with clang **"
+	-${CC} ${CFLAGS} ver1.c -o $@ ${LIBS}
 
-ver3: ver3.c
+ver2: ${PROG}
+	./${PROG} 1 2 < westley.c > ver2.c
 	@echo "** NOTE: this version will not compile with clang **"
-	${CC} ${CFLAGS} $< -o $@ ${LIBS}
+	-${CC} ${CFLAGS} ver2.c -o $@ ${LIBS}
+
+ver3: ${PROG}
+	./${PROG} 1 2 3 < westley.c > ver3.c
 	@echo "** NOTE: this version will not compile with clang **"
+	-${CC} ${CFLAGS} ver3.c -o $@ ${LIBS}
 
 # data files
 #