summaryrefslogtreecommitdiff
path: root/lib/skin_parser
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/skin_parser
parent9445d4625a3d47b28d756a5763165eb73d6b4ada (diff)
downloadrockbox-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/skin_parser')
-rw-r--r--lib/skin_parser/skin_parser.make16
1 files changed, 8 insertions, 8 deletions
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 @@
5# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ 5# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
6# \/ \/ \/ \/ \/ 6# \/ \/ \/ \/ \/
7# 7#
8SKINP_DIR = $(ROOTDIR)/lib/skin_parser 8SKINPARSLIB_DIR = $(ROOTDIR)/lib/skin_parser
9SKINP_SRC = $(call preprocess, $(SKINP_DIR)/SOURCES) 9SKINPARSLIB_SRC = $(call preprocess, $(SKINPARSLIB_DIR)/SOURCES)
10SKINP_OBJ := $(call c2obj, $(SKINP_SRC)) 10SKINPARSLIB_OBJ := $(call c2obj, $(SKINPARSLIB_SRC))
11 11
12OTHER_SRC += $(SKINP_SRC) 12SKINPARSLIB = $(BUILDDIR)/lib/libskin_parser.a
13 13
14SKINLIB = $(BUILDDIR)/lib/libskin_parser.a 14INCLUDES += -I$(SKINPARSLIB_DIR)
15OTHER_SRC += $(SKINPARSLIB_SRC)
16CORE_LIBS += $(SKINPARSLIB)
15 17
16INCLUDES += -I$(SKINP_DIR) 18$(SKINPARSLIB): $(SKINPARSLIB_OBJ)
17
18$(SKINLIB): $(SKINP_OBJ)
19 $(SILENT)$(shell rm -f $@) 19 $(SILENT)$(shell rm -f $@)
20 $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null 20 $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null