Mercurial > hg > Members > kono > os9 > sbc09
changeset 191:d0f5894e9b3a default tip
some how load: confilicts in gmake
| author | kono |
|---|---|
| date | Thu, 07 Dec 2023 09:37:15 +0900 |
| parents | b93996f54090 |
| children | |
| files | os9/level1/cmds/Makefile os9/level2/cmds/Makefile |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/os9/level1/cmds/Makefile Thu Dec 07 09:23:55 2023 +0900 +++ b/os9/level1/cmds/Makefile Thu Dec 07 09:37:15 2023 +0900 @@ -4,7 +4,7 @@ OBJ2 = mdir mfree OBJ1 = asm attr calldbg cmp config copy cputype date debug del deldir devs dir dir_cb dirsort dump echo edit disasm \ - error free help ident irqs link list load login makdir pxd pwd procs prompt shellplus sleep tee touch tsmon unlink game09 + error free help ident irqs link list ./load login makdir pxd pwd procs prompt shellplus sleep tee touch tsmon unlink game09 all : $(OBJ2) $(OBJ1) @@ -83,7 +83,7 @@ $(A09) -l $@.lst -o $@ $(SRC1)/$@.asm list : $(A09) -l $@.lst -o $@ $(SRC1)/$@.asm -load : +./load : $(A09) -l $@.lst -o $@ $(SRC1)/$@.asm login : $(A09) -l $@.lst -o $@ $(SRC1)/$@.asm
--- a/os9/level2/cmds/Makefile Thu Dec 07 09:23:55 2023 +0900 +++ b/os9/level2/cmds/Makefile Thu Dec 07 09:37:15 2023 +0900 @@ -4,7 +4,7 @@ OBJ2 = mdir mfree proc procs reboot dmem pmap smap mmap OBJ1 = asm attr calldbg cmp config copy cputype date debug del deldir devs dir dir_cb dirsort dump echo edit disasm \ - error free help ident irqs link list load login makdir pxd pwd procs prompt shellplus sleep tee touch tsmon unlink \ + error free help ident irqs link list ./load login makdir pxd pwd procs prompt shellplus sleep tee touch tsmon unlink \ game09 sbc09 cat kernel09.s basic.s @@ -107,7 +107,7 @@ $(A09) -l $@.lst -o $@ $(SRC1)/$@.asm list : $(A09) -l $@.lst -o $@ $(SRC1)/$@.asm -load : +./load : $(A09) -l $@.lst -o $@ $(SRC1)/$@.asm login : $(A09) -l $@.lst -o $@ $(SRC1)/$@.asm