Mercurial > hg > Members > kono > nitros9-code

changeset 1186:0836a89b1eac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed MODULE directory organization
author boisy
date Fri, 30 May 2003 21:09:07 +0000
parents c845c2f0ab76
children df263e490f85
files level1/ChangeLog level1/makefile level1/modules/makefile level2/coco3/ChangeLog level2/coco3_6309/ChangeLog level2/makefile level2/modules/makefile
diffstat 7 files changed, 193 insertions(+), 72 deletions(-) [+]
line wrap: on
line diff
--- a/level1/ChangeLog	Fri May 30 21:08:15 2003 +0000
+++ b/level1/ChangeLog	Fri May 30 21:09:07 2003 +0000
@@ -1,4 +1,10 @@
 OS-9 Level One V03.01.02:
+- The MODULES directory structure has been enhanced to include
+  multiple subdirectories for better module organization.
+- Booter modules for Burke & Burke, Disto RAMPak, Eliminator and
+  IDE-LBA have been added.
+- The BOOTLISTS/ directory has been added on the Modules disk, and
+  contains bootlist files for various configurations.
 - The cputype command has been optimized for size.
 
 OS-9 Level One V03.01.01:
--- a/level1/makefile	Fri May 30 21:08:15 2003 +0000
+++ b/level1/makefile	Fri May 30 21:09:07 2003 +0000
@@ -2,13 +2,20 @@
 
 include ../Makefile.rules
 
-RELEASE		= os9l1v030101
+RELEASE		= os9l1v030102
 BOOTFILE	= BOOTFILES/bootfile_stock
-KERNEL		= BOOTFILES/kernel_stock
+KERNELFILE	= BOOTFILES/kernel_stock
 DIRS		= CMDS MODULES DEFS SYS BOOTFILES
 
 CMDS		= $(shell $(CD) CMDS; make showcocoobjs)
-MODULES		= $(shell $(CD) MODULES; make showcopyobjs)
+BOOTTRACK	= $(shell $(CD) MODULES; make showboottrack)
+KERNEL		= $(shell $(CD) MODULES; make showkernel)
+SYSMODS		= $(shell $(CD) MODULES; make showsysmods)
+CLOCKS		= $(shell $(CD) MODULES; make showclocks)
+RBF		= $(shell $(CD) MODULES; make showrbf)
+SCF		= $(shell $(CD) MODULES; make showscf)
+PIPE		= $(shell $(CD) MODULES; make showpipe)
+
 SYS		= $(shell $(CD) SYS; make showobjs)
 DEFS		= $(shell $(CD) DEFS; make showobjs)
 ROOTFILES	= startup
@@ -17,6 +24,7 @@
 DSK1		= $(RELEASE)_ds40_1.dsk
 DSK2		= $(RELEASE)_ds40_2.dsk
 
+
 # Make all components
 all:
 	@$(ECHO) "*********************************************"
@@ -44,7 +52,7 @@
 $(DSK1):
 	$(RM) $@
 	$(OS9FORMAT_DS40) $@ -n"OS-9 Level One System Disk"
-	$(OS9GEN) $@ -b=$(BOOTFILE) -t=$(KERNEL)
+	$(OS9GEN) $@ -b=$(BOOTFILE) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(CD) CMDS; $(CP) $(CMDS) ../$@,CMDS
@@ -61,6 +69,29 @@
 	$(RM) $@
 	$(OS9FORMAT_DS40) $@ -n"OS-9 Level One Modules Disk"
 	$(MAKDIR) $@,MODULES
