diff options
author | Magnus Holmgren <magnushol@gmail.com> | 2005-12-05 19:32:13 +0000 |
---|---|---|
committer | Magnus Holmgren <magnushol@gmail.com> | 2005-12-05 19:32:13 +0000 |
commit | 1b0d1daf38f00410f062556aa2635a1886ec0b61 (patch) | |
tree | fb150aa75503585a00fc30d00a319badf99fabe8 /apps/codecs/libfaad | |
parent | 5deedc657177182407e418812a5f4057ad4b848a (diff) | |
download | rockbox-1b0d1daf38f00410f062556aa2635a1886ec0b61.tar.gz rockbox-1b0d1daf38f00410f062556aa2635a1886ec0b61.zip |
Codec makefile cleanup: remove redundant things, don't generate dependency files when cleaning.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8154 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libfaad')
-rw-r--r-- | apps/codecs/libfaad/Makefile | 13 |
1 files changed, 5 insertions, 8 deletions
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 | ||