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
diff --git a/apps/Makefile b/apps/Makefile
index 7396d30..a6c7584 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -104,11 +104,11 @@
@$(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 @@
@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 76c8ce3..cd0677a 100644
--- a/apps/codecs/Makefile
+++ b/apps/codecs/Makefile
@@ -95,7 +95,7 @@
# 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 @@
$(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 881329d..ee91a05 100644
--- a/apps/codecs/Tremor/Makefile
+++ b/apps/codecs/Tremor/Makefile
@@ -30,8 +30,9 @@
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 865e3b5..fcf84c2 100644
--- a/apps/codecs/lib/Makefile
+++ b/apps/codecs/lib/Makefile
@@ -33,7 +33,7 @@
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 d1e78bd..221b934 100644
--- a/apps/codecs/libFLAC/Makefile
+++ b/apps/codecs/libFLAC/Makefile
@@ -44,8 +44,9 @@
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 ea3c01c..b93f0c7 100644
--- a/apps/codecs/liba52/Makefile
+++ b/apps/codecs/liba52/Makefile
@@ -30,8 +30,9 @@
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 5bca428..6f75a08 100644
--- a/apps/codecs/libalac/Makefile
+++ b/apps/codecs/libalac/Makefile
@@ -30,8 +30,9 @@
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 1cb6c92..4a59d6c 100644
--- a/apps/codecs/libfaad/Makefile
+++ b/apps/codecs/libfaad/Makefile
@@ -30,8 +30,9 @@
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 ee3f392..27c17c8 100644
--- a/apps/codecs/libffmpegFLAC/Makefile
+++ b/apps/codecs/libffmpegFLAC/Makefile
@@ -30,8 +30,9 @@
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 ad084b0..73b24bc 100644
--- a/apps/codecs/libm4a/Makefile
+++ b/apps/codecs/libm4a/Makefile
@@ -30,8 +30,9 @@
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 c24a693..7ee16d9 100644
--- a/apps/codecs/libmad/Makefile
+++ b/apps/codecs/libmad/Makefile
@@ -39,8 +39,9 @@
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 f5c59cc..68c2603 100644
--- a/apps/codecs/libmusepack/Makefile
+++ b/apps/codecs/libmusepack/Makefile
@@ -30,8 +30,9 @@
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 60911a0..077e4aa 100644
--- a/apps/codecs/libwavpack/Makefile
+++ b/apps/codecs/libwavpack/Makefile
@@ -30,8 +30,9 @@
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 c3f718c..a35bcf7 100644
--- a/apps/plugins/Makefile
+++ b/apps/plugins/Makefile
@@ -152,7 +152,7 @@
$(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 c86d805..7b3ade2 100644
--- a/apps/plugins/chessbox/Makefile
+++ b/apps/plugins/chessbox/Makefile
@@ -54,7 +54,7 @@
# 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 @@
# 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 451f341..818ceb4 100644
--- a/apps/plugins/databox/Makefile
+++ b/apps/plugins/databox/Makefile
@@ -45,7 +45,7 @@
# 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 @@
# 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 20b6aea..e1564a7 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 @@
# 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 @@
# 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 8482b1f..35bf3ac 100644
--- a/apps/plugins/lib/Makefile
+++ b/apps/plugins/lib/Makefile
@@ -38,7 +38,7 @@
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 61eae88..82782b7 100644
--- a/apps/plugins/mpegplayer/Makefile
+++ b/apps/plugins/mpegplayer/Makefile
@@ -48,7 +48,7 @@
# 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 @@
# 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 7af0216..7cc8da0 100644
--- a/apps/plugins/pacbox/Makefile
+++ b/apps/plugins/pacbox/Makefile
@@ -48,7 +48,7 @@
# 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 @@
# 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 b682294..275d2ff 100644
--- a/apps/plugins/rockboy/Makefile
+++ b/apps/plugins/rockboy/Makefile
@@ -61,7 +61,7 @@
# 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 @@
# 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 7b45768..beadac7 100644
--- a/apps/plugins/searchengine/Makefile
+++ b/apps/plugins/searchengine/Makefile
@@ -45,7 +45,7 @@
# 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 @@
# 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 ff2ab2e..7093de9 100644
--- a/apps/plugins/sudoku/Makefile
+++ b/apps/plugins/sudoku/Makefile
@@ -52,7 +52,7 @@
# 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 @@
# 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 14234cd..8f26ce6 100644
--- a/apps/plugins/zxbox/Makefile
+++ b/apps/plugins/zxbox/Makefile
@@ -57,7 +57,7 @@
# 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 a35a120..9259f8c 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -27,7 +27,7 @@
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 d276732..62d3f25 100644
--- a/tools/makebmp.inc
+++ b/tools/makebmp.inc
@@ -30,6 +30,6 @@
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 1024349..aeec7c6 100644
--- a/uisimulator/common/Makefile
+++ b/uisimulator/common/Makefile
@@ -51,7 +51,7 @@
@$(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 0ebf103..55b94ce 100644
--- a/uisimulator/sdl/Makefile
+++ b/uisimulator/sdl/Makefile
@@ -49,8 +49,9 @@
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"