From 05b32df5da59e30a69ef01468579bd13e50ce4f8 Mon Sep 17 00:00:00 2001
From: wayne <wayne@1438685a-98c7-b363-4179-13d573978243>
Date: Fri, 9 Nov 2012 15:03:58 +0000
Subject: [PATCH] Merge trunk -> dgg

---
 branches/dgg/LSource/Makefile | 7 ++++++-
 branches/dgg/XSource/Makefile | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/branches/dgg/LSource/Makefile b/branches/dgg/LSource/Makefile
index 0a7c36d1..f94671e6 100644
--- a/branches/dgg/LSource/Makefile
+++ b/branches/dgg/LSource/Makefile
@@ -1,3 +1,4 @@
+# RomWBW/branches/dwg/LSource/Makefile 11/09/2012 dwg - added rule to copy n8chars.minc
 # RomWBW/branches/dwg/LSource/Makefile 10/27/2012 dwg - 
 #
 # GCC based makefile
@@ -223,7 +224,7 @@ bdosb01.asm:	$(SRC)bdosb01.asm
 	cp $< $@
 	$(CVT) $@
 
-bnk1.asm:	$(SRC)bnk1.asm fd.asm ppide.asm n8v.asm ppk.asm sd.asm tty.asm ansi.asm
+bnk1.asm:	$(SRC)bnk1.asm fd.asm ppide.asm n8v.asm n8chars.inc ppk.asm sd.asm tty.asm ansi.asm
 	cp $(SRC)bnk1.asm $@
 	$(CVT) $@
 
@@ -291,6 +292,10 @@ memmgr.asm:	$(SRC)memmgr.asm
 	cp $< $@
 	$(CVT) $@
 
+n8chars.inc:	$(SRC)n8chars.inc
+	cp $< $@
+	$(CVT) $@
+
 n8v.asm:	$(SRC)n8v.asm
 	cp $< $@
 	$(CVT) $@
diff --git a/branches/dgg/XSource/Makefile b/branches/dgg/XSource/Makefile
index 861f51a5..8127394c 100644
--- a/branches/dgg/XSource/Makefile
+++ b/branches/dgg/XSource/Makefile
@@ -1,3 +1,4 @@
+# RomWBW/branches/dwg/XSource/Makefile 11/09/2012 dwg - add copy rule for n8chars.inc
 # RomWBW/branches/dwg/XSource/Makefile 10/24/2012 dwg - 
 #
 # GCC based makefile
@@ -220,7 +221,7 @@ bdosb01.asm:	$(SRC)bdosb01.asm
 	cp $< $@
 	$(CVT) $@
 
-bnk1.asm:	$(SRC)bnk1.asm fd.asm ppide.asm n8v.asm ppk.asm sd.asm tty.asm ansi.asm
+bnk1.asm:	$(SRC)bnk1.asm fd.asm ppide.asm n8v.asm n8chars.inc ppk.asm sd.asm tty.asm ansi.asm
 	cp $(SRC)bnk1.asm $@
 	$(CVT) $@
 
@@ -288,6 +289,10 @@ memmgr.asm:	$(SRC)memmgr.asm
 	cp $< $@
 	$(CVT) $@
 
+n8chars.inc:	$(SRC)n8chars.inc
+	cp $< $@
+	$(CVT) $@
+
 n8v.asm:	$(SRC)n8v.asm
 	cp $< $@
 	$(CVT) $@