Mercurial > hg > Members > kono > nitros9-code
changeset 3293:aa5c87cbbd32
level1 makefiles: Separate basic09 module lists
The BASIC09FILES define was no more in use, however, separating out
the basic09 modules (originally from 3rdparty) makes sense. The
separate SUBS define was less obvious.
The resulting disk images have been tested to be the same, except
for d64 and dalpha images where they got more consistent.
| author | Tormod Volden <debian.tormod@gmail.com> |
|---|---|
| date | Thu, 23 Sep 2021 23:23:35 +0200 |
| parents | e54bf7fbc50f |
| children | 6b012cf1b400 |
| files | level1/atari/cmds/makefile level1/coco1/cmds/makefile level1/corsham/cmds/makefile level1/d64/cmds/makefile level1/dalpha/makefile level1/mc09/cmds/makefile |
| diffstat | 6 files changed, 33 insertions(+), 59 deletions(-) [+] |
line wrap: on
line diff
--- a/level1/atari/cmds/makefile Thu Sep 23 22:58:22 2021 +0200 +++ b/level1/atari/cmds/makefile Thu Sep 23 23:23:35 2021 +0200 @@ -8,22 +8,21 @@ AFLAGS += --includedir=$(3RDPARTY)/packages/basic09 LFLAGS += -L $(NITROS9DIR)/lib -lnet -latari -lalib -BASIC09FILES = basic09.asm runb.asm gfx.asm inkey.asm syscall.asm CMDS = asm attr backup binex build calldbg cmp copy cputype \ date dcheck debug ded deiniz del deldir devs dir dirsort disasm \ display dmode dsave dump echo edit error exbin format \ free help ident iniz irqs link list load login makdir \ megaread mdir merge mfree os9gen padrom park printerr procs prompt pwd pxd \ rename save setime shellplus shell_21 sleep \ - tee tmode touch tsmon tuneport unlink verify xmode\ - basic09 runb gfx inkey syscall + tee tmode touch tsmon tuneport unlink verify xmode CMDS_DW = inetd telnet dw httpd CMDS_DEMO = fuji -SUBS = gfx inkey syscall -ALLOBJS = $(CMDS) $(CMDS_D2) $(CMDS_DW) $(CMDS_DEMO) $(SUBS) +BASIC09 = basic09 runb gfx inkey syscall + +ALLOBJS = $(CMDS) $(CMDS_DW) $(CMDS_DEMO) $(BASIC09) all: $(ALLOBJS) @@ -46,10 +45,10 @@ $(IDENT_SHORT) $(ALLOBJS) showobjs: - @$(ECHO) $(CMDS) + @$(ECHO) $(CMDS) $(BASIC09) showobjs_dw: - @$(ECHO) $(CMDS) $(CMDS_DW) + @$(ECHO) $(CMDS) $(BASIC09) $(CMDS_DW) showobjs_demo: @$(ECHO) $(CMDS_DEMO)
--- a/level1/coco1/cmds/makefile Thu Sep 23 22:58:22 2021 +0200 +++ b/level1/coco1/cmds/makefile Thu Sep 23 23:23:35 2021 +0200 @@ -8,7 +8,6 @@ AFLAGS += --includedir=$(3RDPARTY)/packages/basic09 LFLAGS += -L $(NITROS9DIR)/lib -lnet -lcoco -lalib -BASIC09FILES = basic09.asm runb.asm gfx.asm inkey.asm syscall.asm CMDS = asm attr backup binex build calldbg cmp cobbler copy cputype \ date dcheck debug ded deiniz del deldir devs dir dirsort disasm \ display dmode dsave dump echo edit error exbin format \ @@ -17,13 +16,13 @@ rename save setime shellplus shell_21 sleep \ tee tmode touch tsmon tuneport unlink verify xmode -CMDS_D2 = basic09 runb gfx inkey syscall copy del echo format \ - merge os9gen prompt tmode +CMDS_D2 = copy del echo format merge os9gen prompt tmode CMDS_DW = inetd telnet dw httpd -SUBS = gfx inkey syscall -ALLOBJS = $(CMDS) $(CMDS_D2) $(CMDS_DW) $(SUBS) +BASIC09 = basic09 runb gfx inkey syscall + +ALLOBJS = $(CMDS) $(CMDS_D2) $(CMDS_DW) $(BASIC09) all: $(ALLOBJS) @@ -49,10 +48,10 @@ @$(ECHO) $(CMDS) showobjs_d2: - @$(ECHO) $(CMDS_D2) + @$(ECHO) $(CMDS_D2) $(BASIC09) showobjs_dw: - @$(ECHO) $(sort $(CMDS) $(CMDS_DW)) + @$(ECHO) $(CMDS) $(CMDS_DW) showallobjs: @$(ECHO) $(ALLOBJS)
--- a/level1/corsham/cmds/makefile Thu Sep 23 22:58:22 2021 +0200 +++ b/level1/corsham/cmds/makefile Thu Sep 23 23:23:35 2021 +0200 @@ -8,18 +8,17 @@ AFLAGS += --includedir=$(3RDPARTY)/packages/basic09 LFLAGS += -L $(NITROS9DIR)/lib -lnet -latari -lalib -BASIC09FILES = basic09.asm runb.asm gfx.asm inkey.asm syscall.asm CMDS = asm attr backup binex build calldbg cmp copy cputype \ date dcheck debug ded deiniz del deldir devs dir dirsort disasm \ display dmode dsave dump echo edit error exbin format \ free help ident iniz irqs link list load login makdir \ megaread mdir merge mfree os9gen padrom park printerr procs prompt pwd pxd \ rename save setime shellplus shell_21 sleep \ - tee tmode touch tsmon tuneport unlink verify xmode\ - basic09 runb gfx inkey syscall + tee tmode touch tsmon tuneport unlink verify xmode -SUBS = gfx inkey syscall -ALLOBJS = $(CMDS) $(SUBS) +BASIC09 = basic09 runb gfx inkey syscall + +ALLOBJS = $(CMDS) $(BASIC09) all: $(ALLOBJS) @@ -42,10 +41,7 @@ $(IDENT_SHORT) $(ALLOBJS) showobjs: - @$(ECHO) $(CMDS) - -showobjs_dw: - @$(ECHO) $(CMDS) + @$(ECHO) $(CMDS) $(BASIC09) showobjs_demo: @$(ECHO) $(CMDS_DEMO)
--- a/level1/d64/cmds/makefile Thu Sep 23 22:58:22 2021 +0200 +++ b/level1/d64/cmds/makefile Thu Sep 23 23:23:35 2021 +0200 @@ -7,22 +7,12 @@ DEPENDS = ./makefile -BASIC09FILES = runb.asm gfx.asm inkey.asm syscall.asm - -CMDS = asm attr backup binex build cmp cobbler copy cputype \ +CMDS = asm attr backup binex build cmp cobbler cobbler_dragon copy cputype \ date dcheck debug ded deiniz del deldir devs dir dirsort disasm \ display dmode dsave dump echo edit error exbin format \ free grfdrv help ident iniz irqs link list load login makdir \ - megaread mdir merge mfree mpi os9gen padrom park printerr procs prompt pwd pxd \ - rename runb save setime shellplus shell_21 sleep \ - tee tmode touch tsmon tuneport unlink verify xmode minted - -DRAGONCMDS = asm attr backup binex build cmp cobbler_dragon copy cputype \ - date dcheck debug ded deiniz del deldir devs dir dirsort disasm \ - display dmode dsave dump echo edit error exbin format \ - free grfdrv help ident iniz irqs link list load login makdir \ - megaread mdir merge mfree mpi os9gen padrom park printerr procs prompt pwd pxd \ - rename runb save setime shellplus shell_21 sleep \ + megaread mdir merge mfree minted mpi os9gen padrom park printerr procs prompt pwd pxd \ + rename save setime shellplus shell_21 sleep \ tee tmode touch tsmon tuneport unlink verify xmode DRAGON525CMDS = asm attr backup binex build cmp cobbler_dragon copy date del deldir \ @@ -32,17 +22,14 @@ DRAGON525CMDS2 = cputype dcheck debug ded deiniz devs dirsort disasm edit error \ grfdrv help iniz irqs megaread mpi padrom park prompt \ - runb shellplus touch tuneport - + shellplus touch tuneport -SUBS = gfx inkey syscall -ALLOBJS = $(CMDS) $(DRAGONCMDS) $(SUBS) +BASIC09 = runb gfx inkey syscall + +ALLOBJS = $(CMDS) $(BASIC09) all: $(ALLOBJS) -alldragon: $(DRAGONCMDS) $(SUBS) - - pwd: pd.asm $(AS) $(AFLAGS) $< $(ASOUT)$@ -DPWD=1 @@ -64,17 +51,11 @@ identify: $(IDENT_SHORT) $(ALLOBJS) -showallobjs: - @$(ECHO) $(ALLOBJS) - -showcocoobjs: - @$(ECHO) $(CMDS) $(SUBS) - showdragonobjs: - @$(ECHO) $(sort $(CMDS) $(DRAGONCMDS)) + @$(ECHO) $(CMDS) $(BASIC09) showdragon525objs: - @$(ECHO) $(DRAGON525CMDS) $(SUBS) + @$(ECHO) $(DRAGON525CMDS) $(BASIC09) showdragon525objs2: @$(ECHO) $(DRAGON525CMDS2)
--- a/level1/dalpha/makefile Thu Sep 23 22:58:22 2021 +0200 +++ b/level1/dalpha/makefile Thu Sep 23 23:23:35 2021 +0200 @@ -71,7 +71,7 @@ #modules bootfiles #DDIRS = modules bootfiles defs -CMDS = $(shell $(CD) cmds; make --no-print-directory showcocoobjs) +CMDS = $(shell $(CD) cmds; make --no-print-directory showdragonobjs) BOOTTRACK = $(shell $(CD) modules; make --no-print-directory showboottrack) KERNEL = $(shell $(CD) modules; make --no-print-directory showkernel) SYSMODS = $(shell $(CD) modules; make --no-print-directory showsysmods)
--- a/level1/mc09/cmds/makefile Thu Sep 23 22:58:22 2021 +0200 +++ b/level1/mc09/cmds/makefile Thu Sep 23 23:23:35 2021 +0200 @@ -8,7 +8,6 @@ AFLAGS += --includedir=$(3RDPARTY)/packages/basic09 LFLAGS += -L $(NITROS9DIR)/lib -lnet -lmc09 -lalib -BASIC09FILES = basic09.asm runb.asm gfx.asm inkey.asm syscall.asm CMDS = asm attr backup binex build calldbg cmp cobbler copy cputype \ date dcheck debug ded deiniz del deldir devs dir dirsort disasm \ display dmode dsave dump echo edit error exbin format \ @@ -17,13 +16,13 @@ rename save setime shellplus shell_21 sleep \ tee tmode touch tsmon tuneport unlink verify xmode -CMDS_D2 = basic09 runb gfx inkey syscall copy del echo format \ - merge os9gen prompt tmode +CMDS_D2 = copy del echo format merge os9gen prompt tmode CMDS_DW = inetd telnet dw httpd -SUBS = gfx inkey syscall -ALLOBJS = $(CMDS) $(CMDS_D2) $(CMDS_DW) $(SUBS) +BASIC09 = basic09 runb gfx inkey syscall + +ALLOBJS = $(CMDS) $(CMDS_D2) $(CMDS_DW) $(BASIC09) all: $(ALLOBJS) @@ -49,10 +48,10 @@ @$(ECHO) $(CMDS) showobjs_d2: - @$(ECHO) $(CMDS_D2) + @$(ECHO) $(CMDS_D2) $(BASIC09) showobjs_dw: - @$(ECHO) $(sort $(CMDS) $(CMDS_DW)) + @$(ECHO) $(CMDS) $(CMDS_DW) $(BASIC09) showallobjs: @$(ECHO) $(ALLOBJS)