From 8b14e0eef8a2291b4439848d902a94003b508c96 Mon Sep 17 00:00:00 2001
From: stephena <stephena@8b62c5a3-ac7e-4cc8-8f21-d9a121418aba>
Date: Sun, 22 Nov 2009 02:32:20 +0000
Subject: [PATCH] On second thought, why do we even need M6502 files in a
 separate directory?

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1908 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
---
 Makefile                                 | 1 -
 configure                                | 2 +-
 src/emucore/{m6502 => }/Device.cxx       | 0
 src/emucore/{m6502 => }/Device.hxx       | 0
 src/emucore/{m6502 => }/M6502.cxx        | 0
 src/emucore/{m6502 => }/M6502.hxx        | 0
 src/emucore/{m6502 => }/M6502.ins        | 0
 src/emucore/{m6502 => }/M6502.m4         | 0
 src/emucore/{m6502 => }/NullDev.cxx      | 0
 src/emucore/{m6502 => }/NullDev.hxx      | 0
 src/emucore/{m6502 => }/System.cxx       | 0
 src/emucore/{m6502 => }/System.hxx       | 0
 src/emucore/module.mk                    | 4 ++++
 src/{emucore/misc => tools}/romtohex.cxx | 0
 src/{emucore/misc => tools}/scrom.asm    | 0
 15 files changed, 5 insertions(+), 2 deletions(-)
 rename src/emucore/{m6502 => }/Device.cxx (100%)
 rename src/emucore/{m6502 => }/Device.hxx (100%)
 rename src/emucore/{m6502 => }/M6502.cxx (100%)
 rename src/emucore/{m6502 => }/M6502.hxx (100%)
 rename src/emucore/{m6502 => }/M6502.ins (100%)
 rename src/emucore/{m6502 => }/M6502.m4 (100%)
 rename src/emucore/{m6502 => }/NullDev.cxx (100%)
 rename src/emucore/{m6502 => }/NullDev.hxx (100%)
 rename src/emucore/{m6502 => }/System.cxx (100%)
 rename src/emucore/{m6502 => }/System.hxx (100%)
 rename src/{emucore/misc => tools}/romtohex.cxx (100%)
 rename src/{emucore/misc => tools}/scrom.asm (100%)

diff --git a/Makefile b/Makefile
index 8854c6ebd..eee596e5c 100644
--- a/Makefile
+++ b/Makefile
@@ -88,7 +88,6 @@ MODULES := $(MODULES)
 # After the game specific modules follow the shared modules
 MODULES += \
 	src/emucore \
-	src/emucore/m6502 \
 	src/gui \
 	src/common
 
diff --git a/configure b/configure
index 3916c1f3a..9a9aaf966 100755
--- a/configure
+++ b/configure
@@ -639,7 +639,7 @@ DBGGUI="$SRC/debugger/gui"
 YACC="$SRC/yacc"
 CHEAT="$SRC/cheat"
 
-INCLUDES="-I$CORE -I$CORE/m6502 -I$COMMON -I$GUI"
+INCLUDES="-I$CORE -I$COMMON -I$GUI"
 
 INCLUDES="$INCLUDES `$_sdlconfig --cflags`"
 if test "$_build_static" = yes ; then
diff --git a/src/emucore/m6502/Device.cxx b/src/emucore/Device.cxx
similarity index 100%
rename from src/emucore/m6502/Device.cxx
rename to src/emucore/Device.cxx
diff --git a/src/emucore/m6502/Device.hxx b/src/emucore/Device.hxx
similarity index 100%
rename from src/emucore/m6502/Device.hxx
rename to src/emucore/Device.hxx
diff --git a/src/emucore/m6502/M6502.cxx b/src/emucore/M6502.cxx
similarity index 100%
rename from src/emucore/m6502/M6502.cxx
rename to src/emucore/M6502.cxx
diff --git a/src/emucore/m6502/M6502.hxx b/src/emucore/M6502.hxx
similarity index 100%
rename from src/emucore/m6502/M6502.hxx
rename to src/emucore/M6502.hxx
diff --git a/src/emucore/m6502/M6502.ins b/src/emucore/M6502.ins
similarity index 100%
rename from src/emucore/m6502/M6502.ins
rename to src/emucore/M6502.ins
diff --git a/src/emucore/m6502/M6502.m4 b/src/emucore/M6502.m4
similarity index 100%
rename from src/emucore/m6502/M6502.m4
rename to src/emucore/M6502.m4
diff --git a/src/emucore/m6502/NullDev.cxx b/src/emucore/NullDev.cxx
similarity index 100%
rename from src/emucore/m6502/NullDev.cxx
rename to src/emucore/NullDev.cxx
diff --git a/src/emucore/m6502/NullDev.hxx b/src/emucore/NullDev.hxx
similarity index 100%
rename from src/emucore/m6502/NullDev.hxx
rename to src/emucore/NullDev.hxx
diff --git a/src/emucore/m6502/System.cxx b/src/emucore/System.cxx
similarity index 100%
rename from src/emucore/m6502/System.cxx
rename to src/emucore/System.cxx
diff --git a/src/emucore/m6502/System.hxx b/src/emucore/System.hxx
similarity index 100%
rename from src/emucore/m6502/System.hxx
rename to src/emucore/System.hxx
diff --git a/src/emucore/module.mk b/src/emucore/module.mk
index 0e6a634e0..fcf53997c 100644
--- a/src/emucore/module.mk
+++ b/src/emucore/module.mk
@@ -32,6 +32,7 @@ MODULE_OBJS := \
 	src/emucore/CartX07.o \
 	src/emucore/Console.o \
 	src/emucore/Control.o \
+	src/emucore/Device.o \
 	src/emucore/Driving.o \
 	src/emucore/Event.o \
 	src/emucore/EventHandler.o \
@@ -40,8 +41,10 @@ MODULE_OBJS := \
 	src/emucore/Joystick.o \
 	src/emucore/Keyboard.o \
 	src/emucore/KidVid.o \
+	src/emucore/M6502.o \
 	src/emucore/M6532.o \
 	src/emucore/MT24LC256.o \
+	src/emucore/NullDev.o \
 	src/emucore/MD5.o \
 	src/emucore/OSystem.o \
 	src/emucore/Paddles.o \
@@ -54,6 +57,7 @@ MODULE_OBJS := \
 	src/emucore/SpeakJet.o \
 	src/emucore/Switches.o \
 	src/emucore/StateManager.o \
+	src/emucore/System.o \
 	src/emucore/TIA.o \
 	src/emucore/TIASnd.o \
 	src/emucore/TIATables.o \
diff --git a/src/emucore/misc/romtohex.cxx b/src/tools/romtohex.cxx
similarity index 100%
rename from src/emucore/misc/romtohex.cxx
rename to src/tools/romtohex.cxx
diff --git a/src/emucore/misc/scrom.asm b/src/tools/scrom.asm
similarity index 100%
rename from src/emucore/misc/scrom.asm
rename to src/tools/scrom.asm