Mercurial > hg > Members > kono > nitros9-code

changeset 323:9ca004356f09

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Makefiles modified
author boisy
date Wed, 24 Jul 2002 04:20:53 +0000
parents 0d2d4a28c490
children eb24764bc7b7
files level1/makefile level1/modules/makefile level1/sys/makefile
diffstat 3 files changed, 32 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/level1/makefile	Wed Jul 24 04:17:21 2002 +0000
+++ b/level1/makefile	Wed Jul 24 04:20:53 2002 +0000
@@ -1,5 +1,7 @@
 include ../Makefile.rules
 
+ROOTOBJS	= startup
+
 # Make all components
 all:
 	@$(ECHO) "*********************************************"
@@ -8,19 +10,20 @@
 	@$(ECHO) "*        (C) 1983  Tandy Corporation        *"
 	@$(ECHO) "*                                           *"
 	@$(ECHO) "*********************************************"
-	cd CMDS; make
-	cd MODULES; make
-	cd BOOTFILES; make
-	cd DEFS; make
-	cd SYS; make
-	$(UNIX2OS9) startup
+	$(CD) CMDS; make
+	$(CD) MODULES; make
+	$(CD) BOOTFILES; make
+	$(CD) DEFS; make
+	$(CD) SYS; make
+	$(UNIX2OS9) $(ROOTOBJS)
+	$(CHMOD) 644 $(ROOTOBJS)
 
 # Clean all components
 clean:
-	-cd CMDS; make clean
-	-cd MODULES; make clean
-	-cd BOOTFILES; make clean
-	-cd DEFS; make clean
-	-cd SYS; make clean
-	-$(OS92UNIX) startup
+	-$(CD) CMDS; make clean
+	-$(CD) MODULES; make clean
+	-$(CD) BOOTFILES; make clean
+	-$(CD) DEFS; make clean
+	-$(CD) SYS; make clean
+	-$(OS92UNIX) $(ROOTOBJS)
 
--- a/level1/modules/makefile	Wed Jul 24 04:17:21 2002 +0000
+++ b/level1/modules/makefile	Wed Jul 24 04:20:53 2002 +0000
@@ -5,7 +5,8 @@
 
 BOOTERS		= oscode oscode_d64 boot_1773 boot_d64 $(TPB)/boot_rom_l1 rom_vectors
 KERNELS		= os9 os9p2
-SYSMODS		= rominfo ioman init
+ROMMODS		= rominfo sysgo_rom
+SYSMODS		= ioman init sysgo sysgo_d64
 CLOCKS		= clock.60hz clock.50hz clock_d64
 FMGRS		= scf.mn rbf.mn pipeman.mn
 DRIVERS		= aciapak.dr cchdisk.dr ccdisk.dr modpak.dr nildrv.dr \
@@ -20,7 +21,6 @@
 		t1.dd t2.dd t3.dd term32.dd term80.dd \
 		p1_d64.dd term_d64.dd t1_d64.dd \
 		dd_d64.dd d0_d64.dd d1_d64.dd d2_d64.dd d3_d64.dd
-SYSGOS		= sysgo sysgo_rom sysgo_d64
 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 \
@@ -35,11 +35,15 @@
 KERNEL_IDE	= oscode os9 os9p2 init $(TPB)/boot_ide_l1
 
 BOOT_TRACKS	= kernel_1773 kernel_rom kernel_ide
-ALLOBJS		= $(BOOTERS) $(KERNELS) $(SYSMODS) $(CLOCKS) $(FMGRS) \
-		$(DRIVERS) $(IOSUBS) $(DESCS) $(SYSGOS) $(BOOT_TRACKS)
+COPYOBJS	= $(SYSMODS) $(CLOCKS) $(FMGRS) $(DRIVERS) $(IOSUBS) \
+		$(DESCS) $(HELP)
+ALLOBJS		= $(BOOTERS) $(KERNELS) $(ROMMODS) $(SYSMODS) $(CLOCKS) $(FMGRS) \
+		$(DRIVERS) $(IOSUBS) $(DESCS) $(BOOT_TRACKS)
 
 all:	$(ALLOBJS) $(HELP)
+	$(CHMOD) 755 $(ALLOBJS)
 	$(UNIX2OS9) $(HELP)
+	$(CHMOD) 644 $(HELP)
 
 # Kernel track for OS-9 in ROM on a CoCo
 kernel_rom: $(KERNEL_ROM) $(DEPENDS)
@@ -79,5 +83,8 @@
 identify:
 	$(IDENT_SHORT) $(ALLOBJS)
 
-showobjs:
-	@echo $(ALLOBJS)
+showallobjs:
+	@$(ECHO) $(ALLOBJS)
+
+showcopyobjs:
+	@$(ECHO) $(COPYOBJS)
--- a/level1/sys/makefile	Wed Jul 24 04:17:21 2002 +0000
+++ b/level1/sys/makefile	Wed Jul 24 04:20:53 2002 +0000
@@ -2,7 +2,7 @@
 
 DEPENDS		= ./Makefile
 
-DEFS		= errmsg motd password logbook
+SYSFILES	= errmsg motd password logbook
 HELPFILES	= asm.hp attr.hp backup.hp binex.hp build.hp chd.hp \
 		chx.hp cmp.hp cobbler.hp config.hp copy.hp date.hp \
 		dcheck.hp debug.hp deiniz.hp del.hp deldir.hp dir.hp \
@@ -13,11 +13,12 @@
 		park.hp procs.hp pwd.hp pxd.hp rename.hp save.hp setime.hp \
 		setpr.hp shell.hp sleep.hp tee.hp tmode.hp tsmon.hp \
 		tuneport.hp unlink.hp verify.hp xmode.hp
-ALLOBJS		= $(DEFS)
+ALLOBJS		= $(SYSFILES)
 HELPMSG		= helpmsg
 
 all:	$(ALLOBJS) $(HELPMSG)
 	$(UNIX2OS9) $(ALLOBJS)
+	$(CHMOD) 644 $(ALLOBJS) $(HELPMSG)
 
 helpmsg: $(HELPFILES)
 	$(MERGE) $(HELPFILES) > $@
@@ -28,4 +29,4 @@
 	$(RM) $(HELPMSG)
 
 showobjs:
-	@echo $(ALLOBJS)
+	@$(ECHO) $(ALLOBJS)