diff options
author | Thomas Martitz <kugel@rockbox.org> | 2012-03-26 22:24:57 +0200 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2012-03-26 22:27:40 +0200 |
commit | f269aa0060950f7b9c42216267c639a2fb556196 (patch) | |
tree | 218ad3a737f11cb18e48676f300bc22038cfa140 /lib/arm_support | |
parent | 9445d4625a3d47b28d756a5763165eb73d6b4ada (diff) | |
download | rockbox-f269aa0060950f7b9c42216267c639a2fb556196.tar.gz rockbox-f269aa0060950f7b9c42216267c639a2fb556196.zip |
build system: unify/simplify library handling a bit.
libs in $ROOT/lib now add to $(CORE_LIBS) and $(EXTRA_LIBS) and are
automatically linked by the core and codecs/plugins respectively.
Change-Id: Iff482c792a8c8142718f6a16a450c6e2f1497c9a
Diffstat (limited to 'lib/arm_support')
-rw-r--r-- | lib/arm_support/arm_support.make | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/arm_support/arm_support.make b/lib/arm_support/arm_support.make index a3775ee3b0..054d723e62 100644 --- a/lib/arm_support/arm_support.make +++ b/lib/arm_support/arm_support.make | |||
@@ -6,14 +6,16 @@ | |||
6 | # \/ \/ \/ \/ \/ | 6 | # \/ \/ \/ \/ \/ |
7 | # | 7 | # |
8 | 8 | ||
9 | ARMSUPPORT_DIR = $(ROOTDIR)/lib/arm_support | 9 | ARMSUPPORTLIB_DIR := $(ROOTDIR)/lib/arm_support |
10 | ARMSUPPORT_SRC = $(ARMSUPPORT_DIR)/support-arm.S | 10 | ARMSUPPORTLIB_SRC := $(ARMSUPPORTLIB_DIR)/support-arm.S |
11 | ARMSUPPORT_OBJ := $(call c2obj, $(ARMSUPPORT_SRC)) | 11 | ARMSUPPORTLIB_OBJ := $(call c2obj, $(ARMSUPPORTLIB_SRC)) |
12 | ARMSUPPORTLIB := $(BUILDDIR)/lib/libarm_support.a | ||
12 | 13 | ||
13 | OTHER_SRC += $(ARMSUPPORT_SRC) | 14 | OTHER_SRC += $(ARMSUPPORTLIB_SRC) |
15 | # both core and plugins link this | ||
16 | CORE_LIBS += $(ARMSUPPORTLIB) | ||
17 | PLUGIN_LIBS += $(ARMSUPPORTLIB) | ||
14 | 18 | ||
15 | LIBARMSUPPORT := $(BUILDDIR)/lib/libarm_support.a | 19 | $(ARMSUPPORTLIB): $(ARMSUPPORTLIB_OBJ) |
16 | |||
17 | $(LIBARMSUPPORT): $(ARMSUPPORT_OBJ) | ||
18 | $(SILENT)$(shell rm -f $@) | 20 | $(SILENT)$(shell rm -f $@) |
19 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 21 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |