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/skin_parser | |
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/skin_parser')
-rw-r--r-- | lib/skin_parser/skin_parser.make | 16 |
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 | # |
8 | SKINP_DIR = $(ROOTDIR)/lib/skin_parser | 8 | SKINPARSLIB_DIR = $(ROOTDIR)/lib/skin_parser |
9 | SKINP_SRC = $(call preprocess, $(SKINP_DIR)/SOURCES) | 9 | SKINPARSLIB_SRC = $(call preprocess, $(SKINPARSLIB_DIR)/SOURCES) |
10 | SKINP_OBJ := $(call c2obj, $(SKINP_SRC)) | 10 | SKINPARSLIB_OBJ := $(call c2obj, $(SKINPARSLIB_SRC)) |
11 | 11 | ||
12 | OTHER_SRC += $(SKINP_SRC) | 12 | SKINPARSLIB = $(BUILDDIR)/lib/libskin_parser.a |
13 | 13 | ||
14 | SKINLIB = $(BUILDDIR)/lib/libskin_parser.a | 14 | INCLUDES += -I$(SKINPARSLIB_DIR) |
15 | OTHER_SRC += $(SKINPARSLIB_SRC) | ||
16 | CORE_LIBS += $(SKINPARSLIB) | ||
15 | 17 | ||
16 | INCLUDES += -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 |