Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Codec makefile cleanup: remove redundant things, don't generate dependency files when cleaning.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8154 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Magnus Holmgren 2005-12-05 19:32:13 +00:00
parent 5deedc6571
commit 1b0d1daf38
9 changed files with 39 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/codecs/Tremor/Makefile
View file

@ -16,7 +16,7 @@ endif
TREMOROPTS = -O2 TREMOROPTS = -O2
CFLAGS = $(GCCOPTS) $(TREMOROPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ CFLAGS = $(GCCOPTS) $(TREMOROPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
-DMEM=${MEMORYSIZE} -DMEM=${MEMORYSIZE}
# This sets up 'SRC' based on the files mentioned in SOURCES # This sets up 'SRC' based on the files mentioned in SOURCES
include $(TOOLSDIR)/makesrc.inc include $(TOOLSDIR)/makesrc.inc
@ -27,22 +27,18 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2))
DEPFILE = $(OBJDIR)/dep-Tremor DEPFILE = $(OBJDIR)/dep-Tremor
DIRS = DIRS =
OUTPUT = $(BUILDDIR)/libTremor.a
all: $(OUTPUT) all: $(OUTPUT)
$(OUTPUT): $(OBJS) $(OUTPUT): $(OBJS)
@echo "AR $@" @echo "AR $@"
@$(AR) ruv $@ $+ >/dev/null 2>&1 @$(AR) ruv $@ $+ >/dev/null 2>&1
$(OBJDIR)/%.o: $(APPSDIR)/codecs/Tremor/%.c
@echo "(Tremor) CC "`basename $<`
@$(CC) -c $(CFLAGS) -I$(APPSDIR)/codecs/Tremor/ $< -o $@
include $(TOOLSDIR)/make.inc include $(TOOLSDIR)/make.inc
clean: clean:
@echo "cleaning Tremor" @echo "cleaning Tremor"
@rm -f $(OBJS) $(OUTPUT) $(DEPFILE) @rm -f $(OBJS) $(OUTPUT) $(DEPFILE)
ifneq ($(MAKECMDGOALS),clean)
-include $(DEPFILE) -include $(DEPFILE)
endif

13
apps/codecs/liba52/Makefile
View file

@ -14,8 +14,9 @@ ifdef APPEXTRA
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
endif endif
A52OPTS = A52OPTS = -O2
CFLAGS = $(GCCOPTS) $(A52OPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} CFLAGS = $(GCCOPTS) $(A52OPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
-DMEM=${MEMORYSIZE}
# This sets up 'SRC' based on the files mentioned in SOURCES # This sets up 'SRC' based on the files mentioned in SOURCES
include $(TOOLSDIR)/makesrc.inc include $(TOOLSDIR)/makesrc.inc
@ -26,22 +27,18 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2))
DEPFILE = $(OBJDIR)/dep-liba52 DEPFILE = $(OBJDIR)/dep-liba52
DIRS = DIRS =
OUTPUT = $(BUILDDIR)/liba52.a
all: $(OUTPUT) all: $(OUTPUT)
$(OUTPUT): $(OBJS) $(OUTPUT): $(OBJS)
@echo "AR $@" @echo "AR $@"
@$(AR) ruv $@ $+ >/dev/null 2>&1 @$(AR) ruv $@ $+ >/dev/null 2>&1
$(OBJDIR)/liba52/%.o: $(APPSDIR)/codecs/liba52/%.c
@echo "(liba52) CC $<"
@$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/liba52/ $< -o $@
include $(TOOLSDIR)/make.inc include $(TOOLSDIR)/make.inc
clean: clean:
@echo "cleaning liba52" @echo "cleaning liba52"
@rm -f $(OBJS) $(OUTPUT) $(DEPFILE) @rm -f $(OBJS) $(OUTPUT) $(DEPFILE)
ifneq ($(MAKECMDGOALS),clean)
-include $(DEPFILE) -include $(DEPFILE)
endif

11
apps/codecs/libalac/Makefile
View file