-	$(CD) MODULES; $(CP) $(MODULES) ../$@,MODULES
-	$(foreach file, $(MODULES), $(OS9ATTR_EXEC) $@,MODULES/$(file);)
+	$(MAKDIR) $@,MODULES/BOOTTRACK
+	$(CD) MODULES; $(CP) $(BOOTTRACK) ../$@,MODULES/BOOTTRACK
+	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,MODULES/BOOTTRACK/$(file);)
+	$(MAKDIR) $@,MODULES/KERNEL
+	$(CD) MODULES; $(CP) $(KERNEL) ../$@,MODULES/KERNEL
+	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,MODULES/KERNEL/$(file);)
+	$(MAKDIR) $@,MODULES/SYSMODS
+	$(CD) MODULES; $(CP) $(SYSMODS) ../$@,MODULES/SYSMODS
+	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,MODULES/SYSMODS/$(file);)
+	$(MAKDIR) $@,MODULES/CLOCKS
+	$(CD) MODULES; $(CP) $(CLOCKS) ../$@,MODULES/CLOCKS
+	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,MODULES/CLOCKS/$(file);)
+	$(MAKDIR) $@,MODULES/RBF
+	$(CD) MODULES; $(CP) $(RBF) ../$@,MODULES/RBF
+	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,MODULES/RBF/$(file);)
+	$(MAKDIR) $@,MODULES/SCF
+	$(CD) MODULES; $(CP) $(SCF) ../$@,MODULES/SCF
+	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,MODULES/SCF/$(file);)
+	$(MAKDIR) $@,MODULES/PIPE
+	$(CD) MODULES; $(CP) $(PIPE) ../$@,MODULES/PIPE
+	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,MODULES/PIPE/$(file);)
+	$(MAKDIR) $@,BOOTLISTS
+	$(CD) BOOTLISTS; $(CPL) * ../$@,BOOTLISTS
+#       $(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,MODULES/PIPE/$(file);)
 
+
--- a/level1/modules/makefile	Fri May 30 21:08:15 2003 +0000
+++ b/level1/modules/makefile	Fri May 30 21:09:07 2003 +0000
@@ -1,28 +1,33 @@
+# Makefile for OS-9 Level One MODULES/
+
 include ../../Makefile.rules
 
 DEPENDS		= ./Makefile
 TPB		= $(3RDPARTY)/booters
 
-BOOTERS		= oscode oscode_d64 boot_1773 boot_d64
-KERNELS		= os9 os9p2
-ROMMODS		= sysgo_rom
-SYSMODS		= ioman init sysgo sysgo_d64
+BOOTERS		= boot_1773 boot_burke boot_idelba boot_rampak boot_wd1002
+BOOTTRACK	= oscode $(BOOTERS) os9 os9p2
+KERNEL		=
+SYSMODS		= ioman init sysgo
 CLOCKS		= clock.60hz clock.50hz clock_tc3 clock_bb
-CLOCKS_D64	= clock_d64
-FMGRS		= scf.mn rbf.mn pipeman.mn
-DRIVERS		= aciapak.dr cchdisk.dr ccdisk.dr modpak.dr nildrv.dr \
-		piper.dr printer.dr rs232.dr sscpak.dr ccio.dr
-DRIVERS_D64	= ddisk.dr kbvdio.dr drvr51.dr
-IOSUBS		= co32.io co80.io grfo.io
-DESCS		= ddd0_35s.dd d0_35s.dd d1_35s.dd d2_35s.dd d3_35s.dd \
+
+RBF		= rbf.mn \
+		ccdisk.dr cchdisk.dr \
+		ddd0_35s.dd d0_35s.dd d1_35s.dd d2_35s.dd d3_35s.dd \
 		ddd0_40d.dd d0_40d.dd d1_40d.dd d2_40d.dd \
 		ddd0_80d.dd d0_80d.dd d1_80d.dd d2_80d.dd \
-		h0_15.dd h1_15.dd h0_35.dd h1_35.dd \
+		h0_15.dd h1_15.dd h0_35.dd h1_35.dd
+
+SCF		= scf.mn \
+		aciapak.dr modpak.dr nildrv.dr printer.dr rs232.dr sscpak.dr ccio.dr \
+		co32.io co80.io grfo.io \
 		m1.dd m2.dd nil.dd p.dd pipe.dd ssc.dd \
