From 2738d56c6c0b57108f9f1bb7bb5449c84fcaefda Mon Sep 17 00:00:00 2001 From: borutr Date: Sun, 17 Feb 2008 17:16:28 +0000 Subject: [PATCH] * 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 --- ChangeLog | 7 ++++++- sim/ucsim/avr.src/Makefile.in | 2 +- sim/ucsim/hc08.src/Makefile.in | 2 +- sim/ucsim/main_in.mk | 6 +++--- sim/ucsim/s51.src/Makefile.in | 2 +- sim/ucsim/sim.src/Makefile.in | 2 +- sim/ucsim/xa.src/Makefile.in | 2 +- sim/ucsim/z80.src/Makefile.in | 2 +- 8 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16395c30..8385c77b 100644 --- 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 * 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 diff --git a/sim/ucsim/avr.src/Makefile.in b/sim/ucsim/avr.src/Makefile.in index 238bcaa5..c0bde32c 100644 --- 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 065bc807..8dddea13 100644 --- 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 fa696ea6..ea45c8ed 100644 --- 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 3d0d7fc3..b50c926c 100644 --- 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 88f9a46a..0a420a2f 100644 --- 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 9112a6f4..90529f26 100644 --- 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 f9d10208..cb105bf2 100644 --- 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@ -- 2.30.2