From d1ce4e779ee8e5aef34da33ca26968cc9da10c3f Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Mon, 23 Oct 2006 22:33:39 +0000 Subject: Consistent style of 'make' messages. Always use ranlib after ar. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11322 a1c6a512-1295-4272-9138-f99709370657 --- apps/Makefile | 8 ++++---- apps/codecs/Makefile | 4 ++-- apps/codecs/Tremor/Makefile | 3 ++- apps/codecs/lib/Makefile | 2 +- apps/codecs/libFLAC/Makefile | 3 ++- apps/codecs/liba52/Makefile | 3 ++- apps/codecs/libalac/Makefile | 3 ++- apps/codecs/libfaad/Makefile | 3 ++- apps/codecs/libffmpegFLAC/Makefile | 3 ++- apps/codecs/libm4a/Makefile | 3 ++- apps/codecs/libmad/Makefile | 3 ++- apps/codecs/libmusepack/Makefile | 3 ++- apps/codecs/libwavpack/Makefile | 3 ++- apps/plugins/Makefile | 2 +- apps/plugins/chessbox/Makefile | 4 ++-- apps/plugins/databox/Makefile | 4 ++-- apps/plugins/doom/Makefile | 9 ++++++--- apps/plugins/lib/Makefile | 2 +- apps/plugins/mpegplayer/Makefile | 4 ++-- apps/plugins/pacbox/Makefile | 4 ++-- apps/plugins/rockboy/Makefile | 4 ++-- apps/plugins/searchengine/Makefile | 4 ++-- apps/plugins/sudoku/Makefile | 4 ++-- apps/plugins/zxbox/Makefile | 2 +- firmware/Makefile | 2 +- tools/makebmp.inc | 2 +- uisimulator/common/Makefile | 2 +- uisimulator/sdl/Makefile | 3 ++- 28 files changed, 55 insertions(+), 41 deletions(-) diff --git a/apps/Makefile b/apps/Makefile index 7396d30372..a6c75848d3 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -104,11 +104,11 @@ rocks: build-codecs @$(MAKE) -C plugins OBJDIR=$(OBJDIR)/plugins $(LINKFILE): $(LDS) - @echo "Build LDS file" + @echo "Build $(notdir $@)" @cat $< | $(CC) -DLOADADDRESS=$(LOADADDRESS) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - >$@ $(LINKROM): $(ROMLDS) - @echo "Build LDS file for Rombox" + @echo "Build $(notdir $@)" @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - >$@ $(MAXOUTFILE): @@ -118,13 +118,13 @@ $(MAXOUTFILE): @rm $(MAXINFILE) $(OBJDIR)/rombox.elf : $(OBJS) $(LINKROM) $(DEPFILE) $(LIBROCKBOX) $(BITMAPLIBS) - @echo "LD rombox.elf" + @echo "LD $(notdir $@)" @$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lrockbox -lgcc $(LINKBITMAPS) -L$(BUILDDIR)/firmware -T$(LINKROM) -Wl,-Map,$(OBJDIR)/rombox.map ifndef SIMVER $(OBJDIR)/rockbox.elf : $(OBJS) $(LINKFILE) $(DEPFILE) $(LIBROCKBOX) $(BITMAPLIBS) - @echo "LD rockbox.elf" + @echo "LD $(notdir $@)" @$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR)/firmware -L$(BUILDDIR) -lrockbox $(LINKBITMAPS) -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockbox.map $(OBJDIR)/rockbox.bin : $(OBJDIR)/rockbox.elf diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile index 76c8ce3d80..cd0677aebf 100644 --- a/apps/codecs/Makefile +++ b/apps/codecs/Makefile @@ -95,7 +95,7 @@ ifeq ($(SIMVER), sdl) # This is the SDL simulator version $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) - @echo "LD $(notdir $@) $^" + @echo "LD $(notdir $@)" $(SILENT)$(CC) $(CFLAGS) $(SHARED_FLAG) $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) # 'x' must be kept or you'll have "Win32 error 5" @@ -137,7 +137,7 @@ $(BUILDDIR)/libcodec.a: $(SILENT)$(MAKE) -C lib OBJDIR=$(OBJDIR)/lib $(LINKCODEC): $(LDS) - @echo "build $@" + @echo "build $(notdir $@)" $(SILENT)cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) -DCODEC $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@ $(BUILDDIR)/libmad.a: libmad diff --git a/apps/codecs/Tremor/Makefile b/apps/codecs/Tremor/Makefile index 881329d7c1..ee91a05af9 100644 --- a/apps/codecs/Tremor/Makefile +++ b/apps/codecs/Tremor/Makefile @@ -30,8 +30,9 @@ DIRS = all: $(OUTPUT) $(OUTPUT): $(OBJS) - @echo "AR $@" + @echo "AR+RANLIB $(notdir $@)" @$(AR) ruv $@ $+ >/dev/null 2>&1 + @$(RANLIB) $@ include $(TOOLSDIR)/make.inc diff --git a/apps/codecs/lib/Makefile b/apps/codecs/lib/Makefile index 865e3b5e53..fcf84c2acd 100644 --- a/apps/codecs/lib/Makefile +++ b/apps/codecs/lib/Makefile @@ -33,7 +33,7 @@ OUTPUT = $(BUILDDIR)/libcodec.a all: $(OUTPUT) $(OUTPUT): $(OBJS) - @echo "AR+RANLIB $@" + @echo "AR+RANLIB $(notdir $@)" @$(AR) ruv $@ $+ >/dev/null 2>&1 @$(RANLIB) $@ diff --git a/apps/codecs/libFLAC/Makefile b/apps/codecs/libFLAC/Makefile index d1e78bd229..221b934c13 100644 --- a/apps/codecs/libFLAC/Makefile +++ b/apps/codecs/libFLAC/Makefile @@ -44,8 +44,9 @@ OUTPUT = $(BUILDDIR)/libFLAC.a all: $(OUTPUT) $(OUTPUT): $(OBJS) - @echo "AR $@" + @echo "AR+RANLIB $(notdir $@)" @$(AR) ruv $@ $+ >/dev/null 2>&1 + @$(RANLIB) $@ $(OBJDIR)/libFLAC/%.o: $(APPSDIR)/codecs/libFLAC/%.c @mkdir -p $(OBJDIR)/libFLAC diff --git a/apps/codecs/liba52/Makefile b/apps/codecs/liba52/Makefile index ea3c01c931..b93f0c7336 100644 --- a/apps/codecs/liba52/Makefile +++ b/apps/codecs/liba52/Makefile @@ -30,8 +30,9 @@ DIRS = all: $(OUTPUT) $(OUTPUT): $(OBJS) - @echo "AR $@" + @echo "AR+RANLIB $(notdir $@)" @$(AR) ruv $@ $+ >/dev/null 2>&1 + @$(RANLIB) $@ include $(TOOLSDIR)/make.inc diff --git a/apps/codecs/libalac/Makefile b/apps/codecs/libalac/Makefile index 5bca428f81..6f75a08e51 100644 --- a/apps/codecs/libalac/Makefile +++ b/apps/codecs/libalac/Makefile @@ -30,8 +30,9 @@ DIRS = all: $(OUTPUT) $(OUTPUT): $(OBJS) - @echo "AR $@" + @echo "AR+RANLIB $(notdir $@)" @$(AR) ruv $@ $+ >/dev/null 2>&1 + @$(RANLIB) $@ include $(TOOLSDIR)/make.inc diff --git a/apps/codecs/libfaad/Makefile b/apps/codecs/libfaad/Makefile index 1cb6c9246b..4a59d6c872 100644 --- a/apps/codecs/libfaad/Makefile +++ b/apps/codecs/libfaad/Makefile @@ -30,8 +30,9 @@ DIRS = all: $(OUTPUT) $(OUTPUT): $(OBJS) - @echo "AR $@" + @echo "AR+RANLIB $(notdir $@)" @$(AR) ruv $@ $+ >/dev/null 2>&1 + @$(RANLIB) $@ include $(TOOLSDIR)/make.inc diff --git a/apps/codecs/libffmpegFLAC/Makefile b/apps/codecs/libffmpegFLAC/Makefile index ee3f39261d..27c17c8243 100644 --- a/apps/codecs/libffmpegFLAC/Makefile +++ b/apps/codecs/libffmpegFLAC/Makefile @@ -30,8 +30,9 @@ DIRS = all: $(OUTPUT) $(OUTPUT): $(OBJS) - @echo "AR $@" + @echo "AR+RANLIB $(notdir $@)" @$(AR) ruv $@ $+ >/dev/null 2>&1 + @$(RANLIB) $@ include $(TOOLSDIR)/make.inc diff --git a/apps/codecs/libm4a/Makefile b/apps/codecs/libm4a/Makefile index ad084b0ddf..73b24bc214 100644 --- a/apps/codecs/libm4a/Makefile +++ b/apps/codecs/libm4a/Makefile @@ -30,8 +30,9 @@ DIRS = all: $(OUTPUT) $(OUTPUT): $(OBJS) - @echo "AR $@" + @echo "AR+RANLIB $(notdir $@)" @$(AR) ruv $@ $+ >/dev/null 2>&1 + @$(RANLIB) $@ include $(TOOLSDIR)/make.inc diff --git a/apps/codecs/libmad/Makefile b/apps/codecs/libmad/Makefile index c24a693374..7ee16d9e4c 100644 --- a/apps/codecs/libmad/Makefile +++ b/apps/codecs/libmad/Makefile @@ -39,8 +39,9 @@ DIRS = all: $(OUTPUT) $(OUTPUT): $(OBJS) - @echo "AR $@" + @echo "AR+RANLIB $(notdir $@)" @$(AR) ruv $@ $+ >/dev/null 2>&1 + @$(RANLIB) $@ include $(TOOLSDIR)/make.inc diff --git a/apps/codecs/libmusepack/Makefile b/apps/codecs/libmusepack/Makefile index f5c59cce4a..68c2603580 100644 --- a/apps/codecs/libmusepack/Makefile +++ b/apps/codecs/libmusepack/Makefile @@ -30,8 +30,9 @@ DIRS = all: $(OUTPUT) $(OUTPUT): $(OBJS) - @echo "AR $@" + @echo "AR+RANLIB $(notdir $@)" @$(AR) ruv $@ $+ >/dev/null 2>&1 + @$(RANLIB) $@ include $(TOOLSDIR)/make.inc diff --git a/apps/codecs/libwavpack/Makefile b/apps/codecs/libwavpack/Makefile index 60911a052f..077e4aa94e 100644 --- a/apps/codecs/libwavpack/Makefile +++ b/apps/codecs/libwavpack/Makefile @@ -30,8 +30,9 @@ DIRS = all: $(OUTPUT) $(OUTPUT): $(OBJS) - @echo "AR $@" + @echo "AR+RANLIB $(notdir $@)" @$(AR) ruv $@ $+ >/dev/null 2>&1 + @$(RANLIB) $@ include $(TOOLSDIR)/make.inc diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index c3f718c954..a35bcf7dfd 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile @@ -152,7 +152,7 @@ $(BUILDDIR)/libplugin.a: $(SILENT)$(MAKE) -C lib OBJDIR=$(OBJDIR)/lib $(LINKFILE): $(LDS) - @echo "build $@" + @echo "build $(notdir $@)" $(SILENT)cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@ $(SUBDIRS): $(BITMAPLIBS) diff --git a/apps/plugins/chessbox/Makefile b/apps/plugins/chessbox/Makefile index c86d8056ad..7b3ade24e4 100644 --- a/apps/plugins/chessbox/Makefile +++ b/apps/plugins/chessbox/Makefile @@ -54,7 +54,7 @@ ifeq ($(SIMVER), x11) # This is the X11 simulator version $(OUTPUT): $(OBJS) - @echo "LD $<" + @echo "LD $(notdir $@)" @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin $(LINKBITMAPS) -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) # 'x' must be kept or you'll have "Win32 error 5" @@ -70,7 +70,7 @@ ifeq ($(SIMVER), sdl) # This is the SDL simulator version $(OUTPUT): $(OBJS) - @echo "LD $<" + @echo "LD $(notdir $@)" @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin $(LINKBITMAPS) -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) # 'x' must be kept or you'll have "Win32 error 5" diff --git a/apps/plugins/databox/Makefile b/apps/plugins/databox/Makefile index 451f3415b4..818ceb450c 100644 --- a/apps/plugins/databox/Makefile +++ b/apps/plugins/databox/Makefile @@ -45,7 +45,7 @@ ifeq ($(SIMVER), x11) # This is the X11 simulator version $(OUTPUT): $(OBJS) - @echo "LD $<" + @echo "LD $(notdir $@)" @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) # 'x' must be kept or you'll have "Win32 error 5" @@ -61,7 +61,7 @@ ifeq ($(SIMVER), sdl) # This is the SDL simulator version $(OUTPUT): $(OBJS) - @echo "LD $<" + @echo "LD $(notdir $@)" @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) # 'x' must be kept or you'll have "Win32 error 5" diff --git a/apps/plugins/doom/Makefile b/apps/plugins/doom/Makefile index 20b6aea7a3..e1564a773b 100644 --- a/apps/plugins/doom/Makefile +++ b/apps/plugins/doom/Makefile @@ -3,7 +3,10 @@ # $Id$ # # $Log$ -# Revision 1.8 2006/10/23 14:09:28 markun +# Revision 1.9 2006/10/23 22:33:36 amiconn +# Consistent style of 'make' messages. Always use ranlib after ar. +# +# Revision 1.8 2006-10-23 14:09:28 markun # rearrange compiler options to avoid conflicts with header files on FreeBSD # # Revision 1.7 2006-10-22 00:21:56 amiconn @@ -96,7 +99,7 @@ ifeq ($(SIMVER), x11) # This is the X11 simulator version $(OUTPUT): $(OBJS) - @echo "LD $@" + @echo "LD $(notdir $@)" @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) # 'x' must be kept or you'll have "Win32 error 5" @@ -112,7 +115,7 @@ ifeq ($(SIMVER), sdl) # This is the sdl simulator version $(OUTPUT): $(OBJS) - @echo "LD $@" + @echo "LD $(notdir $@)" @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) # 'x' must be kept or you'll have "Win32 error 5" diff --git a/apps/plugins/lib/Makefile b/apps/plugins/lib/Makefile index 8482b1f1dd..35bf3ac7ac 100644 --- a/apps/plugins/lib/Makefile +++ b/apps/plugins/lib/Makefile @@ -38,7 +38,7 @@ OUTPUT = $(BUILDDIR)/libplugin.a all: $(OUTPUT) $(OUTPUT): $(OBJS) - @echo "AR+RANLIB $@" + @echo "AR+RANLIB $(notdir $@)" @$(AR) ruv $@ $+ >/dev/null 2>&1 @$(RANLIB) $@ diff --git a/apps/plugins/mpegplayer/Makefile b/apps/plugins/mpegplayer/Makefile index 61eae88db9..82782b737c 100644 --- a/apps/plugins/mpegplayer/Makefile +++ b/apps/plugins/mpegplayer/Makefile @@ -48,7 +48,7 @@ ifeq ($(SIMVER), x11) # This is the X11 simulator version $(OUTPUT): $(OBJS) - @echo "LD $<" + @echo "LD $(notdir $@)" @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) # 'x' must be kept or you'll have "Win32 error 5" @@ -64,7 +64,7 @@ ifeq ($(SIMVER), sdl) # This is the SDL simulator version $(OUTPUT): $(OBJS) - @echo "LD $<" + @echo "LD $(notdir $@)" @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) # 'x' must be kept or you'll have "Win32 error 5" diff --git a/apps/plugins/pacbox/Makefile b/apps/plugins/pacbox/Makefile index 7af0216a4f..7cc8da02a4 100644 --- a/apps/plugins/pacbox/Makefile +++ b/apps/plugins/pacbox/Makefile @@ -48,7 +48,7 @@ ifeq ($(SIMVER), x11) # This is the X11 simulator version $(OUTPUT): $(OBJS) - @echo "LD $<" + @echo "LD $(notdir $@)" @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) # 'x' must be kept or you'll have "Win32 error 5" @@ -64,7 +64,7 @@ ifeq ($(SIMVER), sdl) # This is the SDL simulator version $(OUTPUT): $(OBJS) - @echo "LD $<" + @echo "LD $(notdir $@)" @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) # 'x' must be kept or you'll have "Win32 error 5" diff --git a/apps/plugins/rockboy/Makefile b/apps/plugins/rockboy/Makefile index b68229429f..275d2ffd9b 100644 --- a/apps/plugins/rockboy/Makefile +++ b/apps/plugins/rockboy/Makefile @@ -61,7 +61,7 @@ ifeq ($(SIMVER), x11) # This is the X11 simulator version $(OUTPUT): $(OBJS) - @echo "LD $@" + @echo "LD $(notdir $@)" @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) # 'x' must be kept or you'll have "Win32 error 5" @@ -77,7 +77,7 @@ ifeq ($(SIMVER), sdl) # This is the sdl simulator version $(OUTPUT): $(OBJS) - @echo "LD $@" + @echo "LD $(notdir $@)" @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) # 'x' must be kept or you'll have "Win32 error 5" diff --git a/apps/plugins/searchengine/Makefile b/apps/plugins/searchengine/Makefile index 7b4576802d..beadac7ea1 100644 --- a/apps/plugins/searchengine/Makefile +++ b/apps/plugins/searchengine/Makefile @@ -45,7 +45,7 @@ ifeq ($(SIMVER), x11) # This is the X11 simulator version $(OUTPUT): $(OBJS) - @echo "LD $<" + @echo "LD $(notdir $@)" @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) # 'x' must be kept or you'll have "Win32 error 5" @@ -61,7 +61,7 @@ ifeq ($(SIMVER), sdl) # This is the SDL simulator version $(OUTPUT): $(OBJS) - @echo "LD $<" + @echo "LD $(notdir $@)" @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) # 'x' must be kept or you'll have "Win32 error 5" diff --git a/apps/plugins/sudoku/Makefile b/apps/plugins/sudoku/Makefile index ff2ab2e4a0..7093de93c0 100644 --- a/apps/plugins/sudoku/Makefile +++ b/apps/plugins/sudoku/Makefile @@ -52,7 +52,7 @@ ifeq ($(SIMVER), x11) # This is the X11 simulator version $(OUTPUT): $(OBJS) - @echo "LD $<" + @echo "LD $(notdir $@)" @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin $(LINKBITMAPS) -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) # 'x' must be kept or you'll have "Win32 error 5" @@ -68,7 +68,7 @@ ifeq ($(SIMVER), sdl) # This is the SDL simulator version $(OUTPUT): $(OBJS) - @echo "LD $<" + @echo "LD $(notdir $@)" @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin $(LINKBITMAPS) -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) # 'x' must be kept or you'll have "Win32 error 5" diff --git a/apps/plugins/zxbox/Makefile b/apps/plugins/zxbox/Makefile index 14234cd896..8f26ce6f40 100644 --- a/apps/plugins/zxbox/Makefile +++ b/apps/plugins/zxbox/Makefile @@ -57,7 +57,7 @@ ifeq ($(SIMVER), sdl) # This is the SDL simulator version $(OUTPUT): $(OBJS) - @echo "LD $<" + @echo "LD $(notdir $@)" @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) # 'x' must be kept or you'll have "Win32 error 5" diff --git a/firmware/Makefile b/firmware/Makefile index a35a1205b6..9259f8cc29 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -27,7 +27,7 @@ all: $(OUTPUT) $(EXTRA_TARGETS) dep: $(DEPFILE) $(OUTPUT): $(OBJS) $(DEPFILE) - @echo "AR+RANLIB $@" + @echo "AR+RANLIB $(notdir $@)" $(SILENT)$(AR) ruv $@ $(OBJS) >/dev/null 2>&1 $(SILENT)$(RANLIB) $@ diff --git a/tools/makebmp.inc b/tools/makebmp.inc index d276732b67..62d3f25b41 100644 --- a/tools/makebmp.inc +++ b/tools/makebmp.inc @@ -30,6 +30,6 @@ $(DEPFILE): SOURCES done) $(OUTPUT): $(OBJS) - @echo "AR+RANLIB $@" + @echo "AR+RANLIB $(notdir $@)" @$(AR) ruv $@ $+ >/dev/null 2>&1 @$(RANLIB) $@ diff --git a/uisimulator/common/Makefile b/uisimulator/common/Makefile index 1024349f71..aeec7c6951 100644 --- a/uisimulator/common/Makefile +++ b/uisimulator/common/Makefile @@ -51,7 +51,7 @@ clean: @$(RM) $(OBJS) *~ core $(DEPFILE) $(OUTFILE) $(OUTFILE): $(OBJS) - @echo "AR+RANLIB $@" + @echo "AR+RANLIB $(notdir $@)" @$(AR) ruv $@ $(OBJS) >/dev/null 2>&1 @$(RANLIB) $@ diff --git a/uisimulator/sdl/Makefile b/uisimulator/sdl/Makefile index 0ebf103f0b..55b94cec5e 100644 --- a/uisimulator/sdl/Makefile +++ b/uisimulator/sdl/Makefile @@ -49,8 +49,9 @@ all: $(OUTFILE) include $(TOOLSDIR)/make.inc $(OUTFILE): $(OBJS) $(BUILDDIR)/UI256.bmp - @echo "AR $@" + @echo "AR+RANLIB $(notdir $@)" @$(AR) ruv $@ $(OBJS) >/dev/null 2>&1 + @$(RANLIB) $@ clean: @echo "cleaning sim" -- cgit v1.2.3