Mercurial > hg > Members > kono > nitros9-code

changeset 1802:124703b3d9ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Makefile udpates by Phill
author boisy
date Wed, 13 Apr 2005 20:30:30 +0000
parents 75f1d0fc33e1
children 6b0d1027e4e0
files level1/makefile.dalpha level1/makefile.dragon level1/modules/makefile.dragon
diffstat 3 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/level1/makefile.dalpha	Wed Apr 13 17:24:12 2005 +0000
+++ b/level1/makefile.dalpha	Wed Apr 13 20:30:30 2005 +0000
@@ -6,8 +6,8 @@
 BOOTFILE	= bootfiles/bootfile_dalpha_$(TERMWIDTH)
 BOOTFILE_DS80	= bootfiles/bootfile_dalpha_$(TERMWIDTH)
 KERNELFILE	= bootfiles/kernel_dalpha
-DIRS		= cmds modules defs sys bootfiles
-DDIRS		= modules bootfiles
+DIRS		= cmds modules sys bootfiles
+DDIRS		= modules bootfiles defs
 
 # Specify which shell should be used
 #WHICHSHELL	= shellplus
@@ -24,7 +24,7 @@
 MODULECMDS	= $(WHICHSHELL) del echo format makdir merge os9gen prompt tmode
 
 SYS		= $(shell $(CD) sys; make showobjs)
-DEFS		= $(shell $(CD) defs; make showobjs)
+DEFS		= $(shell $(CD) defs; make -f makefile.dragon showobjs)
 ROOTFILES	= 
 STARTUP		= startup.dalpha
 
--- a/level1/makefile.dragon	Wed Apr 13 17:24:12 2005 +0000
+++ b/level1/makefile.dragon	Wed Apr 13 20:30:30 2005 +0000
@@ -6,9 +6,9 @@
 BOOTFILE	= bootfiles/bootfile_d64_$(TERMWIDTH)
 BOOTFILE_DS80	= bootfiles/bootfile_d64_$(TERMWIDTH)
 KERNELFILE	= bootfiles/kernel_d64
-DIRS		= cmds defs sys 
+DIRS		= cmds sys 
 #modules bootfiles
-DDIRS		= modules bootfiles
+DDIRS		= modules bootfiles defs
 
 # Specify which shell should be used
 #WHICHSHELL	= shellplus
@@ -25,7 +25,7 @@
 MODULECMDS	= $(WHICHSHELL) del echo format makdir merge os9gen prompt tmode
 
 SYS		= $(shell $(CD) sys; make showobjs)
-DEFS		= $(shell $(CD) defs; make showobjs)
+DEFS		= $(shell $(CD) defs; make -f makefile.dragon showobjs)
 ROOTFILES	= 
 STARTUP		= startup.dragon
 
--- a/level1/modules/makefile.dragon	Wed Apr 13 17:24:12 2005 +0000
+++ b/level1/modules/makefile.dragon	Wed Apr 13 20:30:30 2005 +0000
@@ -122,7 +122,7 @@
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -aDNum=0
 
 d1_dalpha.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -aDNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -aDNum=1
 
 d2_dalpha.dd: ddiskdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=2