-		term_t1.dd t1.dd t2.dd t3.dd term32.dd term80.dd \
-		term_kbvdio.dd
-DESCS_D64	= p1_d64.dd term_kbvdio.dd t1_d64.dd \
-		dd_d64.dd d0_d64.dd d1_d64.dd d2_d64.dd d3_d64.dd
+		term_t1.dd t1.dd t2.dd t3.dd term32.dd term80.dd
+
+PIPE		= pipeman.mn \
+		piper.dr \
+		pipe.dd
+
 HELP		= co32.hp co80.hp \
 		ddd0_35s.hp d0_35s.hp d1_35s.hp d2_35s.hp d3_35s.hp \
 		ddd0_40d.hp d0_40d.hp d1_40d.hp d2_40d.hp \
@@ -31,14 +36,13 @@
 		h0_35.hp h1_15.hp h1_35.hp m1.hp m2.hp nil.hp p.hp pipe.hp \
 		ssc.hp t1.hp t2.hp t3.hp term32.hp term80.hp config.hp
 
-COPYOBJS	= $(SYSMODS) $(CLOCKS) $(FMGRS) $(DRIVERS) $(IOSUBS) \
-		$(DESCS) $(HELP)
-ALLOBJS		= $(BOOTERS) $(KERNELS) $(ROMMODS) $(SYSMODS) $(CLOCKS) $(FMGRS) \
-		$(DRIVERS) $(IOSUBS) $(DESCS)
+ALLOBJS		= $(BOOTTRACK) $(KERNEL) $(SYSMODS) $(CLOCKS) $(RBF) $(SCF) $(PIPE)
 
 all:	$(ALLOBJS) $(HELP)
 
-# Special cases here
+# Special cases
+
+# Floppy descriptors
 SSDD35		= -aCyls=35 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \
 		-aInterlv=3 -aSAS=8 -aDensity=1
 DSDD40		= -aCyls=40 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
@@ -46,7 +50,6 @@
 DSDD80		= -aCyls=80 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
 		-aInterlv=3 -aSAS=8 -aDensity=3
 
-# Floppy descriptors
 ddd0_35s.dd: ccdiskdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=0 -aDD=1
 
@@ -89,15 +92,10 @@
 oscode: oscode.asm
 	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aDragon64=0
 
-oscode_d64: oscode.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aDragon64=1
-
 sysgo: sysgo.asm
 	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aDiskGo=1
 
-sysgo_rom: sysgo.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aDiskGo=0
-
+# Clocks
 clock_tc3: clock.asm
 	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aRTCTC3=1 -aTPS=60
 
@@ -107,11 +105,31 @@
 clean:
 	$(RM) $(ALLOBJS)
 
+showobjs:
+	@$(ECHO) $(ALLOBJS)
+
+showboottrack:
+	@$(ECHO) $(BOOTTRACK)
+
+showkernel:
+	@$(ECHO) $(KERNEL)
+
+showsysmods:
+	@$(ECHO) $(SYSMODS)
+
+showclocks:
+	@$(ECHO) $(CLOCKS)
+
+showrbf:
+	@$(ECHO) $(RBF)
+
+showscf:
+	@$(ECHO) $(SCF)
+
+showpipe:
+	@$(ECHO) $(PIPE)
+
 identify:
 	$(IDENT_SHORT) $(ALLOBJS)
 
-showallobjs:
-	@$(ECHO) $(ALLOBJS)
 
-showcopyobjs:
-	@$(ECHO) $(COPYOBJS)
--- a/level2/coco3/ChangeLog	Fri May 30 21:08:15 2003 +0000
+++ b/level2/coco3/ChangeLog	Fri May 30 21:09:07 2003 +0000
@@ -1,4 +1,12 @@
 OS-9 Level Two V03.01.02:
+- Drivers and descriptors for Tandy's Hard Disk Interface have
+  been added to the MODULES directory.
+- The MODULES directory structure has been enhanced to include
+  multiple subdirectories for better module organization.
+- Booter modules for Burke & Burke, Disto RAMPak, Eliminator and 
+  IDE-LBA have been added.
+- The BOOTLISTS/ directory has been added on the Modules disk, and
+  contains bootlist files for various configurations.
 - The cputype command has been optimized for size.
 - Slight performance modifications were made to RBF and SCF.
 - More commands have been added to the merged utilpak1 file.
