Mercurial > hg > Members > kono > nitros9-code

changeset 341:20944721d3e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Major makefile mods
author boisy
date Wed, 24 Jul 2002 14:34:24 +0000
parents 2c95b3e0ffc8
children 56297204e8da
files level2/cmds/makefile level2/coco3/bootfiles/makefile level2/coco3_6309/bootfiles/makefile level2/defs/makefile level2/makefile level2/modules/makefile
diffstat 6 files changed, 27 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/level2/cmds/makefile	Wed Jul 24 14:10:07 2002 +0000
+++ b/level2/cmds/makefile	Wed Jul 24 14:34:24 2002 +0000
@@ -9,7 +9,6 @@
 		setime shell_21 sleep tee tmode tsmon unlink \
 		verify wcreate xmode
 SUBS            = gfx2 gfx inkey
-ALLOBJS		= $(CMDS) $(SUBS)
 
 SHELLMODS	= shell_21 build copy date deiniz del dir display echo iniz \
 		link list load mdir merge mfree procs tmode unlink
@@ -20,9 +19,11 @@
 		list.asm load.asm login.asm makdir.asm merge.asm os9gen.asm pwd.asm pxd.asm rename.asm \
 		save.asm setime.asm sleep.asm tee.asm tmode.asm tuneport.asm tsmon.asm verify.asm xmode.asm
 
+ALLOBJS		= $(CMDS) $(SUBS)
+
 # Files not compilable by os9asm: config
 all:	$(ALLOBJS) shell utilpak1 $(DEPENDS)
-	$(CHMOD) a+rx $(ALLOBJS) shell utilpak1
+	$(CHMOD) 755 $(ALLOBJS) shell utilpak1
 
 shell:  $(SHELLMODS) $(DEPENDS)
 	$(MERGE) $(SHELLMODS)>$@
@@ -42,5 +43,8 @@
 clean:
 	$(RM) $(ALLOBJS) $(LEVEL1FILES) shell utilpak1
 
+showobjs:
+	@$(ECHO) $(ALLOBJS) shell utilpak1
+
 identify:
 	$(IDENT_SHORT) $(ALLOBJS)
--- a/level2/coco3/bootfiles/makefile	Wed Jul 24 14:10:07 2002 +0000
+++ b/level2/coco3/bootfiles/makefile	Wed Jul 24 14:34:24 2002 +0000
@@ -42,6 +42,7 @@
 BOOTFILES	= bootfile_1773 bootfile_kenton bootfile_rom
 
 all:	$(BOOTFILES)
+	$(CHMOD) 600 $(BOOTFILES)
 
 bootfile_1773: $(BOOTFILE_1773) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_1773)>$@
--- a/level2/coco3_6309/bootfiles/makefile	Wed Jul 24 14:10:07 2002 +0000
+++ b/level2/coco3_6309/bootfiles/makefile	Wed Jul 24 14:34:24 2002 +0000
@@ -42,6 +42,7 @@
 BOOTFILES	= bootfile_1773 bootfile_kenton bootfile_rom
 
 all:	$(BOOTFILES)
+	$(CHMOD) 600 $(BOOTFILES)
 
 bootfile_1773: $(BOOTFILE_1773) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_1773)>$@
--- a/level2/defs/makefile	Wed Jul 24 14:10:07 2002 +0000
+++ b/level2/defs/makefile	Wed Jul 24 14:34:24 2002 +0000
@@ -8,6 +8,7 @@
 ALLOBJS		= $(DEFS)
 
 all:	$(ALLOBJS)
+	$(CHMOD) 644 $(ALLOBJS)
 
 Defsfile: defsfile
 	$(AS) $(DEFOPTS) -p $< > $@
--- a/level2/makefile	Wed Jul 24 14:10:07 2002 +0000
+++ b/level2/makefile	Wed Jul 24 14:34:24 2002 +0000
@@ -1,5 +1,7 @@
 include ../Makefile.rules
 
+ROOTFILES	= startup
+
 # Make all components
 all:
 	@$(ECHO) "*********************************************"
@@ -13,6 +15,8 @@
 	$(CD) DEFS; make
 	$(CD) SYS; make
 	$(CD) BOOTFILES; make
+	$(UNIX2OS9) $(ROOTFILES)
+	$(CHMOD) 644 $(ROOTFILES)
 
 # Clean all components
 clean:
@@ -21,3 +25,4 @@
 	-$(CD) DEFS; make clean
 	-$(CD) SYS; make clean
 	-$(CD) BOOTFILES; make clean
+	-$(OS92UNIX) $(ROOTFILES)
--- a/level2/modules/makefile	Wed Jul 24 14:10:07 2002 +0000
+++ b/level2/modules/makefile	Wed Jul 24 14:34:24 2002 +0000
@@ -5,7 +5,8 @@
 
 BOOTERS		= boot_1773
 KERNELS		= os9p1 os9p2
-SYSMODS		= rel rominfo rom_vectors ioman init pakrom
+ROMMODS         = rominfo rom_vectors cc3go_rom pakrom
+SYSMODS		= rel ioman init cc3go
 CLOCKS		= clock clock2_soft clock2_disto clock2_146818
 FMGRS		= scf.mn rbf.mn pipeman.mn pipeman_named.mn
 DRIVERS		= cc3disk.dr cc3hdisk.dr cc3io.dr modpak.dr \
@@ -25,7 +26,6 @@
 WINDESCS	= 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
-SYSGOS		= cc3go cc3go_rom
 
 #
 # The following macros represent a collection of modules for various
@@ -39,12 +39,14 @@
 # These kernels are intended to be ROMmed in a disk controller or program pak
 KERNEL_PAK_KENTON	= pakrom $(KERNEL_KENTON)
 
-ALLOBJS		= $(BOOTERS) $(KERNELS) $(SYSMODS) $(CLOCKS) $(FMGRS) \
-		$(DRIVERS) $(IOSUBS) $(DESCS) $(WINDESCS) $(SYSGOS) \
+ALLOBJS		=  $(BOOTERS) $(KERNELS) $(ROMMODS) $(SYSMODS) $(CLOCKS) $(FMGRS) \
+		$(DRIVERS) $(IOSUBS) $(DESCS) $(WINDESCS) \
 		kernel_1773 kernel_rom kernel_kenton kernel_pak_kenton \
 		kernel_rampak kernel_ide
 
 all:	$(ALLOBJS)
+	$(CHMOD) 755 $(ALLOBJS)
+
 
 # Special cases here
 sacia.dr: xacia.asm
@@ -80,5 +82,12 @@
 clean:
 	$(RM) $(ALLOBJS)
 
+showobjs:
+	@$(ECHO) $(ALLOBJS)
+
+showcopyobjs:
+	@$(ECHO) $(BOOTERS) $(KERNELS) $(SYSMODS) $(CLOCKS) $(FMGRS) \
+		$(DRIVERS) $(IOSUBS) $(DESCS) $(WINDESCS) \
+
 identify:
 	$(IDENT_SHORT) $(ALLOBJS)