From 22aa2e18ec11856148c4fec6b5ec9e24d5be1382 Mon Sep 17 00:00:00 2001
From: oco <oco@newmail.ru>
Date: Thu, 31 May 2018 13:17:08 +0300
Subject: [PATCH] Modify file structure

---
 examples/led/makefile                  |  6 +++---
 examples/tester/makefile               |  4 ++--
 m3forth.spf                            | 10 +++++-----
 cross.spf => src/cross.spf             |  4 ++--
 hex.spf => src/hex.spf                 |  0
 interpreter.spf => src/interpreter.spf |  0
 kernel.spf => src/kernel.spf           |  2 +-
 macros.spf => src/macros.spf           |  0
 opt_rules.spf => src/opt_rules.spf     |  0
 optimizer.spf => src/optimizer.spf     |  0
 options.spf => src/options.spf         |  0
 prims.spf => src/prims.spf             |  0
 12 files changed, 13 insertions(+), 13 deletions(-)
 rename cross.spf => src/cross.spf (99%)
 rename hex.spf => src/hex.spf (100%)
 rename interpreter.spf => src/interpreter.spf (100%)
 rename kernel.spf => src/kernel.spf (99%)
 rename macros.spf => src/macros.spf (100%)
 rename opt_rules.spf => src/opt_rules.spf (100%)
 rename optimizer.spf => src/optimizer.spf (100%)
 rename options.spf => src/options.spf (100%)
 rename prims.spf => src/prims.spf (100%)

diff --git a/examples/led/makefile b/examples/led/makefile
index 1d738b8..57dd37b 100644
--- a/examples/led/makefile
+++ b/examples/led/makefile
@@ -1,5 +1,5 @@
 
-compiler = ../../spf4
+compiler = ../../spf4 src/options.spf
 # project name
 project = led
 # device used
@@ -10,7 +10,7 @@ st_path = ~/src/stlink
 .PHONY: proteus
 # make project
 $(project).spf.elf: *.spf
-	$(compiler) options.spf -h -i -O -D S\" $(device)\" S\" $(project).spf\" m3forth.spf
+	$(compiler) -h -i -O -D S\" $(device)\" S\" $(project).spf\" m3forth.spf
 	arm-none-eabi-objdump -S -w $(project).spf.elf > $(project).spf.lst
 	readelf -Ww $(project).spf.elf > $(project).spf.debug
 	readelf -aW $(project).spf.elf > $(project).spf.info
@@ -24,7 +24,7 @@ debug: $(project).spf.elf
 
 # make for proteus
 proteus: *.spf
-	$(compiler) options.spf -b -h -i -O -D S\" devices/proteus_device.spf\" S\" $(project).spf\" m3forth.spf
+	$(compiler) -b -h -i -O -D S\" devices/proteus_device.spf\" S\" $(project).spf\" m3forth.spf
 	arm-none-eabi-objdump -S -w $(project).spf.elf > $(project).spf.lst
 #	readelf -Ww $(project).spf.elf > $(project).spf.debug
 #	readelf -aW $(project).spf.elf > $(project).spf.info
diff --git a/examples/tester/makefile b/examples/tester/makefile
index 8d820ac..8fdfc9b 100644
--- a/examples/tester/makefile
+++ b/examples/tester/makefile
@@ -1,5 +1,5 @@
 
-compiler = ../../spf4
+compiler = ../../spf4 src/options.spf
 # project name
 project = tester
 # device used
@@ -9,7 +9,7 @@ st_path = ~/src/stlink
 
 # make project
 $(project).spf.elf: *.spf
-	$(compiler) options.spf -H -I -O -d -M  S\" $(device)\" S\" $(project).spf\" m3forth.spf
+	$(compiler) -H -I -O -d -M  S\" $(device)\" S\" $(project).spf\" m3forth.spf
 	arm-none-eabi-objdump -S -w $(project).spf.elf > $(project).spf.lst
 	readelf -Ww $(project).spf.elf > $(project).spf.debug
 	readelf -aW $(project).spf.elf > $(project).spf.info
diff --git a/m3forth.spf b/m3forth.spf
index 198ae1a..7cae65d 100644
--- a/m3forth.spf
+++ b/m3forth.spf
@@ -12,9 +12,9 @@ FNAME 2!
 2VARIABLE FDEVICE \ device file name
 FDEVICE 2!
 
-S" cross.spf" 			INCLUDED
+S" src/cross.spf" 			INCLUDED
 S" lib/include/place.f" INCLUDED
-S" hex.spf" INCLUDED
+S" src/hex.spf" INCLUDED
 CREATE FILENAME 255 ALLOT \ temp buffer
 
 \ ================= контроллер
@@ -30,13 +30,13 @@ FDEVICE 2@ INCLUDED \ include device file, start generating debug info
 HOST 'RAMBASE INTERPRETER EQU 'RAMBASE HOST
 
 \ compile asm primitives into cdata space
-S" prims.spf" INCLUDED
+S" src/prims.spf" INCLUDED
 \ now compile the higher-level code written as forth definitions
-S" kernel.spf" INCLUDED
+S" src/kernel.spf" INCLUDED
 
 O_INTERPRETER [IF]
     \ execute and build words on target
-    S" interpreter.spf" INCLUDED
+    S" src/interpreter.spf" INCLUDED
 
 [THEN]
 
diff --git a/cross.spf b/src/cross.spf
similarity index 99%
rename from cross.spf
rename to src/cross.spf
index 0233fb7..6323846 100644
--- a/cross.spf
+++ b/src/cross.spf
@@ -555,8 +555,8 @@ INTERPRETER
 HOST
 VECT LITERAL,
 
-S" macros.spf" INCLUDED
-S" optimizer.spf" INCLUDED
+S" src/macros.spf" INCLUDED
+S" src/optimizer.spf" INCLUDED
 
 \ basic subroutine threaded code
 HOST HEX
diff --git a/hex.spf b/src/hex.spf
similarity index 100%
rename from hex.spf
rename to src/hex.spf
diff --git a/interpreter.spf b/src/interpreter.spf
similarity index 100%
rename from interpreter.spf
rename to src/interpreter.spf
diff --git a/kernel.spf b/src/kernel.spf
similarity index 99%
rename from kernel.spf
rename to src/kernel.spf
index 57e8223..d8b0f36 100644
--- a/kernel.spf
+++ b/src/kernel.spf
@@ -343,7 +343,7 @@ COMPILER
     [END-ASM]
 ;
 
-S" opt_rules.spf" INCLUDED
+S" src/opt_rules.spf" INCLUDED
 
 COMPILER
 
diff --git a/macros.spf b/src/macros.spf
similarity index 100%
rename from macros.spf
rename to src/macros.spf
diff --git a/opt_rules.spf b/src/opt_rules.spf
similarity index 100%
rename from opt_rules.spf
rename to src/opt_rules.spf
diff --git a/optimizer.spf b/src/optimizer.spf
similarity index 100%
rename from optimizer.spf
rename to src/optimizer.spf
diff --git a/options.spf b/src/options.spf
similarity index 100%
rename from options.spf
rename to src/options.spf
diff --git a/prims.spf b/src/prims.spf
similarity index 100%
rename from prims.spf
rename to src/prims.spf