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/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 +- 11 files changed, 23 insertions(+), 20 deletions(-) (limited to 'apps/plugins') 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" -- cgit v1.2.3