diff options
author | Jens Arnold <amiconn@rockbox.org> | 2006-10-23 22:33:39 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2006-10-23 22:33:39 +0000 |
commit | d1ce4e779ee8e5aef34da33ca26968cc9da10c3f (patch) | |
tree | 71b798a99632c8836ad7c09278bc8fd841f98949 /apps | |
parent | 76b2efbb433258097e23e0a35b09a5f5aa4d2e42 (diff) | |
download | rockbox-d1ce4e779ee8e5aef34da33ca26968cc9da10c3f.tar.gz rockbox-d1ce4e779ee8e5aef34da33ca26968cc9da10c3f.zip |
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
Diffstat (limited to 'apps')
-rw-r--r-- | apps/Makefile | 8 | ||||
-rw-r--r-- | apps/codecs/Makefile | 4 | ||||
-rw-r--r-- | apps/codecs/Tremor/Makefile | 3 | ||||
-rw-r--r-- | apps/codecs/lib/Makefile | 2 | ||||
-rw-r--r-- | apps/codecs/libFLAC/Makefile | 3 | ||||
-rw-r--r-- | apps/codecs/liba52/Makefile | 3 | ||||
-rw-r--r-- | apps/codecs/libalac/Makefile | 3 | ||||
-rw-r--r-- | apps/codecs/libfaad/Makefile | 3 | ||||
-rw-r--r-- | apps/codecs/libffmpegFLAC/Makefile | 3 | ||||
-rw-r--r-- | apps/codecs/libm4a/Makefile | 3 | ||||
-rw-r--r-- | apps/codecs/libmad/Makefile | 3 | ||||
-rw-r--r-- | apps/codecs/libmusepack/Makefile | 3 | ||||
-rw-r--r-- | apps/codecs/libwavpack/Makefile | 3 | ||||
-rw-r--r-- | apps/plugins/Makefile | 2 | ||||
-rw-r--r-- | apps/plugins/chessbox/Makefile | 4 | ||||
-rw-r--r-- | apps/plugins/databox/Makefile | 4 | ||||
-rw-r--r-- | apps/plugins/doom/Makefile | 9 | ||||
-rw-r--r-- | apps/plugins/lib/Makefile | 2 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/Makefile | 4 | ||||
-rw-r--r-- | apps/plugins/pacbox/Makefile | 4 | ||||
-rw-r--r-- | apps/plugins/rockboy/Makefile | 4 | ||||
-rw-r--r-- | apps/plugins/searchengine/Makefile | 4 | ||||
-rw-r--r-- | apps/plugins/sudoku/Makefile | 4 | ||||
-rw-r--r-- | apps/plugins/zxbox/Makefile | 2 |
24 files changed, 50 insertions, 37 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 | |||
104 | @$(MAKE) -C plugins OBJDIR=$(OBJDIR)/plugins | 104 | @$(MAKE) -C plugins OBJDIR=$(OBJDIR)/plugins |
105 | 105 | ||
106 | $(LINKFILE): $(LDS) | 106 | $(LINKFILE): $(LDS) |
107 | @echo "Build LDS file" | 107 | @echo "Build $(notdir $@)" |
108 | @cat $< | $(CC) -DLOADADDRESS=$(LOADADDRESS) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - >$@ | 108 | @cat $< | $(CC) -DLOADADDRESS=$(LOADADDRESS) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - >$@ |
109 | 109 | ||
110 | $(LINKROM): $(ROMLDS) | 110 | $(LINKROM): $(ROMLDS) |
111 | @echo "Build LDS file for Rombox" | 111 | @echo "Build $(notdir $@)" |
112 | @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - >$@ | 112 | @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - >$@ |
113 | 113 | ||
114 | $(MAXOUTFILE): | 114 | $(MAXOUTFILE): |
@@ -118,13 +118,13 @@ $(MAXOUTFILE): | |||
118 | @rm $(MAXINFILE) | 118 | @rm $(MAXINFILE) |
119 | 119 | ||
120 | $(OBJDIR)/rombox.elf : $(OBJS) $(LINKROM) $(DEPFILE) $(LIBROCKBOX) $(BITMAPLIBS) | 120 | $(OBJDIR)/rombox.elf : $(OBJS) $(LINKROM) $(DEPFILE) $(LIBROCKBOX) $(BITMAPLIBS) |
121 | @echo "LD rombox.elf" | 121 | @echo "LD $(notdir $@)" |
122 | @$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lrockbox -lgcc $(LINKBITMAPS) -L$(BUILDDIR)/firmware -T$(LINKROM) -Wl,-Map,$(OBJDIR)/rombox.map | 122 | @$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lrockbox -lgcc $(LINKBITMAPS) -L$(BUILDDIR)/firmware -T$(LINKROM) -Wl,-Map,$(OBJDIR)/rombox.map |
123 | 123 | ||
124 | ifndef SIMVER | 124 | ifndef SIMVER |
125 | 125 | ||
126 | $(OBJDIR)/rockbox.elf : $(OBJS) $(LINKFILE) $(DEPFILE) $(LIBROCKBOX) $(BITMAPLIBS) | 126 | $(OBJDIR)/rockbox.elf : $(OBJS) $(LINKFILE) $(DEPFILE) $(LIBROCKBOX) $(BITMAPLIBS) |
127 | @echo "LD rockbox.elf" | 127 | @echo "LD $(notdir $@)" |
128 | @$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR)/firmware -L$(BUILDDIR) -lrockbox $(LINKBITMAPS) -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockbox.map | 128 | @$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR)/firmware -L$(BUILDDIR) -lrockbox $(LINKBITMAPS) -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockbox.map |
129 | 129 | ||
130 | $(OBJDIR)/rockbox.bin : $(OBJDIR)/rockbox.elf | 130 | $(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) | |||
95 | # This is the SDL simulator version | 95 | # This is the SDL simulator version |
96 | 96 | ||
97 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) | 97 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) |
98 | @echo "LD $(notdir $@) $^" | 98 | @echo "LD $(notdir $@)" |
99 | $(SILENT)$(CC) $(CFLAGS) $(SHARED_FLAG) $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ | 99 | $(SILENT)$(CC) $(CFLAGS) $(SHARED_FLAG) $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ |
100 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 100 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
101 | # 'x' must be kept or you'll have "Win32 error 5" | 101 | # 'x' must be kept or you'll have "Win32 error 5" |
@@ -137,7 +137,7 @@ $(BUILDDIR)/libcodec.a: | |||
137 | $(SILENT)$(MAKE) -C lib OBJDIR=$(OBJDIR)/lib | 137 | $(SILENT)$(MAKE) -C lib OBJDIR=$(OBJDIR)/lib |
138 | 138 | ||
139 | $(LINKCODEC): $(LDS) | 139 | $(LINKCODEC): $(LDS) |
140 | @echo "build $@" | 140 | @echo "build $(notdir $@)" |
141 | $(SILENT)cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) -DCODEC $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@ | 141 | $(SILENT)cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) -DCODEC $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@ |
142 | 142 | ||
143 | $(BUILDDIR)/libmad.a: libmad | 143 | $(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 = | |||
30 | all: $(OUTPUT) | 30 | all: $(OUTPUT) |
31 | 31 | ||
32 | $(OUTPUT): $(OBJS) | 32 | $(OUTPUT): $(OBJS) |
33 | @echo "AR $@" | 33 | @echo "AR+RANLIB $(notdir $@)" |
34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
35 | @$(RANLIB) $@ | ||
35 | 36 | ||
36 | include $(TOOLSDIR)/make.inc | 37 | include $(TOOLSDIR)/make.inc |
37 | 38 | ||
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 | |||
33 | all: $(OUTPUT) | 33 | all: $(OUTPUT) |
34 | 34 | ||
35 | $(OUTPUT): $(OBJS) | 35 | $(OUTPUT): $(OBJS) |
36 | @echo "AR+RANLIB $@" | 36 | @echo "AR+RANLIB $(notdir $@)" |
37 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 37 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
38 | @$(RANLIB) $@ | 38 | @$(RANLIB) $@ |
39 | 39 | ||
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 | |||
44 | all: $(OUTPUT) | 44 | all: $(OUTPUT) |
45 | 45 | ||
46 | $(OUTPUT): $(OBJS) | 46 | $(OUTPUT): $(OBJS) |
47 | @echo "AR $@" | 47 | @echo "AR+RANLIB $(notdir $@)" |
48 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 48 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
49 | @$(RANLIB) $@ | ||
49 | 50 | ||
50 | $(OBJDIR)/libFLAC/%.o: $(APPSDIR)/codecs/libFLAC/%.c | 51 | $(OBJDIR)/libFLAC/%.o: $(APPSDIR)/codecs/libFLAC/%.c |
51 | @mkdir -p $(OBJDIR)/libFLAC | 52 | @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 = | |||
30 | all: $(OUTPUT) | 30 | all: $(OUTPUT) |
31 | 31 | ||
32 | $(OUTPUT): $(OBJS) | 32 | $(OUTPUT): $(OBJS) |
33 | @echo "AR $@" | 33 | @echo "AR+RANLIB $(notdir $@)" |
34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
35 | @$(RANLIB) $@ | ||
35 | 36 | ||
36 | include $(TOOLSDIR)/make.inc | 37 | include $(TOOLSDIR)/make.inc |
37 | 38 | ||
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 = | |||
30 | all: $(OUTPUT) | 30 | all: $(OUTPUT) |
31 | 31 | ||
32 | $(OUTPUT): $(OBJS) | 32 | $(OUTPUT): $(OBJS) |
33 | @echo "AR $@" | 33 | @echo "AR+RANLIB $(notdir $@)" |
34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
35 | @$(RANLIB) $@ | ||
35 | 36 | ||
36 | include $(TOOLSDIR)/make.inc | 37 | include $(TOOLSDIR)/make.inc |
37 | 38 | ||
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 = | |||
30 | all: $(OUTPUT) | 30 | all: $(OUTPUT) |
31 | 31 | ||
32 | $(OUTPUT): $(OBJS) | 32 | $(OUTPUT): $(OBJS) |
33 | @echo "AR $@" | 33 | @echo "AR+RANLIB $(notdir $@)" |
34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
35 | @$(RANLIB) $@ | ||
35 | 36 | ||
36 | include $(TOOLSDIR)/make.inc | 37 | include $(TOOLSDIR)/make.inc |
37 | 38 | ||
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 = | |||
30 | all: $(OUTPUT) | 30 | all: $(OUTPUT) |
31 | 31 | ||
32 | $(OUTPUT): $(OBJS) | 32 | $(OUTPUT): $(OBJS) |
33 | @echo "AR $@" | 33 | @echo "AR+RANLIB $(notdir $@)" |
34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
35 | @$(RANLIB) $@ | ||
35 | 36 | ||
36 | include $(TOOLSDIR)/make.inc | 37 | include $(TOOLSDIR)/make.inc |
37 | 38 | ||
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 = | |||
30 | all: $(OUTPUT) | 30 | all: $(OUTPUT) |
31 | 31 | ||
32 | $(OUTPUT): $(OBJS) | 32 | $(OUTPUT): $(OBJS) |
33 | @echo "AR $@" | 33 | @echo "AR+RANLIB $(notdir $@)" |
34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
35 | @$(RANLIB) $@ | ||
35 | 36 | ||
36 | include $(TOOLSDIR)/make.inc | 37 | include $(TOOLSDIR)/make.inc |
37 | 38 | ||
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 = | |||
39 | all: $(OUTPUT) | 39 | all: $(OUTPUT) |
40 | 40 | ||
41 | $(OUTPUT): $(OBJS) | 41 | $(OUTPUT): $(OBJS) |
42 | @echo "AR $@" | 42 | @echo "AR+RANLIB $(notdir $@)" |
43 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 43 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
44 | @$(RANLIB) $@ | ||
44 | 45 | ||
45 | include $(TOOLSDIR)/make.inc | 46 | include $(TOOLSDIR)/make.inc |
46 | 47 | ||
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 = | |||
30 | all: $(OUTPUT) | 30 | all: $(OUTPUT) |
31 | 31 | ||
32 | $(OUTPUT): $(OBJS) | 32 | $(OUTPUT): $(OBJS) |
33 | @echo "AR $@" | 33 | @echo "AR+RANLIB $(notdir $@)" |
34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
35 | @$(RANLIB) $@ | ||
35 | 36 | ||
36 | include $(TOOLSDIR)/make.inc | 37 | include $(TOOLSDIR)/make.inc |
37 | 38 | ||
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 = | |||
30 | all: $(OUTPUT) | 30 | all: $(OUTPUT) |
31 | 31 | ||
32 | $(OUTPUT): $(OBJS) | 32 | $(OUTPUT): $(OBJS) |
33 | @echo "AR $@" | 33 | @echo "AR+RANLIB $(notdir $@)" |
34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
35 | @$(RANLIB) $@ | ||
35 | 36 | ||
36 | include $(TOOLSDIR)/make.inc | 37 | include $(TOOLSDIR)/make.inc |
37 | 38 | ||
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: | |||
152 | $(SILENT)$(MAKE) -C lib OBJDIR=$(OBJDIR)/lib | 152 | $(SILENT)$(MAKE) -C lib OBJDIR=$(OBJDIR)/lib |
153 | 153 | ||
154 | $(LINKFILE): $(LDS) | 154 | $(LINKFILE): $(LDS) |
155 | @echo "build $@" | 155 | @echo "build $(notdir $@)" |
156 | $(SILENT)cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@ | 156 | $(SILENT)cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@ |
157 | 157 | ||
158 | $(SUBDIRS): $(BITMAPLIBS) | 158 | $(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) | |||
54 | # This is the X11 simulator version | 54 | # This is the X11 simulator version |
55 | 55 | ||
56 | $(OUTPUT): $(OBJS) | 56 | $(OUTPUT): $(OBJS) |
57 | @echo "LD $<" | 57 | @echo "LD $(notdir $@)" |
58 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin $(LINKBITMAPS) -o $@ | 58 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin $(LINKBITMAPS) -o $@ |
59 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 59 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
60 | # 'x' must be kept or you'll have "Win32 error 5" | 60 | # 'x' must be kept or you'll have "Win32 error 5" |
@@ -70,7 +70,7 @@ ifeq ($(SIMVER), sdl) | |||
70 | # This is the SDL simulator version | 70 | # This is the SDL simulator version |
71 | 71 | ||
72 | $(OUTPUT): $(OBJS) | 72 | $(OUTPUT): $(OBJS) |
73 | @echo "LD $<" | 73 | @echo "LD $(notdir $@)" |
74 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin $(LINKBITMAPS) -o $@ | 74 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin $(LINKBITMAPS) -o $@ |
75 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 75 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
76 | # 'x' must be kept or you'll have "Win32 error 5" | 76 | # '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) | |||
45 | # This is the X11 simulator version | 45 | # This is the X11 simulator version |
46 | 46 | ||
47 | $(OUTPUT): $(OBJS) | 47 | $(OUTPUT): $(OBJS) |
48 | @echo "LD $<" | 48 | @echo "LD $(notdir $@)" |
49 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | 49 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
50 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 50 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
51 | # 'x' must be kept or you'll have "Win32 error 5" | 51 | # 'x' must be kept or you'll have "Win32 error 5" |
@@ -61,7 +61,7 @@ ifeq ($(SIMVER), sdl) | |||
61 | # This is the SDL simulator version | 61 | # This is the SDL simulator version |
62 | 62 | ||
63 | $(OUTPUT): $(OBJS) | 63 | $(OUTPUT): $(OBJS) |
64 | @echo "LD $<" | 64 | @echo "LD $(notdir $@)" |
65 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | 65 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
66 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 66 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
67 | # 'x' must be kept or you'll have "Win32 error 5" | 67 | # '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 @@ | |||
3 | # $Id$ | 3 | # $Id$ |
4 | # | 4 | # |
5 | # $Log$ | 5 | # $Log$ |
6 | # Revision 1.8 2006/10/23 14:09:28 markun | 6 | # Revision 1.9 2006/10/23 22:33:36 amiconn |
7 | # Consistent style of 'make' messages. Always use ranlib after ar. | ||
8 | # | ||
9 | # Revision 1.8 2006-10-23 14:09:28 markun | ||
7 | # rearrange compiler options to avoid conflicts with header files on FreeBSD | 10 | # rearrange compiler options to avoid conflicts with header files on FreeBSD |
8 | # | 11 | # |
9 | # Revision 1.7 2006-10-22 00:21:56 amiconn | 12 | # Revision 1.7 2006-10-22 00:21:56 amiconn |
@@ -96,7 +99,7 @@ ifeq ($(SIMVER), x11) | |||
96 | # This is the X11 simulator version | 99 | # This is the X11 simulator version |
97 | 100 | ||
98 | $(OUTPUT): $(OBJS) | 101 | $(OUTPUT): $(OBJS) |
99 | @echo "LD $@" | 102 | @echo "LD $(notdir $@)" |
100 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | 103 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
101 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 104 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
102 | # 'x' must be kept or you'll have "Win32 error 5" | 105 | # 'x' must be kept or you'll have "Win32 error 5" |
@@ -112,7 +115,7 @@ ifeq ($(SIMVER), sdl) | |||
112 | # This is the sdl simulator version | 115 | # This is the sdl simulator version |
113 | 116 | ||
114 | $(OUTPUT): $(OBJS) | 117 | $(OUTPUT): $(OBJS) |
115 | @echo "LD $@" | 118 | @echo "LD $(notdir $@)" |
116 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | 119 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
117 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 120 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
118 | # 'x' must be kept or you'll have "Win32 error 5" | 121 | # '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 | |||
38 | all: $(OUTPUT) | 38 | all: $(OUTPUT) |
39 | 39 | ||
40 | $(OUTPUT): $(OBJS) | 40 | $(OUTPUT): $(OBJS) |
41 | @echo "AR+RANLIB $@" | 41 | @echo "AR+RANLIB $(notdir $@)" |
42 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 42 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
43 | @$(RANLIB) $@ | 43 | @$(RANLIB) $@ |
44 | 44 | ||
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) | |||
48 | # This is the X11 simulator version | 48 | # This is the X11 simulator version |
49 | 49 | ||
50 | $(OUTPUT): $(OBJS) | 50 | $(OUTPUT): $(OBJS) |
51 | @echo "LD $<" | 51 | @echo "LD $(notdir $@)" |
52 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | 52 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
53 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 53 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
54 | # 'x' must be kept or you'll have "Win32 error 5" | 54 | # 'x' must be kept or you'll have "Win32 error 5" |
@@ -64,7 +64,7 @@ ifeq ($(SIMVER), sdl) | |||
64 | # This is the SDL simulator version | 64 | # This is the SDL simulator version |
65 | 65 | ||
66 | $(OUTPUT): $(OBJS) | 66 | $(OUTPUT): $(OBJS) |
67 | @echo "LD $<" | 67 | @echo "LD $(notdir $@)" |
68 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | 68 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
69 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 69 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
70 | # 'x' must be kept or you'll have "Win32 error 5" | 70 | # '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) | |||
48 | # This is the X11 simulator version | 48 | # This is the X11 simulator version |
49 | 49 | ||
50 | $(OUTPUT): $(OBJS) | 50 | $(OUTPUT): $(OBJS) |
51 | @echo "LD $<" | 51 | @echo "LD $(notdir $@)" |
52 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | 52 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
53 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 53 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
54 | # 'x' must be kept or you'll have "Win32 error 5" | 54 | # 'x' must be kept or you'll have "Win32 error 5" |
@@ -64,7 +64,7 @@ ifeq ($(SIMVER), sdl) | |||
64 | # This is the SDL simulator version | 64 | # This is the SDL simulator version |
65 | 65 | ||
66 | $(OUTPUT): $(OBJS) | 66 | $(OUTPUT): $(OBJS) |
67 | @echo "LD $<" | 67 | @echo "LD $(notdir $@)" |
68 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | 68 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
69 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 69 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
70 | # 'x' must be kept or you'll have "Win32 error 5" | 70 | # '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) | |||
61 | # This is the X11 simulator version | 61 | # This is the X11 simulator version |
62 | 62 | ||
63 | $(OUTPUT): $(OBJS) | 63 | $(OUTPUT): $(OBJS) |
64 | @echo "LD $@" | 64 | @echo "LD $(notdir $@)" |
65 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | 65 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
66 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 66 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
67 | # 'x' must be kept or you'll have "Win32 error 5" | 67 | # 'x' must be kept or you'll have "Win32 error 5" |
@@ -77,7 +77,7 @@ ifeq ($(SIMVER), sdl) | |||
77 | # This is the sdl simulator version | 77 | # This is the sdl simulator version |
78 | 78 | ||
79 | $(OUTPUT): $(OBJS) | 79 | $(OUTPUT): $(OBJS) |
80 | @echo "LD $@" | 80 | @echo "LD $(notdir $@)" |
81 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | 81 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
82 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 82 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
83 | # 'x' must be kept or you'll have "Win32 error 5" | 83 | # '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) | |||
45 | # This is the X11 simulator version | 45 | # This is the X11 simulator version |
46 | 46 | ||
47 | $(OUTPUT): $(OBJS) | 47 | $(OUTPUT): $(OBJS) |
48 | @echo "LD $<" | 48 | @echo "LD $(notdir $@)" |
49 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | 49 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
50 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 50 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
51 | # 'x' must be kept or you'll have "Win32 error 5" | 51 | # 'x' must be kept or you'll have "Win32 error 5" |
@@ -61,7 +61,7 @@ ifeq ($(SIMVER), sdl) | |||
61 | # This is the SDL simulator version | 61 | # This is the SDL simulator version |
62 | 62 | ||
63 | $(OUTPUT): $(OBJS) | 63 | $(OUTPUT): $(OBJS) |
64 | @echo "LD $<" | 64 | @echo "LD $(notdir $@)" |
65 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | 65 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
66 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 66 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
67 | # 'x' must be kept or you'll have "Win32 error 5" | 67 | # '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) | |||
52 | # This is the X11 simulator version | 52 | # This is the X11 simulator version |
53 | 53 | ||
54 | $(OUTPUT): $(OBJS) | 54 | $(OUTPUT): $(OBJS) |
55 | @echo "LD $<" | 55 | @echo "LD $(notdir $@)" |
56 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin $(LINKBITMAPS) -o $@ | 56 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin $(LINKBITMAPS) -o $@ |
57 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 57 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
58 | # 'x' must be kept or you'll have "Win32 error 5" | 58 | # 'x' must be kept or you'll have "Win32 error 5" |
@@ -68,7 +68,7 @@ ifeq ($(SIMVER), sdl) | |||
68 | # This is the SDL simulator version | 68 | # This is the SDL simulator version |
69 | 69 | ||
70 | $(OUTPUT): $(OBJS) | 70 | $(OUTPUT): $(OBJS) |
71 | @echo "LD $<" | 71 | @echo "LD $(notdir $@)" |
72 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin $(LINKBITMAPS) -o $@ | 72 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin $(LINKBITMAPS) -o $@ |
73 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 73 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
74 | # 'x' must be kept or you'll have "Win32 error 5" | 74 | # '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) | |||
57 | # This is the SDL simulator version | 57 | # This is the SDL simulator version |
58 | 58 | ||
59 | $(OUTPUT): $(OBJS) | 59 | $(OUTPUT): $(OBJS) |
60 | @echo "LD $<" | 60 | @echo "LD $(notdir $@)" |
61 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | 61 | @$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
62 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 62 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
63 | # 'x' must be kept or you'll have "Win32 error 5" | 63 | # 'x' must be kept or you'll have "Win32 error 5" |