diff options
-rw-r--r-- | apps/codecs/Tremor/Makefile | 10 | ||||
-rw-r--r-- | apps/codecs/liba52/Makefile | 13 | ||||
-rw-r--r-- | apps/codecs/libalac/Makefile | 11 | ||||
-rw-r--r-- | apps/codecs/libfaad/Makefile | 13 | ||||
-rw-r--r-- | apps/codecs/libffmpegFLAC/Makefile | 11 | ||||
-rw-r--r-- | apps/codecs/libm4a/Makefile | 11 | ||||
-rw-r--r-- | apps/codecs/libmad/Makefile | 12 | ||||
-rw-r--r-- | apps/codecs/libmusepack/Makefile | 12 | ||||
-rw-r--r-- | apps/codecs/libwavpack/Makefile | 13 |
9 files changed, 39 insertions, 67 deletions
diff --git a/apps/codecs/Tremor/Makefile b/apps/codecs/Tremor/Makefile index 4eadd24a10..7fd5de852b 100644 --- a/apps/codecs/Tremor/Makefile +++ b/apps/codecs/Tremor/Makefile | |||
@@ -16,7 +16,7 @@ endif | |||
16 | 16 | ||
17 | TREMOROPTS = -O2 | 17 | TREMOROPTS = -O2 |
18 | CFLAGS = $(GCCOPTS) $(TREMOROPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | 18 | CFLAGS = $(GCCOPTS) $(TREMOROPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ |
19 | -DMEM=${MEMORYSIZE} | 19 | -DMEM=${MEMORYSIZE} |
20 | 20 | ||
21 | # This sets up 'SRC' based on the files mentioned in SOURCES | 21 | # This sets up 'SRC' based on the files mentioned in SOURCES |
22 | include $(TOOLSDIR)/makesrc.inc | 22 | include $(TOOLSDIR)/makesrc.inc |
@@ -27,22 +27,18 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) | |||
27 | DEPFILE = $(OBJDIR)/dep-Tremor | 27 | DEPFILE = $(OBJDIR)/dep-Tremor |
28 | DIRS = | 28 | DIRS = |
29 | 29 | ||
30 | OUTPUT = $(BUILDDIR)/libTremor.a | ||
31 | |||
32 | all: $(OUTPUT) | 30 | all: $(OUTPUT) |
33 | 31 | ||
34 | $(OUTPUT): $(OBJS) | 32 | $(OUTPUT): $(OBJS) |
35 | @echo "AR $@" | 33 | @echo "AR $@" |
36 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
37 | 35 | ||
38 | $(OBJDIR)/%.o: $(APPSDIR)/codecs/Tremor/%.c | ||
39 | @echo "(Tremor) CC "`basename $<` | ||
40 | @$(CC) -c $(CFLAGS) -I$(APPSDIR)/codecs/Tremor/ $< -o $@ | ||
41 | |||
42 | include $(TOOLSDIR)/make.inc | 36 | include $(TOOLSDIR)/make.inc |
43 | 37 | ||
44 | clean: | 38 | clean: |
45 | @echo "cleaning Tremor" | 39 | @echo "cleaning Tremor" |
46 | @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) | 40 | @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) |
47 | 41 | ||
42 | ifneq ($(MAKECMDGOALS),clean) | ||
48 | -include $(DEPFILE) | 43 | -include $(DEPFILE) |
44 | endif | ||
diff --git a/apps/codecs/liba52/Makefile b/apps/codecs/liba52/Makefile index 54542c096e..8e0501798d 100644 --- a/apps/codecs/liba52/Makefile +++ b/apps/codecs/liba52/Makefile | |||
@@ -14,8 +14,9 @@ ifdef APPEXTRA | |||
14 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) | 14 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
15 | endif | 15 | endif |
16 | 16 | ||
17 | A52OPTS = | 17 | A52OPTS = -O2 |
18 | CFLAGS = $(GCCOPTS) $(A52OPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} | 18 | CFLAGS = $(GCCOPTS) $(A52OPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ |
19 | -DMEM=${MEMORYSIZE} | ||
19 | 20 | ||
20 | # This sets up 'SRC' based on the files mentioned in SOURCES | 21 | # This sets up 'SRC' based on the files mentioned in SOURCES |
21 | include $(TOOLSDIR)/makesrc.inc | 22 | include $(TOOLSDIR)/makesrc.inc |
@@ -26,22 +27,18 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) | |||
26 | DEPFILE = $(OBJDIR)/dep-liba52 | 27 | DEPFILE = $(OBJDIR)/dep-liba52 |
27 | DIRS = | 28 | DIRS = |
28 | 29 | ||
29 | OUTPUT = $(BUILDDIR)/liba52.a | ||
30 | |||
31 | all: $(OUTPUT) | 30 | all: $(OUTPUT) |
32 | 31 | ||
33 | $(OUTPUT): $(OBJS) | 32 | $(OUTPUT): $(OBJS) |
34 | @echo "AR $@" | 33 | @echo "AR $@" |
35 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
36 | 35 | ||
37 | $(OBJDIR)/liba52/%.o: $(APPSDIR)/codecs/liba52/%.c | ||
38 | @echo "(liba52) CC $<" | ||
39 | @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/liba52/ $< -o $@ | ||
40 | |||
41 | include $(TOOLSDIR)/make.inc | 36 | include $(TOOLSDIR)/make.inc |
42 | 37 | ||
43 | clean: | 38 | clean: |
44 | @echo "cleaning liba52" | 39 | @echo "cleaning liba52" |
45 | @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) | 40 | @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) |
46 | 41 | ||
42 | ifneq ($(MAKECMDGOALS),clean) | ||
47 | -include $(DEPFILE) | 43 | -include $(DEPFILE) |
44 | endif | ||
diff --git a/apps/codecs/libalac/Makefile b/apps/codecs/libalac/Makefile index 5bffb0669e..5bca428f81 100644 --- a/apps/codecs/libalac/Makefile +++ b/apps/codecs/libalac/Makefile | |||
@@ -15,7 +15,8 @@ ifdef APPEXTRA | |||
15 | endif | 15 | endif |
16 | 16 | ||
17 | ALACOPTS = -O3 | 17 | ALACOPTS = -O3 |
18 | CFLAGS = $(GCCOPTS) $(ALACOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} | 18 | CFLAGS = $(GCCOPTS) $(ALACOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ |
19 | -DMEM=${MEMORYSIZE} | ||
19 | 20 | ||
20 | # This sets up 'SRC' based on the files mentioned in SOURCES | 21 | # This sets up 'SRC' based on the files mentioned in SOURCES |
21 | include $(TOOLSDIR)/makesrc.inc | 22 | include $(TOOLSDIR)/makesrc.inc |
@@ -26,22 +27,18 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) | |||
26 | DEPFILE = $(OBJDIR)/dep-libalac | 27 | DEPFILE = $(OBJDIR)/dep-libalac |
27 | DIRS = | 28 | DIRS = |
28 | 29 | ||
29 | OUTPUT = $(BUILDDIR)/libalac.a | ||
30 | |||
31 | all: $(OUTPUT) | 30 | all: $(OUTPUT) |
32 | 31 | ||
33 | $(OUTPUT): $(OBJS) | 32 | $(OUTPUT): $(OBJS) |
34 | @echo "AR $@" | 33 | @echo "AR $@" |
35 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
36 | 35 | ||
37 | $(OBJDIR)/libalac/%.o: $(APPSDIR)/codecs/libalac/%.c | ||
38 | @echo "(libalac) CC $<" | ||
39 | @$(CC) -c $(CFLAGS) -I$(APPSDIR)/codecs/libalac/ $< -o $@ | ||
40 | |||
41 | include $(TOOLSDIR)/make.inc | 36 | include $(TOOLSDIR)/make.inc |
42 | 37 | ||
43 | clean: | 38 | clean: |
44 | @echo "cleaning libalac" | 39 | @echo "cleaning libalac" |
45 | @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) | 40 | @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) |
46 | 41 | ||
42 | ifneq ($(MAKECMDGOALS),clean) | ||
47 | -include $(DEPFILE) | 43 | -include $(DEPFILE) |
44 | endif | ||
diff --git a/apps/codecs/libfaad/Makefile b/apps/codecs/libfaad/Makefile index 98ad9b9160..548ae5c602 100644 --- a/apps/codecs/libfaad/Makefile +++ b/apps/codecs/libfaad/Makefile | |||
@@ -11,11 +11,12 @@ INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | |||
11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) | 11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) |
12 | 12 | ||
13 | ifdef APPEXTRA | 13 | ifdef APPEXTRA |
14 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 14 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
15 | endif | 15 | endif |
16 | 16 | ||
17 | FAADOPTS = -O2 -Wno-char-subscripts | 17 | FAADOPTS = -O2 -Wno-char-subscripts |
18 | CFLAGS = $(GCCOPTS) $(FAADOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} | 18 | CFLAGS = $(GCCOPTS) $(FAADOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ |
19 | -DMEM=${MEMORYSIZE} | ||
19 | 20 | ||
20 | # This sets up 'SRC' based on the files mentioned in SOURCES | 21 | # This sets up 'SRC' based on the files mentioned in SOURCES |
21 | include $(TOOLSDIR)/makesrc.inc | 22 | include $(TOOLSDIR)/makesrc.inc |
@@ -26,22 +27,18 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) | |||
26 | DEPFILE = $(OBJDIR)/dep-libfaad | 27 | DEPFILE = $(OBJDIR)/dep-libfaad |
27 | DIRS = | 28 | DIRS = |
28 | 29 | ||
29 | OUTPUT = $(BUILDDIR)/libfaad.a | ||
30 | |||
31 | all: $(OUTPUT) | 30 | all: $(OUTPUT) |
32 | 31 | ||
33 | $(OUTPUT): $(OBJS) | 32 | $(OUTPUT): $(OBJS) |
34 | @echo "AR $@" | 33 | @echo "AR $@" |
35 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
36 | 35 | ||
37 | $(OBJDIR)/libfaad/%.o: $(APPSDIR)/codecs/libfaad/%.c | ||
38 | @echo "(libfaad) CC $<" | ||
39 | @$(CC) -c $(CFLAGS) -I$(APPSDIR)/codecs/libfaad/ $< -o $@ | ||
40 | |||
41 | include $(TOOLSDIR)/make.inc | 36 | include $(TOOLSDIR)/make.inc |
42 | 37 | ||
43 | clean: | 38 | clean: |
44 | @echo "cleaning libfaad" | 39 | @echo "cleaning libfaad" |
45 | @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) | 40 | @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) |
46 | 41 | ||
42 | ifneq ($(MAKECMDGOALS),clean) | ||
47 | -include $(DEPFILE) | 43 | -include $(DEPFILE) |
44 | endif | ||
diff --git a/apps/codecs/libffmpegFLAC/Makefile b/apps/codecs/libffmpegFLAC/Makefile index 29db4aae87..60da5ae7ff 100644 --- a/apps/codecs/libffmpegFLAC/Makefile +++ b/apps/codecs/libffmpegFLAC/Makefile | |||
@@ -15,7 +15,8 @@ ifdef APPEXTRA | |||
15 | endif | 15 | endif |
16 | 16 | ||
17 | FLACOPTS = -O2 | 17 | FLACOPTS = -O2 |
18 | CFLAGS = $(GCCOPTS) $(FLACOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} | 18 | CFLAGS = $(GCCOPTS) $(FLACOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ |
19 | -DMEM=${MEMORYSIZE} | ||
19 | 20 | ||
20 | # This sets up 'SRC' based on the files mentioned in SOURCES | 21 | # This sets up 'SRC' based on the files mentioned in SOURCES |
21 | include $(TOOLSDIR)/makesrc.inc | 22 | include $(TOOLSDIR)/makesrc.inc |
@@ -26,22 +27,18 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) | |||
26 | DEPFILE = $(OBJDIR)/dep-libffmpegFLAC | 27 | DEPFILE = $(OBJDIR)/dep-libffmpegFLAC |
27 | DIRS = | 28 | DIRS = |
28 | 29 | ||
29 | OUTPUT = $(BUILDDIR)/libffmpegFLAC.a | ||
30 | |||
31 | all: $(OUTPUT) | 30 | all: $(OUTPUT) |
32 | 31 | ||
33 | $(OUTPUT): $(OBJS) | 32 | $(OUTPUT): $(OBJS) |
34 | @echo "AR $@" | 33 | @echo "AR $@" |
35 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
36 | 35 | ||
37 | $(OBJDIR)/libffmpegFLAC/%.o: $(APPSDIR)/codecs/libffmpegFLAC/%.c | ||
38 | @echo "(libffmpegFLAC) CC $<" | ||
39 | @$(CC) -c $(CFLAGS) -I$(APPSDIR)/codecs/libffmpegFLAC/ $< -o $@ | ||
40 | |||
41 | include $(TOOLSDIR)/make.inc | 36 | include $(TOOLSDIR)/make.inc |
42 | 37 | ||
43 | clean: | 38 | clean: |
44 | @echo "cleaning libffmpegFLAC" | 39 | @echo "cleaning libffmpegFLAC" |
45 | @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) | 40 | @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) |
46 | 41 | ||
42 | ifneq ($(MAKECMDGOALS),clean) | ||
47 | -include $(DEPFILE) | 43 | -include $(DEPFILE) |
44 | endif | ||
diff --git a/apps/codecs/libm4a/Makefile b/apps/codecs/libm4a/Makefile index 540a532213..7f870c9407 100644 --- a/apps/codecs/libm4a/Makefile +++ b/apps/codecs/libm4a/Makefile | |||
@@ -15,7 +15,8 @@ ifdef APPEXTRA | |||
15 | endif | 15 | endif |
16 | 16 | ||
17 | M4AOPTS = -O3 | 17 | M4AOPTS = -O3 |
18 | CFLAGS = $(GCCOPTS) $(M4AOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} | 18 | CFLAGS = $(GCCOPTS) $(M4AOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ |
19 | -DMEM=${MEMORYSIZE} | ||
19 | 20 | ||
20 | # This sets up 'SRC' based on the files mentioned in SOURCES | 21 | # This sets up 'SRC' based on the files mentioned in SOURCES |
21 | include $(TOOLSDIR)/makesrc.inc | 22 | include $(TOOLSDIR)/makesrc.inc |
@@ -26,22 +27,18 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) | |||
26 | DEPFILE = $(OBJDIR)/dep-libm4a | 27 | DEPFILE = $(OBJDIR)/dep-libm4a |
27 | DIRS = | 28 | DIRS = |
28 | 29 | ||
29 | OUTPUT = $(BUILDDIR)/libm4a.a | ||
30 | |||
31 | all: $(OUTPUT) | 30 | all: $(OUTPUT) |
32 | 31 | ||
33 | $(OUTPUT): $(OBJS) | 32 | $(OUTPUT): $(OBJS) |
34 | @echo "AR $@" | 33 | @echo "AR $@" |
35 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
36 | 35 | ||
37 | $(OBJDIR)/libm4a/%.o: $(APPSDIR)/codecs/libm4a/%.c | ||
38 | @echo "(libm4a) CC $<" | ||
39 | @$(CC) -c $(CFLAGS) -I$(APPSDIR)/codecs/libm4a/ $< -o $@ | ||
40 | |||
41 | include $(TOOLSDIR)/make.inc | 36 | include $(TOOLSDIR)/make.inc |
42 | 37 | ||
43 | clean: | 38 | clean: |
44 | @echo "cleaning libm4a" | 39 | @echo "cleaning libm4a" |
45 | @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) | 40 | @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) |
46 | 41 | ||
42 | ifneq ($(MAKECMDGOALS),clean) | ||
47 | -include $(DEPFILE) | 43 | -include $(DEPFILE) |
44 | endif | ||
diff --git a/apps/codecs/libmad/Makefile b/apps/codecs/libmad/Makefile index 14c25c6b29..e2f2643b27 100644 --- a/apps/codecs/libmad/Makefile +++ b/apps/codecs/libmad/Makefile | |||
@@ -16,8 +16,8 @@ endif | |||
16 | 16 | ||
17 | # NOTE: FPM_ define has been moved to global.h | 17 | # NOTE: FPM_ define has been moved to global.h |
18 | MADOPTS = -DNDEBUG -O2 | 18 | MADOPTS = -DNDEBUG -O2 |
19 | CFLAGS = $(GCCOPTS) $(MADOPTS)\ | 19 | CFLAGS = $(GCCOPTS) $(MADOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ |
20 | $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} | 20 | -DMEM=${MEMORYSIZE} |
21 | 21 | ||
22 | # This sets up 'SRC' based on the files mentioned in SOURCES | 22 | # This sets up 'SRC' based on the files mentioned in SOURCES |
23 | include $(TOOLSDIR)/makesrc.inc | 23 | include $(TOOLSDIR)/makesrc.inc |
@@ -32,11 +32,7 @@ all: $(OUTPUT) | |||
32 | 32 | ||
33 | $(OUTPUT): $(OBJS) | 33 | $(OUTPUT): $(OBJS) |
34 | @echo "AR $@" | 34 | @echo "AR $@" |
35 | $(AR) ruv $@ $+ >/dev/null 2>&1 | 35 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
36 | |||
37 | $(OBJDIR)/%.o: $(APPSDIR)/codecs/libmad/%.c | ||
38 | @echo "(libmad) CC "`basename $<` | ||
39 | @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/libmad/ $< -o $@ | ||
40 | 36 | ||
41 | include $(TOOLSDIR)/make.inc | 37 | include $(TOOLSDIR)/make.inc |
42 | 38 | ||
@@ -44,4 +40,6 @@ clean: | |||
44 | @echo "cleaning libmad" | 40 | @echo "cleaning libmad" |
45 | @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) | 41 | @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) |
46 | 42 | ||
43 | ifneq ($(MAKECMDGOALS),clean) | ||
47 | -include $(DEPFILE) | 44 | -include $(DEPFILE) |
45 | endif | ||
diff --git a/apps/codecs/libmusepack/Makefile b/apps/codecs/libmusepack/Makefile index 6912f74e75..8e65915feb 100644 --- a/apps/codecs/libmusepack/Makefile +++ b/apps/codecs/libmusepack/Makefile | |||
@@ -15,8 +15,8 @@ ifdef APPEXTRA | |||
15 | endif | 15 | endif |
16 | 16 | ||
17 | MUSEPACKOPTS = -O2 | 17 | MUSEPACKOPTS = -O2 |
18 | CFLAGS = $(GCCOPTS) $(MUSEPACKOPTS)\ | 18 | CFLAGS = $(GCCOPTS) $(MUSEPACKOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ |
19 | $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} | 19 | -DMEM=${MEMORYSIZE} |
20 | 20 | ||
21 | # This sets up 'SRC' based on the files mentioned in SOURCES | 21 | # This sets up 'SRC' based on the files mentioned in SOURCES |
22 | include $(TOOLSDIR)/makesrc.inc | 22 | include $(TOOLSDIR)/makesrc.inc |
@@ -27,22 +27,18 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) | |||
27 | DEPFILE = $(OBJDIR)/dep-libmusepack | 27 | DEPFILE = $(OBJDIR)/dep-libmusepack |
28 | DIRS = | 28 | DIRS = |
29 | 29 | ||
30 | OUTPUT = $(OBJDIR)/libmusepack.a | ||
31 | |||
32 | all: $(OUTPUT) | 30 | all: $(OUTPUT) |
33 | 31 | ||
34 | $(OUTPUT): $(OBJS) | 32 | $(OUTPUT): $(OBJS) |
35 | @echo "AR $@" | 33 | @echo "AR $@" |
36 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
37 | 35 | ||
38 | $(OBJDIR)/libmusepack/%.o: $(APPSDIR)/codecs/libmusepack/%.c | ||
39 | @echo "CC $<" | ||
40 | @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/libmusepack/ $< -o $@ | ||
41 | |||
42 | include $(TOOLSDIR)/make.inc | 36 | include $(TOOLSDIR)/make.inc |
43 | 37 | ||
44 | clean: | 38 | clean: |
45 | @echo "cleaning libmusepack" | 39 | @echo "cleaning libmusepack" |
46 | @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) | 40 | @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) |
47 | 41 | ||
42 | ifneq ($(MAKECMDGOALS),clean) | ||
48 | -include $(DEPFILE) | 43 | -include $(DEPFILE) |
44 | endif | ||
diff --git a/apps/codecs/libwavpack/Makefile b/apps/codecs/libwavpack/Makefile index 6b9461bbb9..39478799bf 100644 --- a/apps/codecs/libwavpack/Makefile +++ b/apps/codecs/libwavpack/Makefile | |||
@@ -14,8 +14,9 @@ ifdef APPEXTRA | |||
14 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) | 14 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
15 | endif | 15 | endif |
16 | 16 | ||
17 | CFLAGS = $(GCCOPTS) \ | 17 | WAVPACKOPTS = -O2 |
18 | $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} -O2 \ | 18 | CFLAGS = $(GCCOPTS) $(WAVPACKOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ |
19 | -DMEM=${MEMORYSIZE} | ||
19 | 20 | ||
20 | # This sets up 'SRC' based on the files mentioned in SOURCES | 21 | # This sets up 'SRC' based on the files mentioned in SOURCES |
21 | include $(TOOLSDIR)/makesrc.inc | 22 | include $(TOOLSDIR)/makesrc.inc |
@@ -26,22 +27,18 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) | |||
26 | DEPFILE = $(OBJDIR)/dep-libwavpack | 27 | DEPFILE = $(OBJDIR)/dep-libwavpack |
27 | DIRS = | 28 | DIRS = |
28 | 29 | ||
29 | OUTPUT = $(BUILDDIR)/libwavpack.a | ||
30 | |||
31 | all: $(OUTPUT) | 30 | all: $(OUTPUT) |
32 | 31 | ||
33 | $(OUTPUT): $(OBJS) | 32 | $(OUTPUT): $(OBJS) |
34 | @echo "AR $@" | 33 | @echo "AR $@" |
35 | @$(AR) ruv $@ $+ >/dev/null 2>&1 | 34 | @$(AR) ruv $@ $+ >/dev/null 2>&1 |
36 | 35 | ||
37 | $(OBJDIR)/libwavpack/%.o: $(APPSDIR)/codecs/libwavpack/%.c | ||
38 | @echo "(libwavpack) CC $<" | ||
39 | @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/libwavpack/ $< -o $@ | ||
40 | |||
41 | include $(TOOLSDIR)/make.inc | 36 | include $(TOOLSDIR)/make.inc |
42 | 37 | ||
43 | clean: | 38 | clean: |
44 | @echo "cleaning libwavpack" | 39 | @echo "cleaning libwavpack" |
45 | @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) | 40 | @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) |
46 | 41 | ||
42 | ifneq ($(MAKECMDGOALS),clean) | ||
47 | -include $(DEPFILE) | 43 | -include $(DEPFILE) |
44 | endif | ||