@ -15,7 +15,8 @@ ifdef APPEXTRA
endif endif
ALACOPTS = -O3 ALACOPTS = -O3
CFLAGS = $(GCCOPTS) $(ALACOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} CFLAGS = $(GCCOPTS) $(ALACOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
-DMEM=${MEMORYSIZE}
# This sets up 'SRC' based on the files mentioned in SOURCES # This sets up 'SRC' based on the files mentioned in SOURCES
include $(TOOLSDIR)/makesrc.inc include $(TOOLSDIR)/makesrc.inc
@ -26,22 +27,18 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2))
DEPFILE = $(OBJDIR)/dep-libalac DEPFILE = $(OBJDIR)/dep-libalac
DIRS = DIRS =
OUTPUT = $(BUILDDIR)/libalac.a
all: $(OUTPUT) all: $(OUTPUT)
$(OUTPUT): $(OBJS) $(OUTPUT): $(OBJS)
@echo "AR $@" @echo "AR $@"
@$(AR) ruv $@ $+ >/dev/null 2>&1 @$(AR) ruv $@ $+ >/dev/null 2>&1
$(OBJDIR)/libalac/%.o: $(APPSDIR)/codecs/libalac/%.c
@echo "(libalac) CC $<"
@$(CC) -c $(CFLAGS) -I$(APPSDIR)/codecs/libalac/ $< -o $@
include $(TOOLSDIR)/make.inc include $(TOOLSDIR)/make.inc
clean: clean:
@echo "cleaning libalac" @echo "cleaning libalac"
@rm -f $(OBJS) $(OUTPUT) $(DEPFILE) @rm -f $(OBJS) $(OUTPUT) $(DEPFILE)
ifneq ($(MAKECMDGOALS),clean)
-include $(DEPFILE) -include $(DEPFILE)
endif

13
apps/codecs/libfaad/Makefile
View file

@ -11,11 +11,12 @@ INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
-I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
ifdef APPEXTRA ifdef APPEXTRA
INCLUDES += -I$(APPSDIR)/$(APPEXTRA) INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
endif endif
FAADOPTS = -O2 -Wno-char-subscripts FAADOPTS = -O2 -Wno-char-subscripts
CFLAGS = $(GCCOPTS) $(FAADOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} CFLAGS = $(GCCOPTS) $(FAADOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
-DMEM=${MEMORYSIZE}
# This sets up 'SRC' based on the files mentioned in SOURCES # This sets up 'SRC' based on the files mentioned in SOURCES
include $(TOOLSDIR)/makesrc.inc include $(TOOLSDIR)/makesrc.inc
@ -26,22 +27,18 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2))
DEPFILE = $(OBJDIR)/dep-libfaad DEPFILE = $(OBJDIR)/dep-libfaad
DIRS = DIRS =
OUTPUT = $(BUILDDIR)/libfaad.a
all: $(OUTPUT) all: $(OUTPUT)
$(OUTPUT): $(OBJS) $(OUTPUT): $(OBJS)
@echo "AR $@" @echo "AR $@"
@$(AR) ruv $@ $+ >/dev/null 2>&1 @$(AR) ruv $@ $+ >/dev/null 2>&1
$(OBJDIR)/libfaad/%.o: $(APPSDIR)/codecs/libfaad/%.c
@echo "(libfaad) CC $<"
@$(CC) -c $(CFLAGS) -I$(APPSDIR)/codecs/libfaad/ $< -o $@
include $(TOOLSDIR)/make.inc include $(TOOLSDIR)/make.inc
clean: clean:
@echo "cleaning libfaad" @echo "cleaning libfaad"
@rm -f $(OBJS) $(OUTPUT) $(DEPFILE) @rm -f $(OBJS) $(OUTPUT) $(DEPFILE)
ifneq ($(MAKECMDGOALS),clean)
-include $(DEPFILE) -include $(DEPFILE)
endif

11
apps/codecs/libffmpegFLAC/Makefile
View file

