* sim/ucsim/avr.src/Makefile.in, sim/ucsim/hc08.src/Makefile.in,

  sim/ucsim/s51.src/Makefile.in, sim/ucsim/sim.src/Makefile.in,
  sim/ucsim/xa.src/Makefile.in, sim/ucsim/z80.src/Makefile.in,
  sim/ucsim/main_in.mk: renamed libutil.a to libucsimutil.a in order to
  enable compilation on Mac OS X 10.5 (Leopard) and XCode v3.0

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@5019 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index 16395c30f8b677977850b89cf8a850fbdee25ca4..8385c77bd6f6cfcdcfc7acfd896cc21410349234 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,7 +13,7 @@
          genRightShiftLiteral): fixed to work with SFRs as result by
          assigning only once to result,
          removed a lot of unused/excluded code fragments
-       
+
 2008-02-17 Raphael Neider <rneider AT web.de>
 
        * device/include/pic/pic16f88.h,
@@ -26,6 +26,11 @@
          #1893626: Optimize tail calls on Z80, thanks to Philipp Krause
        * src/z80/gen.c, src/z80/peeph.def: applied patch
          #1893510: Improve logical left shift on Z80, thanks to Philipp Krause
+       * sim/ucsim/avr.src/Makefile.in, sim/ucsim/hc08.src/Makefile.in,
+         sim/ucsim/s51.src/Makefile.in, sim/ucsim/sim.src/Makefile.in,
+         sim/ucsim/xa.src/Makefile.in, sim/ucsim/z80.src/Makefile.in,
+         sim/ucsim/main_in.mk: renamed libutil.a to libucsimutil.a in order to
+         enable compilation on Mac OS X 10.5 (Leopard) and XCode v3.0
 
 2008-02-16 Maarten Brock <sourceforge.brock AT dse.nl>
 

diff --git a/sim/ucsim/avr.src/Makefile.in b/sim/ucsim/avr.src/Makefile.in
index 238bcaa5d5b3611dea51e2016fe609f62e9aeea1..c0bde32cc1b871c1e4dea76903815f8ccaa497c7 100644 (file)
--- a/sim/ucsim/avr.src/Makefile.in
+++ b/sim/ucsim/avr.src/Makefile.in
@@ -29,7 +29,7 @@ PICOPT                = @PICOPT@
 SHAREDLIB      = @SHAREDLIB@
 EXEEXT         = @EXEEXT@
 
-LIBS           = -L$(top_builddir) -lsim -lutil -lguiucsim -lcmd -lsim @LIBS@
+LIBS           = -L$(top_builddir) -lsim -lucsimutil -lguiucsim -lcmd -lsim @LIBS@
 DL             = @DL@
 dl_ok          = @dl_ok@
 

diff --git a/sim/ucsim/hc08.src/Makefile.in b/sim/ucsim/hc08.src/Makefile.in
index 065bc807ef1e99ed13bf2974a5aa7ba63b8b69f2..8dddea137c08ffe840a2ca7144d5c567250edb00 100644 (file)
--- a/sim/ucsim/hc08.src/Makefile.in
+++ b/sim/ucsim/hc08.src/Makefile.in
@@ -30,7 +30,7 @@ SHAREDLIB     = @SHAREDLIB@
 
 EXEEXT          = @EXEEXT@
 
-LIBS           = -L$(top_builddir) -lsim -lutil -lguiucsim -lcmd -lsim @LIBS@
+LIBS           = -L$(top_builddir) -lsim -lucsimutil -lguiucsim -lcmd -lsim @LIBS@
 DL             = @DL@
 dl_ok          = @dl_ok@
 

diff --git a/sim/ucsim/main_in.mk b/sim/ucsim/main_in.mk
index fa696ea6d5aaf28dc616e8dcac9b6b70444d094c..ea45c8eda03317cc070a31aeca20edd958b7d118 100644 (file)
--- a/sim/ucsim/main_in.mk
+++ b/sim/ucsim/main_in.mk
@@ -30,7 +30,7 @@ M_OR_MM         = @M_OR_MM@
 
 EXEEXT         = @EXEEXT@
 
-LIB_LIST       = util cmd sim
+LIB_LIST       = ucsimutil cmd sim
 UCSIM_LIBS     = -Wl,--start-group $(patsubst %,-l%,$(LIB_LIST)) -Wl,--end-group
 UCSIM_LIB_FILES        = $(patsubst %,lib%.a,$(LIB_LIST))
 
