Mercurial > hg > Members > kono > nitros9-code

changeset 2052:abea68d64225

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed some issues
author boisy
date Sun, 23 Apr 2006 19:36:36 +0000
parents a45c8cabc60e
children 34ae72c7b040
files level1/makefile level2/makefile level2/sys/makefile makefile rules.mak
diffstat 5 files changed, 6 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/level1/makefile	Sun Apr 23 19:24:03 2006 +0000
+++ b/level1/makefile	Sun Apr 23 19:36:36 2006 +0000
@@ -22,7 +22,3 @@
 # Clean DSK images
 dskclean:
 	$(foreach dir, $(dirs), ($(CD) $(dir); make dskclean);)
-
-# Copy DSK images
-dskcopy: dsk
-	$(foreach dir, $(dirs), ($(CD) $(dir); make dskcopy);)
--- a/level2/makefile	Sun Apr 23 19:24:03 2006 +0000
+++ b/level2/makefile	Sun Apr 23 19:36:36 2006 +0000
@@ -22,7 +22,3 @@
 # Clean DSK images
 dskclean:
 	$(foreach dir, $(dirs), ($(CD) $(dir); make dskclean);)
-
-# Copy DSK images
-dskcopy: dsk
-	$(foreach dir, $(dirs), ($(CD) $(dir); make dskcopy);)
--- a/level2/sys/makefile	Sun Apr 23 19:24:03 2006 +0000
+++ b/level2/sys/makefile	Sun Apr 23 19:36:36 2006 +0000
@@ -1,7 +1,7 @@
 PORT = coco3
 include ../../rules.mak
 
-vpath %.hp $(6809L1)/sys
+vpath %.hp $(LEVEL1)/sys
 
 DEPENDS		= ./makefile
 
@@ -44,8 +44,8 @@
 $(HELPMSG): $(HELPFILES)
 	$(MERGE) $^ > $@
 
-$(L1TXTFILES): $(6809L1)/sys/$@
-	-$(SOFTLINK) $(6809L1)/sys/$@
+$(L1TXTFILES): $(LEVEL1)/sys/$@
+	-$(SOFTLINK) $(LEVEL1)/sys/$@
 
 clean:
 	$(RM) $(HELPMSG) $(L1TXTFILES) $(BINFILES)
--- a/makefile	Sun Apr 23 19:24:03 2006 +0000
+++ b/makefile	Sun Apr 23 19:36:36 2006 +0000
@@ -1,6 +1,6 @@
 include rules.mak
 
-dirs	= $(6809L1) $(6809L2) $(6309L2) $(3RDPARTY)
+dirs	= $(LEVEL1) $(LEVEL1) $(3RDPARTY)
  
 # Make all components
 all:
@@ -22,8 +22,3 @@
 # Clean DSK images
 dskclean:
 	$(foreach dir, $(dirs), ($(CD) $(dir); make dskclean);)
-	-rm -f $(DSKDIR)/*
-
-# Copy DSK images
-dskcopy: dsk
-	$(foreach dir, $(dirs), ($(CD) $(dir); make dskcopy);)
--- a/rules.mak	Sun Apr 23 19:24:03 2006 +0000
+++ b/rules.mak	Sun Apr 23 19:36:36 2006 +0000
@@ -88,6 +88,8 @@
 
 # Directories
 3RDPARTY	= $(NITROS9DIR)/3rdparty
+LEVEL1		= $(NITROS9DIR)/level1
+LEVEL2		= $(NITROS9DIR)/level2
 6809L1		= $(NITROS9DIR)/6809l1
 6809L2		= $(NITROS9DIR)/6809l2
 6309L2		= $(NITROS9DIR)/6309l2