Re: recent CVS snapshots of SID are broken

In each case, the original definition and the (supposed) multiple 
definition are on the same line and source file.

The problem appears to be that sid-bochs-memory.cc is listed twice in 
libmemory_la_SOURCES in sid/component/bochs/cpu/memory/Makefile.am. I've 
commited thet following patch.

Dave

2005-06-30  Dave Brolley  <[email protected]>
 
        * cpu/memory/Makefile.am (libmemory_la_SOURCES): Remove duplicate
        sid-bochs-memory.cc
        * cpu/memory/Makefile.in: Regenerate.

Index: Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/bochs/cpu/memory/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -p -r1.1 -r1.2
*** Makefile.am 15 Feb 2002 01:18:46 -0000      1.1
--- Makefile.am 30 Jun 2005 16:00:03 -0000      1.2
*************** INCLUDES = -I$(top_builddir)/../../inclu
*** 6,11 ****
  
  noinst_LTLIBRARIES = libmemory.la
  
! libmemory_la_SOURCES = sid-bochs-memory.cc sid-bochs-memory.cc
  
  libmemory_la_LDFLAGS = -no-undefined
--- 6,11 ----
  
  noinst_LTLIBRARIES = libmemory.la
  
! libmemory_la_SOURCES = sid-bochs-memory.cc
  
  libmemory_la_LDFLAGS = -no-undefined
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/sid/component/bochs/cpu/memory/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -p -r1.3 -r1.4
*** Makefile.in 4 Jun 2005 03:22:58 -0000       1.3
--- Makefile.in 30 Jun 2005 16:00:03 -0000      1.4
*************** CONFIG_HEADER = $(top_builddir)/config.h
*** 49,55 ****
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(noinst_LTLIBRARIES)
  libmemory_la_LIBADD =
! am_libmemory_la_OBJECTS = sid-bochs-memory.lo sid-bochs-memory.lo
  libmemory_la_OBJECTS = $(am_libmemory_la_OBJECTS)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/../../config/depcomp
--- 49,55 ----
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(noinst_LTLIBRARIES)
  libmemory_la_LIBADD =
! am_libmemory_la_OBJECTS = sid-bochs-memory.lo
  libmemory_la_OBJECTS = $(am_libmemory_la_OBJECTS)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/../../config/depcomp
*************** target_alias = @target_alias@
*** 240,246 ****
  AUTOMAKE_OPTIONS = foreign
  INCLUDES = -I$(top_builddir)/../../include -I$(srcdir) -I$(srcdir)/.. 
-I$(srcdir)/../.. -I$(srcdir)/../../../../include
  noinst_LTLIBRARIES = libmemory.la
! libmemory_la_SOURCES = sid-bochs-memory.cc sid-bochs-memory.cc
  libmemory_la_LDFLAGS = -no-undefined
  all: all-am
  
--- 240,246 ----
  AUTOMAKE_OPTIONS = foreign
  INCLUDES = -I$(top_builddir)/../../include -I$(srcdir) -I$(srcdir)/.. 
-I$(srcdir)/../.. -I$(srcdir)/../../../../include
  noinst_LTLIBRARIES = libmemory.la
! libmemory_la_SOURCES = sid-bochs-memory.cc
  libmemory_la_LDFLAGS = -no-undefined
  all: all-am