--- a/level2/coco3_6309/ChangeLog	Fri May 30 21:08:15 2003 +0000
+++ b/level2/coco3_6309/ChangeLog	Fri May 30 21:09:07 2003 +0000
@@ -1,4 +1,12 @@
 OS-9 Level Two V03.01.02:
+- Drivers and descriptors for Tandy's Hard Disk Interface have
+  been added to the MODULES directory.
+- The MODULES directory structure has been enhanced to include
+  multiple subdirectories for better module organization.
+- Booter modules for Burke & Burke, Disto RAMPak, Eliminator and 
+  IDE-LBA have been added.
+- The BOOTLISTS/ directory has been added on the Modules disk, and
+  contains bootlist files for various configurations.
 - The cputype command has been optimized for size.
 - Slight performance modifications were made to RBF and SCF.
 - More commands have been added to the merged utilpak1 file.
--- a/level2/makefile	Fri May 30 21:08:15 2003 +0000
+++ b/level2/makefile	Fri May 30 21:09:07 2003 +0000
@@ -2,13 +2,20 @@
 
 include ../Makefile.rules
 
-RELEASE		= os9l2v030101
+RELEASE		= os9l2v030102
 BOOTFILE	= BOOTFILES/bootfile_vdg
-KERNEL		= BOOTFILES/kernel_stock
+KERNELFILE	= BOOTFILES/kernel_stock
 DIRS		= CMDS MODULES DEFS SYS BOOTFILES
 
 CMDS		= $(shell $(CD) CMDS; make showobjs)
-MODULES		= $(shell $(CD) MODULES; make showcopyobjs)
+BOOTTRACK	= $(shell $(CD) MODULES; make showboottrack)
+KERNEL		= $(shell $(CD) MODULES; make showkernel)
+SYSMODS		= $(shell $(CD) MODULES; make showsysmods)
+CLOCKS		= $(shell $(CD) MODULES; make showclocks)
+RBF		= $(shell $(CD) MODULES; make showrbf)
+SCF		= $(shell $(CD) MODULES; make showscf)
+PIPE		= $(shell $(CD) MODULES; make showpipe)
+
 DEFS		= $(shell $(CD) DEFS; make showobjs)
 SYSBIN		= $(shell $(CD) SYS; make showbinobjs)
 SYSTEXT		= $(shell $(CD) SYS; make showtextobjs)
@@ -48,7 +55,7 @@
 $(DSK1):
 	-$(RM) $@
 	$(OS9FORMAT_DS40) $@ -n"OS-9 Level Two System Disk"
-	$(OS9GEN) $@ -b=$(BOOTFILE) -t=$(KERNEL)
+	$(OS9GEN) $@ -b=$(BOOTFILE) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
@@ -69,6 +76,28 @@
 	-$(RM) $@
 	$(OS9FORMAT_DS40) $@ -n"OS-9 Level Two Modules Disk"
 	$(MAKDIR) $@,MODULES
-	$(CD) MODULES; $(CP) $(MODULES) ../$@,MODULES
-	$(foreach file, $(MODULES), $(OS9ATTR_EXEC) $@,MODULES/$(file);)
+	$(MAKDIR) $@,MODULES/BOOTTRACK
+	$(CD) MODULES; $(CP) $(BOOTTRACK) ../$@,MODULES/BOOTTRACK
+	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,MODULES/BOOTTRACK/$(file);)
+	$(MAKDIR) $@,MODULES/KERNEL
+	$(CD) MODULES; $(CP) $(KERNEL) ../$@,MODULES/KERNEL
+	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,MODULES/KERNEL/$(file);)
+	$(MAKDIR) $@,MODULES/SYSMODS
+	$(CD) MODULES; $(CP) $(SYSMODS) ../$@,MODULES/SYSMODS
+	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,MODULES/SYSMODS/$(file);)
+	$(MAKDIR) $@,MODULES/CLOCKS
+	$(CD) MODULES; $(CP) $(CLOCKS) ../$@,MODULES/CLOCKS
+	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,MODULES/CLOCKS/$(file);)
+	$(MAKDIR) $@,MODULES/RBF
+	$(CD) MODULES; $(CP) $(RBF) ../$@,MODULES/RBF
+	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,MODULES/RBF/$(file);)
+	$(MAKDIR) $@,MODULES/SCF
+	$(CD) MODULES; $(CP) $(SCF) ../$@,MODULES/SCF
+	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,MODULES/SCF/$(file);)
+	$(MAKDIR) $@,MODULES/PIPE
+	$(CD) MODULES; $(CP) $(PIPE) ../$@,MODULES/PIPE
+	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,MODULES/PIPE/$(file);)
+	$(MAKDIR) $@,BOOTLISTS
+	$(CD) BOOTLISTS; $(CPL) * ../$@,BOOTLISTS
+#	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,MODULES/PIPE/$(file);)
 