@ -15,7 +15,8 @@ ifdef APPEXTRA
endif endif
FLACOPTS = -O2 FLACOPTS = -O2
CFLAGS = $(GCCOPTS) $(FLACOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} CFLAGS = $(GCCOPTS) $(FLACOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
-DMEM=${MEMORYSIZE}
# This sets up 'SRC' based on the files mentioned in SOURCES # This sets up 'SRC' based on the files mentioned in SOURCES
include $(TOOLSDIR)/makesrc.inc include $(TOOLSDIR)/makesrc.inc
@ -26,22 +27,18 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2))
DEPFILE = $(OBJDIR)/dep-libffmpegFLAC DEPFILE = $(OBJDIR)/dep-libffmpegFLAC
DIRS = DIRS =
OUTPUT = $(BUILDDIR)/libffmpegFLAC.a
all: $(OUTPUT) all: $(OUTPUT)
$(OUTPUT): $(OBJS) $(OUTPUT): $(OBJS)
@echo "AR $@" @echo "AR $@"
@$(AR) ruv $@ $+ >/dev/null 2>&1 @$(AR) ruv $@ $+ >/dev/null 2>&1
$(OBJDIR)/libffmpegFLAC/%.o: $(APPSDIR)/codecs/libffmpegFLAC/%.c
@echo "(libffmpegFLAC) CC $<"
@$(CC) -c $(CFLAGS) -I$(APPSDIR)/codecs/libffmpegFLAC/ $< -o $@
include $(TOOLSDIR)/make.inc include $(TOOLSDIR)/make.inc
clean: clean:
@echo "cleaning libffmpegFLAC" @echo "cleaning libffmpegFLAC"
@rm -f $(OBJS) $(OUTPUT) $(DEPFILE) @rm -f $(OBJS) $(OUTPUT) $(DEPFILE)
ifneq ($(MAKECMDGOALS),clean)
-include $(DEPFILE) -include $(DEPFILE)
endif

11
apps/codecs/libm4a/Makefile
View file

@ -15,7 +15,8 @@ ifdef APPEXTRA
endif endif
M4AOPTS = -O3 M4AOPTS = -O3
CFLAGS = $(GCCOPTS) $(M4AOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} CFLAGS = $(GCCOPTS) $(M4AOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
-DMEM=${MEMORYSIZE}
# This sets up 'SRC' based on the files mentioned in SOURCES # This sets up 'SRC' based on the files mentioned in SOURCES
include $(TOOLSDIR)/makesrc.inc include $(TOOLSDIR)/makesrc.inc
@ -26,22 +27,18 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2))
DEPFILE = $(OBJDIR)/dep-libm4a DEPFILE = $(OBJDIR)/dep-libm4a
DIRS = DIRS =
OUTPUT = $(BUILDDIR)/libm4a.a
all: $(OUTPUT) all: $(OUTPUT)
$(OUTPUT): $(OBJS) $(OUTPUT): $(OBJS)
@echo "AR $@" @echo "AR $@"
@$(AR) ruv $@ $+ >/dev/null 2>&1 @$(AR) ruv $@ $+ >/dev/null 2>&1
$(OBJDIR)/libm4a/%.o: $(APPSDIR)/codecs/libm4a/%.c
@echo "(libm4a) CC $<"
@$(CC) -c $(CFLAGS) -I$(APPSDIR)/codecs/libm4a/ $< -o $@
include $(TOOLSDIR)/make.inc include $(TOOLSDIR)/make.inc
clean: clean:
@echo "cleaning libm4a" @echo "cleaning libm4a"
@rm -f $(OBJS) $(OUTPUT) $(DEPFILE) @rm -f $(OBJS) $(OUTPUT) $(DEPFILE)
ifneq ($(MAKECMDGOALS),clean)
-include $(DEPFILE) -include $(DEPFILE)
endif

12
apps/codecs/libmad/Makefile
View file

