From 758e87b1251badab20bb9553ec2cf44ad0e11d4a Mon Sep 17 00:00:00 2001
From: crc <>
Date: Mon, 19 Sep 2022 16:36:51 +0000
Subject: [PATCH] more makefile work

FossilOrigin-Name: e9c480f1c27658636c1b39826ff71bc2cf0ae0ea08fbb640bd93362b5ab10210
---
 Makefile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index de42213..2143141 100644
--- a/Makefile
+++ b/Makefile
@@ -77,6 +77,7 @@ GLOSSARY ?= ./bin/retro tools/glossary.retro
 ASSEMBLE ?= ./bin/retro-muri
 EXTEND ?= ./bin/retro-extend
 EXPORT ?= ./bin/retro-embedimage
+RETRO ?= ./bin/retro
 
 # -------------------------------------------------------------
 
@@ -84,16 +85,14 @@ all: clean build
 
 help:
 
-build: dirs toolchain ngaImage bin/retro bin/retro-repl bin/retro-describe
+build: dirs toolchain ngaImage binaries
 
-optional: build bin/retro-repl
+binaries: bin/retro bin/retro-repl bin/retro-describe
 
 toolchain: dirs bin/retro-embedimage bin/retro-extend bin/retro-muri bin/retro-unu
 
 image: vm/nga-c/image.c
 
-repl: bin/retro-repl
-
 dirs:
 	mkdir -p bin
 	cp tools/retro-document.sh bin/retro-document
@@ -200,7 +199,7 @@ vm/nga-c/image.c: toolchain ngaImage interface/retro-unix.retro $(DEVICES)
 bin/retro: vm/nga-c/image.c vm/nga-c/retro.c package/list.forth package/load-extensions.retro
 	cd vm/nga-c && $(CC) -DFAST $(OPTIONS) $(ENABLED) $(CFLAGS) $(LDFLAGS) -o ../../bin/retro retro.c $(LIBM) $(LIBDL)
 	cd package && ../bin/retro -u rre.image -f list.forth
-	./bin/retro-embedimage rre.image >vm/nga-c/image.c
+	$(EXPORT) rre.image >vm/nga-c/image.c
 	rm rre.image
 	cd vm/nga-c && $(CC) -DFAST $(OPTIONS) $(ENABLED) $(CFLAGS) $(LDFLAGS) -o ../../bin/retro retro.c $(LIBM) $(LIBDL)