Modify file structure

Author: oco

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

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

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]
 

cross.spf src/cross.spfcross.spf renamed to 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

hex.spf src/hex.spfhex.spf renamed to src/hex.spf

@@ -343,7 +343,7 @@ COMPILER
     [END-ASM]
 ;
 
-S" opt_rules.spf" INCLUDED
+S" src/opt_rules.spf" INCLUDED
 
 COMPILER