1.1 --- a/src/Makefile.in	Sat Dec 24 08:02:18 2005 +0000
     1.2 +++ b/src/Makefile.in	Wed Dec 28 22:50:08 2005 +0000
     1.3 @@ -137,14 +137,14 @@
     1.4  
     1.5  dream_SOURCES = \
     1.6          main.c \
     1.7 -        mem.c mem.h mmio.h \
     1.8 +        mem.c mem.h mmio.h watch.c \
     1.9          asic.c asic.h \
    1.10          pvr2.c pvr2.h \
    1.11          gdrom/ide.c gdrom/ide.h \
    1.12          video.c dreamcast.c dreamcast.h \
    1.13          sh4/intc.c sh4/intc.h sh4/sh4mem.c sh4/timer.c \
    1.14          sh4/sh4core.c sh4/sh4core.h sh4/sh4dasm.c sh4/sh4dasm.h \
    1.15 -        sh4/sh4mmio.c sh4/sh4mmio.h sh4/scif.c sh4/watch.c \
    1.16 +        sh4/sh4mmio.c sh4/sh4mmio.h sh4/scif.c \
    1.17          aica/armcore.c aica/armcore.h aica/armdasm.c aica/armmem.c \
    1.18          aica/aica.c aica/aica.h \
    1.19          maple/maple.c maple/maple.h \
    1.20 @@ -168,17 +168,16 @@
    1.21  bin_PROGRAMS = dream$(EXEEXT)
    1.22  PROGRAMS = $(bin_PROGRAMS)
    1.23  
    1.24 -am_dream_OBJECTS = main.$(OBJEXT) mem.$(OBJEXT) asic.$(OBJEXT) \
    1.25 -	pvr2.$(OBJEXT) ide.$(OBJEXT) video.$(OBJEXT) \
    1.26 +am_dream_OBJECTS = main.$(OBJEXT) mem.$(OBJEXT) watch.$(OBJEXT) \
    1.27 +	asic.$(OBJEXT) pvr2.$(OBJEXT) ide.$(OBJEXT) video.$(OBJEXT) \
    1.28  	dreamcast.$(OBJEXT) intc.$(OBJEXT) sh4mem.$(OBJEXT) \
    1.29  	timer.$(OBJEXT) sh4core.$(OBJEXT) sh4dasm.$(OBJEXT) \
    1.30 -	sh4mmio.$(OBJEXT) scif.$(OBJEXT) watch.$(OBJEXT) \
    1.31 -	armcore.$(OBJEXT) armdasm.$(OBJEXT) armmem.$(OBJEXT) \
    1.32 -	aica.$(OBJEXT) maple.$(OBJEXT) controller.$(OBJEXT) \
    1.33 -	support.$(OBJEXT) interface.$(OBJEXT) callbacks.$(OBJEXT) \
    1.34 -	gui.$(OBJEXT) mmr_win.$(OBJEXT) debug_win.$(OBJEXT) \
    1.35 -	dump_win.$(OBJEXT) loader.$(OBJEXT) bootstrap.$(OBJEXT) \
    1.36 -	util.$(OBJEXT)
    1.37 +	sh4mmio.$(OBJEXT) scif.$(OBJEXT) armcore.$(OBJEXT) \
    1.38 +	armdasm.$(OBJEXT) armmem.$(OBJEXT) aica.$(OBJEXT) \
    1.39 +	maple.$(OBJEXT) controller.$(OBJEXT) support.$(OBJEXT) \
    1.40 +	interface.$(OBJEXT) callbacks.$(OBJEXT) gui.$(OBJEXT) \
    1.41 +	mmr_win.$(OBJEXT) debug_win.$(OBJEXT) dump_win.$(OBJEXT) \
    1.42 +	loader.$(OBJEXT) bootstrap.$(OBJEXT) util.$(OBJEXT)
    1.43  dream_OBJECTS = $(am_dream_OBJECTS)
    1.44  dream_DEPENDENCIES =
    1.45  dream_LDFLAGS =
    1.46 @@ -483,28 +482,6 @@
    1.47  @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1.48  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o scif.obj `if test -f 'sh4/scif.c'; then $(CYGPATH_W) 'sh4/scif.c'; else $(CYGPATH_W) '$(srcdir)/sh4/scif.c'; fi`
    1.49  
    1.50 -watch.o: sh4/watch.c
    1.51 -@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT watch.o -MD -MP -MF "$(DEPDIR)/watch.Tpo" \
    1.52 -@am__fastdepCC_TRUE@	  -c -o watch.o `test -f 'sh4/watch.c' || echo '$(srcdir)/'`sh4/watch.c; \
    1.53 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/watch.Tpo" "$(DEPDIR)/watch.Po"; \
    1.54 -@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/watch.Tpo"; exit 1; \
    1.55 -@am__fastdepCC_TRUE@	fi
    1.56 -@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sh4/watch.c' object='watch.o' libtool=no @AMDEPBACKSLASH@
    1.57 -@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/watch.Po' tmpdepfile='$(DEPDIR)/watch.TPo' @AMDEPBACKSLASH@
    1.58 -@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1.59 -@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o watch.o `test -f 'sh4/watch.c' || echo '$(srcdir)/'`sh4/watch.c
    1.60 -
    1.61 -watch.obj: sh4/watch.c
    1.62 -@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT watch.obj -MD -MP -MF "$(DEPDIR)/watch.Tpo" \
    1.63 -@am__fastdepCC_TRUE@	  -c -o watch.obj `if test -f 'sh4/watch.c'; then $(CYGPATH_W) 'sh4/watch.c'; else $(CYGPATH_W) '$(srcdir)/sh4/watch.c'; fi`; \
    1.64 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/watch.Tpo" "$(DEPDIR)/watch.Po"; \
    1.65 -@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/watch.Tpo"; exit 1; \
    1.66 -@am__fastdepCC_TRUE@	fi
    1.67 -@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sh4/watch.c' object='watch.obj' libtool=no @AMDEPBACKSLASH@
    1.68 -@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/watch.Po' tmpdepfile='$(DEPDIR)/watch.TPo' @AMDEPBACKSLASH@
    1.69 -@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1.70 -@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o watch.obj `if test -f 'sh4/watch.c'; then $(CYGPATH_W) 'sh4/watch.c'; else $(CYGPATH_W) '$(srcdir)/sh4/watch.c'; fi`
    1.71 -
    1.72  armcore.o: aica/armcore.c
    1.73  @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT armcore.o -MD -MP -MF "$(DEPDIR)/armcore.Tpo" \
    1.74  @am__fastdepCC_TRUE@	  -c -o armcore.o `test -f 'aica/armcore.c' || echo '$(srcdir)/'`aica/armcore.c; \