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/codecs | |
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/codecs')
-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 |
12 files changed, 23 insertions, 13 deletions
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 | ||