--- a/level2/modules/makefile	Fri May 30 21:08:15 2003 +0000
+++ b/level2/modules/makefile	Fri May 30 21:09:07 2003 +0000
@@ -2,6 +2,8 @@
 
 include ../../Makefile.rules
 
+vpath %.asm $(LEVEL1)/MODULES
+
 CLOCKELIM       = -aRTCElim=1 -aRTCDsto2=0 -aRTCDsto4=0 -aRTCBB=0 -aRTCSmart=0 -aRTCHarrs=0 -aRTCTc3=0 -aRTCSoft=0 -aMPIFlag=0
 CLOCKDISTO2     = -aRTCElim=0 -aRTCDsto2=1 -aRTCDsto4=0 -aRTCBB=0 -aRTCSmart=0 -aRTCHarrs=0 -aRTCTc3=0 -aRTCSoft=0 -aMPIFlag=0
 CLOCKDISTO4     = -aRTCElim=0 -aRTCDsto2=0 -aRTCDsto4=1 -aRTCBB=0 -aRTCSmart=0 -aRTCHarrs=0 -aRTCTc3=0 -aRTCSoft=0 -aMPIFlag=0
@@ -14,33 +16,37 @@
 DEPENDS		= ./Makefile
 TPB		= ../../3rdparty/booters
 
-BOOTERS		= boot_1773
-OS9P1		= os9p1
-OS9P2		= os9p2
-REL		= rel
-SYSMODS		= ioman init cc3go os9p3_perr os9p4_regdump
+BOOTERS		= boot_1773 boot_burke boot_idelba boot_rampak boot_wd1002
+BOOTTRACK	= rel $(BOOTERS) os9p1
+KERNEL		= os9p2 os9p3_perr os9p4_regdump
+SYSMODS		= ioman init cc3go
 CLOCKS          = clock_elim clock_disto2 clock_disto4 clock_bnb \
 		clock_smart clock_harris clock_tc3 clock_soft
-FMGRS		= scf.mn rbf.mn pipeman.mn pipeman_named.mn
-DRIVERS		= cc3disk.dr cc3hdisk.dr cc3io.dr modpak.dr \
-		vrn.dr piper.dr printer.dr sio.dr rammer.dr sspak.dr \
-		sacia.dr dacia.dr
-IOSUBS		= windint.io vdgint.io vdgint_small.io \
-		keydrv joydrv_joy \
-		joydrv_6551L joydrv_6552L joydrv_6551M joydrv_6552M snddrv
-DESCS		= d0_35s.dd d1_35s.dd d2_35s.dd d3_35s.dd \
+
+RBF		= rbf.mn \
+		cc3disk.dr cc3hdisk.dr rammer.dr \
+		d0_35s.dd d1_35s.dd d2_35s.dd d3_35s.dd \
 		d0_40d.dd d1_40d.dd d2_40d.dd d0_80d.dd \
 		d1_80d.dd d2_80d.dd ddd0_35s.dd ddd0_40d.dd \
 		ddd0_80d.dd r0_8k.dd r0_96k.dd r0_128k.dd r0_192k.dd \
 		ddr0_8k.dd ddr0_96k.dd ddr0_128k.dd ddr0_192k.dd \