@ -16,8 +16,8 @@ endif
# NOTE: FPM_ define has been moved to global.h # NOTE: FPM_ define has been moved to global.h
MADOPTS = -DNDEBUG -O2 MADOPTS = -DNDEBUG -O2
CFLAGS = $(GCCOPTS) $(MADOPTS)\ CFLAGS = $(GCCOPTS) $(MADOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
$(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} -DMEM=${MEMORYSIZE}
# This sets up 'SRC' based on the files mentioned in SOURCES # This sets up 'SRC' based on the files mentioned in SOURCES
include $(TOOLSDIR)/makesrc.inc include $(TOOLSDIR)/makesrc.inc
@ -32,11 +32,7 @@ all: $(OUTPUT)
$(OUTPUT): $(OBJS) $(OUTPUT): $(OBJS)
@echo "AR $@" @echo "AR $@"
$(AR) ruv $@ $+ >/dev/null 2>&1 @$(AR) ruv $@ $+ >/dev/null 2>&1
$(OBJDIR)/%.o: $(APPSDIR)/codecs/libmad/%.c
@echo "(libmad) CC "`basename $<`
@$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/libmad/ $< -o $@
include $(TOOLSDIR)/make.inc include $(TOOLSDIR)/make.inc
@ -44,4 +40,6 @@ clean:
@echo "cleaning libmad" @echo "cleaning libmad"
@rm -f $(OBJS) $(OUTPUT) $(DEPFILE) @rm -f $(OBJS) $(OUTPUT) $(DEPFILE)
ifneq ($(MAKECMDGOALS),clean)
-include $(DEPFILE) -include $(DEPFILE)
endif

12
apps/codecs/libmusepack/Makefile
View file

@ -15,8 +15,8 @@ ifdef APPEXTRA
endif endif
MUSEPACKOPTS = -O2 MUSEPACKOPTS = -O2
CFLAGS = $(GCCOPTS) $(MUSEPACKOPTS)\ CFLAGS = $(GCCOPTS) $(MUSEPACKOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
$(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} -DMEM=${MEMORYSIZE}
# This sets up 'SRC' based on the files mentioned in SOURCES # This sets up 'SRC' based on the files mentioned in SOURCES
include $(TOOLSDIR)/makesrc.inc include $(TOOLSDIR)/makesrc.inc
@ -27,22 +27,18 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2))
DEPFILE = $(OBJDIR)/dep-libmusepack DEPFILE = $(OBJDIR)/dep-libmusepack
DIRS = DIRS =
OUTPUT = $(OBJDIR)/libmusepack.a
all: $(OUTPUT) all: $(OUTPUT)
$(OUTPUT): $(OBJS) $(OUTPUT): $(OBJS)
@echo "AR $@" @echo "AR $@"
@$(AR) ruv $@ $+ >/dev/null 2>&1 @$(AR) ruv $@ $+ >/dev/null 2>&1
$(OBJDIR)/libmusepack/%.o: $(APPSDIR)/codecs/libmusepack/%.c
@echo "CC $<"
@$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/libmusepack/ $< -o $@
include $(TOOLSDIR)/make.inc include $(TOOLSDIR)/make.inc
clean: clean:
@echo "cleaning libmusepack" @echo "cleaning libmusepack"
@rm -f $(OBJS) $(OUTPUT) $(DEPFILE) @rm -f $(OBJS) $(OUTPUT) $(DEPFILE)
ifneq ($(MAKECMDGOALS),clean)
-include $(DEPFILE) -include $(DEPFILE)
endif

13
apps/codecs/libwavpack/Makefile
View file

@ -14,8 +14,9 @@ ifdef APPEXTRA
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
endif endif
CFLAGS = $(GCCOPTS) \ WAVPACKOPTS = -O2
$(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} -O2 \ CFLAGS = $(GCCOPTS) $(WAVPACKOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
-DMEM=${MEMORYSIZE}
# This sets up 'SRC' based on the files mentioned in SOURCES # This sets up 'SRC' based on the files mentioned in SOURCES
include $(TOOLSDIR)/makesrc.inc include $(TOOLSDIR)/makesrc.inc
@ -26,22 +27,18 @@ OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2))
DEPFILE = $(OBJDIR)/dep-libwavpack DEPFILE = $(OBJDIR)/dep-libwavpack
DIRS = DIRS =
OUTPUT = $(BUILDDIR)/libwavpack.a
all: $(OUTPUT) all: $(OUTPUT)
$(OUTPUT): $(OBJS) $(OUTPUT): $(OBJS)
@echo "AR $@" @echo "AR $@"
@$(AR) ruv $@ $+ >/dev/null 2>&1 @$(AR) ruv $@ $+ >/dev/null 2>&1
$(OBJDIR)/libwavpack/%.o: $(APPSDIR)/codecs/libwavpack/%.c
@echo "(libwavpack) CC $<"
@$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/libwavpack/ $< -o $@
include $(TOOLSDIR)/make.inc include $(TOOLSDIR)/make.inc
clean: clean:
@echo "cleaning libwavpack" @echo "cleaning libwavpack"
@rm -f $(OBJS) $(OUTPUT) $(DEPFILE) @rm -f $(OBJS) $(OUTPUT) $(DEPFILE)
ifneq ($(MAKECMDGOALS),clean)
-include $(DEPFILE) -include $(DEPFILE)
endif