summaryrefslogtreecommitdiffstats
path: root/lib/arm_support
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2012-03-26 22:24:57 +0200
committerThomas Martitz <kugel@rockbox.org>2012-03-26 22:27:40 +0200
commitf269aa0060950f7b9c42216267c639a2fb556196 (patch)
tree218ad3a737f11cb18e48676f300bc22038cfa140 /lib/arm_support
parent9445d4625a3d47b28d756a5763165eb73d6b4ada (diff)
downloadrockbox-f269aa0060950f7b9c42216267c639a2fb556196.tar.gz
rockbox-f269aa0060950f7b9c42216267c639a2fb556196.tar.bz2
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.make16
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 @@
# \/ \/ \/ \/ \/
#
-ARMSUPPORT_DIR = $(ROOTDIR)/lib/arm_support
-ARMSUPPORT_SRC = $(ARMSUPPORT_DIR)/support-arm.S
-ARMSUPPORT_OBJ := $(call c2obj, $(ARMSUPPORT_SRC))
+ARMSUPPORTLIB_DIR := $(ROOTDIR)/lib/arm_support
+ARMSUPPORTLIB_SRC := $(ARMSUPPORTLIB_DIR)/support-arm.S
+ARMSUPPORTLIB_OBJ := $(call c2obj, $(ARMSUPPORTLIB_SRC))
+ARMSUPPORTLIB := $(BUILDDIR)/lib/libarm_support.a
-OTHER_SRC += $(ARMSUPPORT_SRC)
+OTHER_SRC += $(ARMSUPPORTLIB_SRC)
+# both core and plugins link this
+CORE_LIBS += $(ARMSUPPORTLIB)
+PLUGIN_LIBS += $(ARMSUPPORTLIB)
-LIBARMSUPPORT := $(BUILDDIR)/lib/libarm_support.a
-
-$(LIBARMSUPPORT): $(ARMSUPPORT_OBJ)
+$(ARMSUPPORTLIB): $(ARMSUPPORTLIB_OBJ)
$(SILENT)$(shell rm -f $@)
$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null