@@ -61,7 +61,7 @@ enable_ucsim  = @enable_ucsim@
 # ------------------------------------------
 all: checkconf libs
 
-libs: libutil.a
+libs: libucsimutil.a
 
 main_app: checkconf ucsim_app
 
@@ -111,7 +111,7 @@ include $(srcdir)/clean.mk
 
 # My rules
 # --------
-libutil.a: $(OBJECTS)
+libucsimutil.a: $(OBJECTS)
        ar -rcu $*.a $(OBJECTS)
        $(RANLIB) $*.a
 

diff --git a/sim/ucsim/s51.src/Makefile.in b/sim/ucsim/s51.src/Makefile.in
index 3d0d7fc3b61ef16d8e48cf0ac09f1d45794b6e83..b50c926c11011a19b09d0fbbedffc17baec64057 100644 (file)
--- a/sim/ucsim/s51.src/Makefile.in
+++ b/sim/ucsim/s51.src/Makefile.in
@@ -32,7 +32,7 @@ SDCC          = sdcc
 SDCFLAGS       = --debug --stack-after-data --model-small
 SDCPPFLAGS     = 
 
-LIBS           = -L$(top_builddir) -lsim -lutil -lguiucsim -lcmd -lsim @LIBS@
+LIBS           = -L$(top_builddir) -lsim -lucsimutil -lguiucsim -lcmd @LIBS@
 DL             = @DL@
 dl_ok          = @dl_ok@
 

diff --git a/sim/ucsim/sim.src/Makefile.in b/sim/ucsim/sim.src/Makefile.in
index 88f9a46abcfc5fa5371c7558fed90381a6db6a27..0a420a2fed5c277b6dcab760816fa2a4fe322f0a 100644 (file)
--- a/sim/ucsim/sim.src/Makefile.in
+++ b/sim/ucsim/sim.src/Makefile.in
@@ -46,7 +46,7 @@ OBJECTS         = stack.o mem.o sim.o itsrc.o brk.o arg.o \
 all: checkconf sim_lib
 
 test_mem_speed: $(top_builddir)/lib*.a test_mem_speed.o
-       $(CXX) -o $@ test_mem_speed.o -L$(top_builddir) -Wl,--start-group -lsim -lutil -lcmd -Wl,--end-group
+       $(CXX) -o $@ test_mem_speed.o -L$(top_builddir) -Wl,--start-group -lsim -lucsimutil -lcmd -Wl,--end-group
 
 sim.src: all
 

diff --git a/sim/ucsim/xa.src/Makefile.in b/sim/ucsim/xa.src/Makefile.in
index 9112a6f491023f5692678494ec5f050f374bcc10..90529f2688e6b8f3a42040158d64b864c53ead2e 100644 (file)
--- a/sim/ucsim/xa.src/Makefile.in
+++ b/sim/ucsim/xa.src/Makefile.in
@@ -28,7 +28,7 @@ CXXFLAGS        = @CXXFLAGS@ -Wall
 LDFLAGS         = @LDFLAGS@
 M_OR_MM         = @M_OR_MM@
 
-LIBS           = @LIBS@ -L$(top_builddir) -lsim -lutil -lguiucsim -lcmd -lsim
+LIBS           = @LIBS@ -L$(top_builddir) -lsim -lucsimutil -lguiucsim -lcmd -lsim
 
 prefix          = @prefix@
 exec_prefix     = @exec_prefix@

diff --git a/sim/ucsim/z80.src/Makefile.in b/sim/ucsim/z80.src/Makefile.in
index f9d102082bff199be5cf79154d72d1612ece068c..cb105bf2a0728f5732f5e07ae0d2b645c1622385 100644 (file)
--- a/sim/ucsim/z80.src/Makefile.in
+++ b/sim/ucsim/z80.src/Makefile.in
@@ -29,7 +29,7 @@ PICOPT                = @PICOPT@
 SHAREDLIB      = @SHAREDLIB@
 EXEEXT         = @EXEEXT@
 
-LIBS           = -L$(top_builddir) -lsim -lutil -lguiucsim -lcmd -lsim @LIBS@
+LIBS           = -L$(top_builddir) -lsim -lucsimutil -lguiucsim -lcmd -lsim @LIBS@
 DL             = @DL@
 dl_ok          = @dl_ok@