diff options
author | Björn Stenberg <bjorn@haxx.se> | 2008-11-20 11:27:31 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2008-11-20 11:27:31 +0000 |
commit | c6b3d38a156dd624760a8eb1bb374affd43b4f2a (patch) | |
tree | 493eba929e2396d86cf4f077709aa09fe172cd35 /apps/codecs/libmad | |
parent | f66c30346783a400a029bedcd60ab67c81c34a07 (diff) | |
download | rockbox-c6b3d38a156dd624760a8eb1bb374affd43b4f2a.tar.gz rockbox-c6b3d38a156dd624760a8eb1bb374affd43b4f2a.zip |
New makefile solution: A single invocation of 'make' to build the entire tree. Fully controlled dependencies give faster and more correct recompiles.
Many #include lines adjusted to conform to the new standards.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19146 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libmad')
-rw-r--r-- | apps/codecs/libmad/Makefile | 50 | ||||
-rw-r--r-- | apps/codecs/libmad/frame.c | 2 | ||||
-rw-r--r-- | apps/codecs/libmad/global.h | 2 | ||||
-rw-r--r-- | apps/codecs/libmad/libmad.make | 54 |
4 files changed, 56 insertions, 52 deletions
diff --git a/apps/codecs/libmad/Makefile b/apps/codecs/libmad/Makefile deleted file mode 100644 index 4d838db74f..0000000000 --- a/apps/codecs/libmad/Makefile +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | # __________ __ ___. | ||
2 | # Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
3 | # Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
4 | # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
5 | # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
6 | # \/ \/ \/ \/ \/ | ||
7 | # $Id$ | ||
8 | # | ||
9 | |||
10 | INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | ||
11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) | ||
12 | |||
13 | ifdef APPEXTRA | ||
14 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) | ||
15 | endif | ||
16 | |||
17 | # NOTE: FPM_ define has been moved to global.h | ||
18 | MADOPTS = -UDEBUG -DNDEBUG -O2 | ||
19 | |||
20 | # We build libmad separately for mpegplayer | ||
21 | ifdef MPEGPLAYER | ||
22 | EXTRA_DEFINES += -DMPEGPLAYER | ||
23 | endif | ||
24 | |||
25 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET_INC) $(MADOPTS) $(TARGET) \ | ||
26 | $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) | ||
27 | |||
28 | # This sets up 'SRC' based on the files mentioned in SOURCES | ||
29 | include $(TOOLSDIR)/makesrc.inc | ||
30 | |||
31 | SOURCES = $(SRC) | ||
32 | OBJS2 := $(SRC:%.c=$(OBJDIR)/%.o) | ||
33 | OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) | ||
34 | DEPFILE = $(OBJDIR)/dep-libmad | ||
35 | DIRS = | ||
36 | |||
37 | all: $(OUTPUT) | ||
38 | |||
39 | $(OUTPUT): $(OBJS) | ||
40 | $(call PRINTS,AR+RANLIB $(@F))$(AR) ruv $@ $+ >/dev/null 2>&1 | ||
41 | $(SILENT)$(RANLIB) $@ | ||
42 | |||
43 | include $(TOOLSDIR)/make.inc | ||
44 | |||
45 | clean: | ||
46 | $(call PRINTS,cleaning libmad)rm -f $(OBJS) $(OUTPUT) $(DEPFILE) | ||
47 | |||
48 | ifneq ($(MAKECMDGOALS),clean) | ||
49 | -include $(DEPFILE) | ||
50 | endif | ||
diff --git a/apps/codecs/libmad/frame.c b/apps/codecs/libmad/frame.c index 2c7fdca199..3fb971d3e1 100644 --- a/apps/codecs/libmad/frame.c +++ b/apps/codecs/libmad/frame.c | |||
@@ -31,7 +31,7 @@ | |||
31 | # include "timer.h" | 31 | # include "timer.h" |
32 | # include "layer12.h" | 32 | # include "layer12.h" |
33 | # include "layer3.h" | 33 | # include "layer3.h" |
34 | # include "../lib/codeclib.h" | 34 | # include "codeclib.h" |
35 | 35 | ||
36 | static | 36 | static |
37 | unsigned long const bitrate_table[5][15] = { | 37 | unsigned long const bitrate_table[5][15] = { |
diff --git a/apps/codecs/libmad/global.h b/apps/codecs/libmad/global.h index 1dad4d5583..93dfd0a13f 100644 --- a/apps/codecs/libmad/global.h +++ b/apps/codecs/libmad/global.h | |||
@@ -19,7 +19,7 @@ | |||
19 | * $Id$ | 19 | * $Id$ |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include "../codec.h" | 22 | #include "codeclib.h" |
23 | 23 | ||
24 | # ifndef LIBMAD_GLOBAL_H | 24 | # ifndef LIBMAD_GLOBAL_H |
25 | # define LIBMAD_GLOBAL_H | 25 | # define LIBMAD_GLOBAL_H |
diff --git a/apps/codecs/libmad/libmad.make b/apps/codecs/libmad/libmad.make new file mode 100644 index 0000000000..f0334956c1 --- /dev/null +++ b/apps/codecs/libmad/libmad.make | |||
@@ -0,0 +1,54 @@ | |||
1 | # __________ __ ___. | ||
2 | # Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
3 | # Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
4 | # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
5 | # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
6 | # \/ \/ \/ \/ \/ | ||
7 | # $Id: Makefile 19082 2008-11-10 23:54:24Z zagor $ | ||
8 | # | ||
9 | |||
10 | # we need to build two different mad libraries | ||
11 | # (one for codec, one for mpegplayer) | ||
12 | # so a little trickery is necessary | ||
13 | |||
14 | MADFLAGS = $(CODECFLAGS) -UDEBUG -DNDEBUG -I$(APPSDIR)/codecs/libmad | ||
15 | MPEGMADFLAGS = $(MADFLAGS) -DMPEGPLAYER | ||
16 | |||
17 | # libmad | ||
18 | MADLIB := $(CODECDIR)/libmad.a | ||
19 | MADLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libmad/SOURCES) | ||
20 | MADLIB_OBJ := $(call c2obj, $(MADLIB_SRC)) | ||
21 | OTHER_SRC += $(MADLIB_SRC) | ||
22 | |||
23 | $(MADLIB): $(MADLIB_OBJ) | ||
24 | $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 | ||
25 | |||
26 | # libmad-mpeg | ||
27 | MPEGMADLIB := $(CODECDIR)/libmad-mpeg.a | ||
28 | MPEGMADLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libmad/SOURCES) | ||
29 | MPEGMADLIB_OBJ := $(subst .c,.o,$(subst .S,.o,$(subst $(ROOTDIR)/apps/codecs/libmad,$(BUILDDIR)/apps/codecs/libmad-mpeg,$(MPEGMADLIB_SRC)))) | ||
30 | |||
31 | $(MPEGMADLIB): $(MPEGMADLIB_OBJ) | ||
32 | $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 | ||
33 | |||
34 | # pattern rules | ||
35 | |||
36 | $(CODECDIR)/libmad-mpeg/%.o : $(ROOTDIR)/apps/codecs/libmad/%.c | ||
37 | $(SILENT)mkdir -p $(dir $@) | ||
38 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ | ||
39 | $(CC) $(MPEGMADFLAGS) -c $< -o $@ | ||
40 | |||
41 | $(CODECDIR)/libmad-mpeg/%.o : $(ROOTDIR)/apps/codecs/libmad/%.S | ||
42 | $(SILENT)mkdir -p $(dir $@) | ||
43 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ | ||
44 | $(CC) $(MPEGMADFLAGS) -c $< -o $@ | ||
45 | |||
46 | $(CODECDIR)/libmad/%.o: $(ROOTDIR)/apps/codecs/libmad/%.c | ||
47 | $(SILENT)mkdir -p $(dir $@) | ||
48 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ | ||
49 | $(CC) $(MADFLAGS) -c $< -o $@ | ||
50 | |||
51 | $(CODECDIR)/libmad/%.o: $(ROOTDIR)/apps/codecs/libmad/%.S | ||
52 | $(SILENT)mkdir -p $(dir $@) | ||
53 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ | ||
54 | $(CC) $(MADFLAGS) -c $< -o $@ | ||