-		m1.dd m2.dd nil.dd p.dd pipe.dd t1.dd t2_sacia.dd \
+		h0_10.dd h1_10.dd h0_15.dd h1_15.dd h0_35.dd h1_35.dd
+
+SCF		= scf.mn \
+		cc3io.dr modpak.dr vrn.dr printer.dr sio.dr sspak.dr sacia.dr dacia.dr \
+		windint.io vdgint.io vdgint_small.io \
+		keydrv joydrv_joy joydrv_6551L joydrv_6552L joydrv_6551M joydrv_6552M snddrv \
+		m1.dd m2.dd nil.dd p.dd t1.dd t2_sacia.dd \
 		t3_sacia.dd t2_dacia.dd t3_dacia.dd \
-		h0_10.dd h1_10.dd h0_15.dd h1_15.dd h0_35.dd h1_35.dd \
-		ftdd.dd vi.dd ssp.dd term_t1.dd
-WINDESCS	= term_vdg.dt term_win40.dt term_win80.dt w.dw w1.dw w2.dw \
+		ftdd.dd vi.dd ssp.dd term_t1.dd \
+		term_vdg.dt term_win40.dt term_win80.dt w.dw w1.dw w2.dw \
 		w3.dw w4.dw w5.dw w6.dw w7.dw v1.dw v2.dw v3.dw v4.dw v5.dw \
 		v6.dw v7.dw
 
+PIPE		= pipeman.mn pipeman_named.mn \
+		piper.dr \
+		pipe.dd
+
 #
 # The following macros represent a collection of modules for various
 # kernel tracks and bootfile configurations.
@@ -50,12 +56,15 @@
 KERNEL_KENTON	= rel $(TPB)/boot_kenton os9p1
 KERNEL_IDE	= rel $(TPB)/boot_ide os9p1
 
-ALLOBJS		=  $(BOOTERS) $(OS9P1) $(OS9P2) $(REL) $(SYSMODS) $(CLOCKS) $(FMGRS) \
-		$(DRIVERS) $(IOSUBS) $(DESCS) $(WINDESCS)
+ALLOBJS		=  $(BOOTTRACK) $(KERNEL) $(SYSMODS) $(CLOCKS) $(RBF) $(SCF) $(PIPE)
 
 all:	$(ALLOBJS)
 
-# Special cases here
+# Special cases
+cc3hdisk.dr: $(LEVEL1)/MODULES/cchdisk.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS)
+
+# Floppy descriptors
 SSDD35		= -aCyls=35 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \
 		-aInterlv=3 -aSAS=8 -aDensity=1
 DSDD40		= -aCyls=40 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
@@ -63,11 +72,6 @@
 DSDD80		= -aCyls=80 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
 		-aInterlv=3 -aSAS=8 -aDensity=3
 
-# Special cases
-cc3hdisk.dr: ../../level1/MODULES/cchdisk.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS)
-
-# Floppy descriptors
 ddd0_35s.dd: cc3diskdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=0 -aDD=1
 
@@ -176,9 +180,26 @@
 showobjs:
 	@$(ECHO) $(ALLOBJS)
 
-showcopyobjs:
-	@$(ECHO) $(OS9P2) $(SYSMODS) $(CLOCKS) $(FMGRS) \
-		$(DRIVERS) $(IOSUBS) $(DESCS) $(WINDESCS) \
+showboottrack:
+	@$(ECHO) $(BOOTTRACK)
+
+showkernel:
+	@$(ECHO) $(KERNEL)
+
+showsysmods:
+	@$(ECHO) $(SYSMODS)
+
+showclocks:
+	@$(ECHO) $(CLOCKS)
+
+showrbf:
+	@$(ECHO) $(RBF)
+
+showscf:
+	@$(ECHO) $(SCF)
+
+showpipe:
+	@$(ECHO) $(PIPE)
 
 identify:
 	$(IDENT_SHORT) $(ALLOBJS)