changeset 1879:72cb2773d5ee

rules.mak updated with new rules pacos9 updates
author boisy
date Mon, 15 Aug 2005 11:46:16 +0000
parents 5050142536af
children 48ca15748d4e
files 3rdparty/packages/pacos9/makefile rules.mak scripts/bootlistl2 scripts/tracklistl2
diffstat 4 files changed, 25 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/pacos9/makefile	Fri Aug 12 20:01:29 2005 +0000
+++ b/3rdparty/packages/pacos9/makefile	Mon Aug 15 11:46:16 2005 +0000
@@ -5,3 +5,6 @@
 
 pacos9: $(RFILES)
 	rlink  $(RFILES) -o=pacos9 -l=$(C3BASE)/lib/sys.l
+
+clean:
+	$(RM) $(RFILES) pacos9
--- a/rules.mak	Fri Aug 12 20:01:29 2005 +0000
+++ b/rules.mak	Mon Aug 15 11:46:16 2005 +0000
@@ -47,6 +47,10 @@
 ASOUT		= -o
 AFLAGS		= -q -aNOS9VER=$(NOS9VER) -aNOS9MAJ=$(NOS9MAJ) -aNOS9MIN=$(NOS9MIN) -aNOS9DBG=$(NOS9DBG)
 
+# RMA/RLINK
+ASM		= rma
+LINKER	= rlink
+
 # Commands
 MAKDIR		= os9 makdir
 RM		= rm -f
@@ -92,11 +96,14 @@
 %.r: %.c
 	$(CC) $(CFLAGS) $< -r
 
+%.l: %.r
+	$(MERGE) $^ > $@
+
 %: %.r
 	$(CC) $(LFLAGS) $^ -f=$@
 
 %.r: %.a
-	rma $< -o=$@
+	$(ASM) $< -o=$@
 
 # File managers
 %.mn: %.asm
--- a/scripts/bootlistl2	Fri Aug 12 20:01:29 2005 +0000
+++ b/scripts/bootlistl2	Mon Aug 15 11:46:16 2005 +0000
@@ -22,14 +22,18 @@
 *
 $NITROS9DIR/$DISTRO/modules/rbf.mn
 *
+* EMUDsk (for emulators)
+*$NITROS9DIR/3rdparty/drivers/emudsk/emudsk.dr
+*$NITROS9DIR/3rdparty/drivers/emudsk/ddh0.dd
+*
 * DriveWire driver (Cloud-9 product)
-*$NITROS9DIR/$DISTRO/modules/drivewire.dr
+$CLOUD9DIR/Products/DriveWire/software/$DISTRO/drivewire.dr
 * DriveWire descriptors - select as needed
-*$CLOUD9DIR/Products/DriveWire/software/$DISTRO/ddx0.dd
+$CLOUD9DIR/Products/DriveWire/software/$DISTRO/ddx0.dd
 *$CLOUD9DIR/Products/DriveWire/software/$DISTRO/x0.dd
-*$CLOUD9DIR/Products/DriveWire/software/$DISTRO/x1.dd
-*$CLOUD9DIR/Products/DriveWire/software/$DISTRO/x2.dd
-*$CLOUD9DIR/Products/DriveWire/software/$DISTRO/x3.dd  
+$CLOUD9DIR/Products/DriveWire/software/$DISTRO/x1.dd
+$CLOUD9DIR/Products/DriveWire/software/$DISTRO/x2.dd
+$CLOUD9DIR/Products/DriveWire/software/$DISTRO/x3.dd  
 *
 * SuperDriver Package (Cloud-9 product)
 *$CLOUD9DIR/Products/SuperDrivers/software/$DISTRO/rbsuper.dr
@@ -62,7 +66,7 @@
 * Floppy device descriptors
 * DD - default device - choose one if needed
 *$NITROS9DIR/$DISTRO/modules/ddd0_35s.dd
-$NITROS9DIR/$DISTRO/modules/ddd0_40d.dd
+*$NITROS9DIR/$DISTRO/modules/ddd0_40d.dd
 *../MODULES/RBF/ddd0_80d.dd
 * D0 - drive 0 - choose one if needed
 *$NITROS9DIR/$DISTRO/modules/d0_35s.dd
--- a/scripts/tracklistl2	Fri Aug 12 20:01:29 2005 +0000
+++ b/scripts/tracklistl2	Mon Aug 15 11:46:16 2005 +0000
@@ -14,9 +14,9 @@
 * The REL module readies the computer for NitrOS-9.
 *  Select only one: 32, 40 or 80 column boot screen.
 *
-$NITROS9DIR/$DISTRO/modules/rel_32
+*$NITROS9DIR/$DISTRO/modules/rel_32
 *$NITROS9DIR/$DISTRO/modules/rel_40
-*$NITROS9DIR/$DISTRO/modules/rel_80
+$NITROS9DIR/$DISTRO/modules/rel_80
 *
 ***************************************
 * Booter Section
@@ -26,7 +26,7 @@
 *
 * NitrOS-9 Standard Booters: WD1773 6ms and 30ms step rates,
 * B&B HD, Disto RAMPak or Eliminator WD1002 HD
-$NITROS9DIR/$DISTRO/modules/boot_1773_6ms
+*$NITROS9DIR/$DISTRO/modules/boot_1773_6ms
 *$NITROS9DIR/$DISTRO/modules/boot_1773_30ms
 *$NITROS9DIR/$DISTRO/modules/boot_burke
 *$NITROS9DIR/$DISTRO/modules/boot_rampak
@@ -41,7 +41,7 @@
 *$CLOUD9DIR/Products/SuperDrivers/software/$DISTRO/boot_ktlr
 *
 * DriveWire Booter
-*$CLOUD9DIR/Products/DriveWire/software/$DISTRO/boot_dw
+$CLOUD9DIR/Products/DriveWire/software/$DISTRO/boot_dw
 *
 ***************************************
 * Kernel Section