Mercurial > hg > Members > kono > nitros9-code

changeset 3135:5095f2b3c81a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
coco3: Use port.mak correctly in makefiles The coco3 makefiles are used by other ports too, so they must not override settings from the port.mak files.
author Tormod Volden <debian.tormod@gmail.com>
date Sat, 04 Feb 2017 02:10:31 +0100
parents afd35e662b2b
children 820bc08befa5
files level2/coco3/bootfiles/makefile level2/coco3/bootroms/makefile level2/coco3/cmds/makefile level2/coco3/defs/makefile level2/coco3/modules/kernel/makefile level2/coco3/modules/makefile
diffstat 6 files changed, 6 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/level2/coco3/bootfiles/makefile	Fri Jan 13 20:49:14 2017 +0000
+++ b/level2/coco3/bootfiles/makefile	Sat Feb 04 02:10:31 2017 +0100
@@ -1,4 +1,4 @@
-include $(NITROS9DIR)/rules.mak
+include ../port.mak
 
 # Module directory
 MD		= ../modules
--- a/level2/coco3/bootroms/makefile	Fri Jan 13 20:49:14 2017 +0000
+++ b/level2/coco3/bootroms/makefile	Sat Feb 04 02:10:31 2017 +0100
@@ -1,4 +1,4 @@
-include $(NITROS9DIR)/rules.mak
+include ../port.mak
 
 # Module directory
 MD		= ../modules
--- a/level2/coco3/cmds/makefile	Fri Jan 13 20:49:14 2017 +0000
+++ b/level2/coco3/cmds/makefile	Sat Feb 04 02:10:31 2017 +0100
@@ -1,5 +1,4 @@
-PORT = coco3
-include $(NITROS9DIR)/rules.mak
+include ../port.mak
 
 vpath %.as $(LEVEL2)/cmds:$(LEVEL1)/cmds
 vpath %.asm $(LEVEL2)/cmds:$(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09
--- a/level2/coco3/defs/makefile	Fri Jan 13 20:49:14 2017 +0000
+++ b/level2/coco3/defs/makefile	Sat Feb 04 02:10:31 2017 +0100
@@ -1,5 +1,4 @@
-PORT = coco3
-include $(NITROS9DIR)/rules.mak
+include ../port.mak
 
 DEPENDS		= ./makefile
 
--- a/level2/coco3/modules/kernel/makefile	Fri Jan 13 20:49:14 2017 +0000
+++ b/level2/coco3/modules/kernel/makefile	Sat Feb 04 02:10:31 2017 +0100
@@ -1,5 +1,4 @@
-PORT = coco3
-include $(NITROS9DIR)/rules.mak
+include ../../port.mak
 
 vpath %.asm $(LEVEL2)/modules/kernel:$(LEVEL1)/modules/kernel
 
--- a/level2/coco3/modules/makefile	Fri Jan 13 20:49:14 2017 +0000
+++ b/level2/coco3/modules/makefile	Sat Feb 04 02:10:31 2017 +0100
@@ -1,5 +1,4 @@
-PORT = coco3
-include $(NITROS9DIR)/rules.mak
+include ../port.mak
 
 vpath %.asm kernel:$(LEVEL2)/modules:$(LEVEL1)/modules