From f3bc3b97f37dd7bc012c152374d4185c734b3a7e Mon Sep 17 00:00:00 2001
From: Ralph Ronnquist <ralph.ronnquist@gmail.com>
Date: Tue, 18 May 2021 11:29:18 +1000
Subject: [PATCH] renaming

---
 Makefile                        | 28 +++++++---------------------
 symbols.lsp => fas2txt.lsp      |  0
 machine.fasm => machine.asm     |  0
 math.fasm => math.asm           |  0
 memory.fasm => memory.asm       |  0
 main.fasm => rrqforth.asm       |  0
 stack.fasm => stack.asm         |  0
 stdio.fasm => stdio.asm         |  0
 syscalls.fasm => syscalls.asm   |  0
 wordlists.fasm => wordlists.asm |  0
 10 files changed, 7 insertions(+), 21 deletions(-)
 rename symbols.lsp => fas2txt.lsp (100%)
 rename machine.fasm => machine.asm (100%)
 rename math.fasm => math.asm (100%)
 rename memory.fasm => memory.asm (100%)
 rename main.fasm => rrqforth.asm (100%)
 rename stack.fasm => stack.asm (100%)
 rename stdio.fasm => stdio.asm (100%)
 rename syscalls.fasm => syscalls.asm (100%)
 rename wordlists.fasm => wordlists.asm (100%)

diff --git a/Makefile b/Makefile
index 2a4d3bb..ffb97c7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,10 @@
-BINARY = rrqforth
+INCS := $(shell grep ^include rrqforth.asm | tr -d "'" | sed 's/include//' )
+SRCS = rrqforth.asm $(INCS)
 
-default: X
-
-VFMT := "RRQ Forth version %h at %aI"
-VERSION := $(shell git log -1 --pretty=format:'$(VFMT)' main.fasm)
-
-main.fasm: machine.fasm readline.fasm syscalls.fasm
-
-version: main.fasm
-	@echo "db '$(VERSION)'\ndb 10" > $@
-
-rrqforth: main.fasm | 
-	fasm $^ $@
+# compile into 3 things: binary, symbolic information and debug support
+rrqforth: rrqforth.asm
+	fasm $^ -s $< > $@.fas
 	chmod a+x $@
-
-rrqforth.fas: main.fasm rrqforth
-	fasm $< -s $@
-
-X: rrqforth.fas
-	./symbols.lsp $< > $@
-
+	./symbols.lsp $@.fas > $@.dbg
 clean:
-	rm -f version rrqforth rrqforth.fas
+	rm -f rrqforth{,.fas,.dbg}
diff --git a/symbols.lsp b/fas2txt.lsp
similarity index 100%
rename from symbols.lsp
rename to fas2txt.lsp
diff --git a/machine.fasm b/machine.asm
similarity index 100%
rename from machine.fasm
rename to machine.asm
diff --git a/math.fasm b/math.asm
similarity index 100%
rename from math.fasm
rename to math.asm
diff --git a/memory.fasm b/memory.asm
similarity index 100%
rename from memory.fasm
rename to memory.asm
diff --git a/main.fasm b/rrqforth.asm
similarity index 100%
rename from main.fasm
rename to rrqforth.asm
diff --git a/stack.fasm b/stack.asm
similarity index 100%
rename from stack.fasm
rename to stack.asm
diff --git a/stdio.fasm b/stdio.asm
similarity index 100%
rename from stdio.fasm
rename to stdio.asm
diff --git a/syscalls.fasm b/syscalls.asm
similarity index 100%
rename from syscalls.fasm
rename to syscalls.asm
diff --git a/wordlists.fasm b/wordlists.asm
similarity index 100%
rename from wordlists.fasm
rename to wordlists.asm
-- 
2.39.2