From f269aa0060950f7b9c42216267c639a2fb556196 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Mon, 26 Mar 2012 22:24:57 +0200 Subject: 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 --- lib/arm_support/arm_support.make | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'lib/arm_support') 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 -- cgit v1.2.3