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/skin_parser/skin_parser.make | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lib/skin_parser') diff --git a/lib/skin_parser/skin_parser.make b/lib/skin_parser/skin_parser.make index 0be85f3e58..42104a2822 100644 --- a/lib/skin_parser/skin_parser.make +++ b/lib/skin_parser/skin_parser.make @@ -5,16 +5,16 @@ # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ # \/ \/ \/ \/ \/ # -SKINP_DIR = $(ROOTDIR)/lib/skin_parser -SKINP_SRC = $(call preprocess, $(SKINP_DIR)/SOURCES) -SKINP_OBJ := $(call c2obj, $(SKINP_SRC)) +SKINPARSLIB_DIR = $(ROOTDIR)/lib/skin_parser +SKINPARSLIB_SRC = $(call preprocess, $(SKINPARSLIB_DIR)/SOURCES) +SKINPARSLIB_OBJ := $(call c2obj, $(SKINPARSLIB_SRC)) -OTHER_SRC += $(SKINP_SRC) +SKINPARSLIB = $(BUILDDIR)/lib/libskin_parser.a -SKINLIB = $(BUILDDIR)/lib/libskin_parser.a +INCLUDES += -I$(SKINPARSLIB_DIR) +OTHER_SRC += $(SKINPARSLIB_SRC) +CORE_LIBS += $(SKINPARSLIB) -INCLUDES += -I$(SKINP_DIR) - -$(SKINLIB): $(SKINP_OBJ) +$(SKINPARSLIB): $(SKINPARSLIB_OBJ) $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null -- cgit v1.2.3