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

@@ -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
 

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

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 \