--- 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);)
 
+