diff options
author | Björn Stenberg <bjorn@haxx.se> | 2013-01-24 16:01:28 +0100 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2013-01-24 16:06:45 +0100 |
commit | 1501df045f75b1ee607b49ce2f970c762a2538a4 (patch) | |
tree | 2cc1515e773eac5efd9a771a3bdcc93ec2d3c1c9 | |
parent | 02a90890343a75ca71169f601605613607e450ea (diff) | |
download | rockbox-1501df045f75b1ee607b49ce2f970c762a2538a4.tar.gz rockbox-1501df045f75b1ee607b49ce2f970c762a2538a4.zip |
Deprecate the EXTRA_LIBS variable.
Instead specify explicit library dependencies for codecs and plugins.
-rw-r--r-- | apps/plugins/mikmod/mikmod.make | 2 | ||||
-rw-r--r-- | apps/plugins/pdbox/pdbox.make | 2 | ||||
-rw-r--r-- | apps/plugins/plugins.make | 2 | ||||
-rw-r--r-- | lib/libsetjmp/libsetjmp.make | 1 | ||||
-rw-r--r-- | lib/rbcodec/codecs/codecs.make | 4 | ||||
-rw-r--r-- | lib/tlsf/libtlsf.make | 1 | ||||
-rw-r--r-- | tools/root.make | 6 |
7 files changed, 8 insertions, 10 deletions
diff --git a/apps/plugins/mikmod/mikmod.make b/apps/plugins/mikmod/mikmod.make index 38a95c3695..016b05433e 100644 --- a/apps/plugins/mikmod/mikmod.make +++ b/apps/plugins/mikmod/mikmod.make | |||
@@ -20,7 +20,7 @@ OTHER_SRC += $(MIKMOD_SRC) | |||
20 | 20 | ||
21 | MIKMODCFLAGS = $(PLUGINFLAGS) -I$(MIKMODSRCDIR) -O2 | 21 | MIKMODCFLAGS = $(PLUGINFLAGS) -I$(MIKMODSRCDIR) -O2 |
22 | 22 | ||
23 | $(MIKMODBUILDDIR)/mikmod.rock: $(MIKMOD_OBJ) | 23 | $(MIKMODBUILDDIR)/mikmod.rock: $(MIKMOD_OBJ) $(TLSFLIB) |
24 | 24 | ||
25 | # new rule needed to use extra compile flags | 25 | # new rule needed to use extra compile flags |
26 | $(MIKMODBUILDDIR)/%.o: $(MIKMODSRCDIR)/%.c | 26 | $(MIKMODBUILDDIR)/%.o: $(MIKMODSRCDIR)/%.c |
diff --git a/apps/plugins/pdbox/pdbox.make b/apps/plugins/pdbox/pdbox.make index e0cbaef9ab..e95cdba2b9 100644 --- a/apps/plugins/pdbox/pdbox.make +++ b/apps/plugins/pdbox/pdbox.make | |||
@@ -26,7 +26,7 @@ ifdef APP_TYPE | |||
26 | PDBOXLDFLAGS += -lm | 26 | PDBOXLDFLAGS += -lm |
27 | endif | 27 | endif |
28 | 28 | ||
29 | $(PDBOXBUILDDIR)/pdbox.rock: $(PDBOX_OBJ) | 29 | $(PDBOXBUILDDIR)/pdbox.rock: $(PDBOX_OBJ) $(TLSFLIB) |
30 | 30 | ||
31 | # Compile PDBox with extra flags (adapted from ZXBox) | 31 | # Compile PDBox with extra flags (adapted from ZXBox) |
32 | $(PDBOXBUILDDIR)/%.o: $(PDBOXSRCDIR)/%.c $(PDBOXSRCDIR)/pdbox.make | 32 | $(PDBOXBUILDDIR)/%.o: $(PDBOXSRCDIR)/%.c $(PDBOXSRCDIR)/pdbox.make |
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index 12344ae590..0fc8ba7dc1 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make | |||
@@ -53,7 +53,7 @@ else | |||
53 | PLUGINSUBDIRS := $(call preprocess, $(APPSDIR)/plugins/SUBDIRS) | 53 | PLUGINSUBDIRS := $(call preprocess, $(APPSDIR)/plugins/SUBDIRS) |
54 | endif | 54 | endif |
55 | 55 | ||
56 | PLUGIN_LIBS := $(EXTRA_LIBS) $(PLUGINLIB) $(PLUGINBITMAPLIB) | 56 | PLUGIN_LIBS := $(PLUGINLIB) $(PLUGINBITMAPLIB) $(SETJMPLIB) |
57 | 57 | ||
58 | # include <dir>.make from each subdir (yay!) | 58 | # include <dir>.make from each subdir (yay!) |
59 | $(foreach dir,$(PLUGINSUBDIRS),$(eval include $(dir)/$(notdir $(dir)).make)) | 59 | $(foreach dir,$(PLUGINSUBDIRS),$(eval include $(dir)/$(notdir $(dir)).make)) |
diff --git a/lib/libsetjmp/libsetjmp.make b/lib/libsetjmp/libsetjmp.make index f8df7513c9..cf1e4bbdfe 100644 --- a/lib/libsetjmp/libsetjmp.make +++ b/lib/libsetjmp/libsetjmp.make | |||
@@ -14,7 +14,6 @@ SETJMPLIB = $(BUILDDIR)/lib/libsetjmp.a | |||
14 | 14 | ||
15 | INCLUDES += -I$(SETJMPLIB_DIR) | 15 | INCLUDES += -I$(SETJMPLIB_DIR) |
16 | OTHER_SRC += $(SETJMPLIB_SRC) | 16 | OTHER_SRC += $(SETJMPLIB_SRC) |
17 | EXTRA_LIBS += $(SETJMPLIB) | ||
18 | 17 | ||
19 | $(SETJMPLIB): $(SETJMPLIB_OBJ) | 18 | $(SETJMPLIB): $(SETJMPLIB_OBJ) |
20 | $(SILENT)$(shell rm -f $@) | 19 | $(SILENT)$(shell rm -f $@) |
diff --git a/lib/rbcodec/codecs/codecs.make b/lib/rbcodec/codecs/codecs.make index 844a8f4cee..eea8950d0d 100644 --- a/lib/rbcodec/codecs/codecs.make +++ b/lib/rbcodec/codecs/codecs.make | |||
@@ -19,7 +19,7 @@ include $(RBCODECLIB_DIR)/codecs/lib/libcodec.make | |||
19 | OTHER_INC += -I$(RBCODECLIB_DIR)/codecs/lib | 19 | OTHER_INC += -I$(RBCODECLIB_DIR)/codecs/lib |
20 | 20 | ||
21 | # extra libraries | 21 | # extra libraries |
22 | CODEC_LIBS := $(EXTRA_LIBS) $(CODECLIB) | 22 | CODEC_LIBS := $(CODECLIB) |
23 | 23 | ||
24 | # the codec libraries | 24 | # the codec libraries |
25 | include $(RBCODECLIB_DIR)/codecs/demac/libdemac.make | 25 | include $(RBCODECLIB_DIR)/codecs/demac/libdemac.make |
@@ -140,7 +140,7 @@ $(CODECDIR)/spc.codec : $(CODECDIR)/libspc.a | |||
140 | $(CODECDIR)/mpa.codec : $(CODECDIR)/libmad.a | 140 | $(CODECDIR)/mpa.codec : $(CODECDIR)/libmad.a |
141 | $(CODECDIR)/a52.codec : $(CODECDIR)/liba52.a | 141 | $(CODECDIR)/a52.codec : $(CODECDIR)/liba52.a |
142 | $(CODECDIR)/flac.codec : $(CODECDIR)/libffmpegFLAC.a | 142 | $(CODECDIR)/flac.codec : $(CODECDIR)/libffmpegFLAC.a |
143 | $(CODECDIR)/vorbis.codec : $(CODECDIR)/libtremor.a | 143 | $(CODECDIR)/vorbis.codec : $(CODECDIR)/libtremor.a $(TLSFLIB) $(SETJMPLIB) |
144 | $(CODECDIR)/speex.codec : $(CODECDIR)/libspeex.a | 144 | $(CODECDIR)/speex.codec : $(CODECDIR)/libspeex.a |
145 | $(CODECDIR)/mpc.codec : $(CODECDIR)/libmusepack.a | 145 | $(CODECDIR)/mpc.codec : $(CODECDIR)/libmusepack.a |
146 | $(CODECDIR)/wavpack.codec : $(CODECDIR)/libwavpack.a | 146 | $(CODECDIR)/wavpack.codec : $(CODECDIR)/libwavpack.a |
diff --git a/lib/tlsf/libtlsf.make b/lib/tlsf/libtlsf.make index cb61a5c09e..e36efe5e27 100644 --- a/lib/tlsf/libtlsf.make +++ b/lib/tlsf/libtlsf.make | |||
@@ -14,7 +14,6 @@ TLSFLIB := $(BUILDDIR)/lib/libtlsf.a | |||
14 | 14 | ||
15 | OTHER_SRC += $(TLSFLIB_SRC) | 15 | OTHER_SRC += $(TLSFLIB_SRC) |
16 | INCLUDES += -I$(TLSFLIB_DIR)/src | 16 | INCLUDES += -I$(TLSFLIB_DIR)/src |
17 | EXTRA_LIBS += $(TLSFLIB) | ||
18 | 17 | ||
19 | TLSFLIBFLAGS = $(CFLAGS) -fstrict-aliasing -ffunction-sections $(SHARED_CFLAGS) | 18 | TLSFLIBFLAGS = $(CFLAGS) -fstrict-aliasing -ffunction-sections $(SHARED_CFLAGS) |
20 | 19 | ||
diff --git a/tools/root.make b/tools/root.make index 256d25c1df..c8c4eb4f89 100644 --- a/tools/root.make +++ b/tools/root.make | |||
@@ -62,8 +62,8 @@ endif | |||
62 | all: $(DEPFILE) build | 62 | all: $(DEPFILE) build |
63 | 63 | ||
64 | # Subdir makefiles. their primary purpose is to populate SRC, OTHER_SRC, | 64 | # Subdir makefiles. their primary purpose is to populate SRC, OTHER_SRC, |
65 | # ASMDEFS_SRC, CORE_LIBS and EXTRA_LIBS. But they also define special | 65 | # ASMDEFS_SRC and CORE_LIBS. But they also define special dependencies and |
66 | # dependencies and compile rules | 66 | # compile rules |
67 | include $(TOOLSDIR)/tools.make | 67 | include $(TOOLSDIR)/tools.make |
68 | 68 | ||
69 | ifeq (,$(findstring checkwps,$(APP_TYPE))) | 69 | ifeq (,$(findstring checkwps,$(APP_TYPE))) |
@@ -71,7 +71,7 @@ ifeq (,$(findstring checkwps,$(APP_TYPE))) | |||
71 | ifeq (,$(findstring warble,$(APP_TYPE))) | 71 | ifeq (,$(findstring warble,$(APP_TYPE))) |
72 | include $(FIRMDIR)/firmware.make | 72 | include $(FIRMDIR)/firmware.make |
73 | include $(ROOTDIR)/apps/bitmaps/bitmaps.make | 73 | include $(ROOTDIR)/apps/bitmaps/bitmaps.make |
74 | ifeq (,$(findstring bootloader,$(APPSDIR))) | 74 | ifeq (,$(findstring bootloader,$(APPSDIR))) |
75 | include $(ROOTDIR)/lib/skin_parser/skin_parser.make | 75 | include $(ROOTDIR)/lib/skin_parser/skin_parser.make |
76 | include $(ROOTDIR)/lib/tlsf/libtlsf.make | 76 | include $(ROOTDIR)/lib/tlsf/libtlsf.make |
77 | endif | 77 | endif |