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/unwarminder/unwarminder.make | |
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/unwarminder/unwarminder.make')
-rw-r--r-- | lib/unwarminder/unwarminder.make | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/unwarminder/unwarminder.make b/lib/unwarminder/unwarminder.make index f570d49640..5093156f54 100644 --- a/lib/unwarminder/unwarminder.make +++ b/lib/unwarminder/unwarminder.make | |||
@@ -6,16 +6,17 @@ | |||
6 | # \/ \/ \/ \/ \/ | 6 | # \/ \/ \/ \/ \/ |
7 | # | 7 | # |
8 | 8 | ||
9 | UNWARM_DIR = $(ROOTDIR)/lib/unwarminder | 9 | UNWARMLIB_DIR = $(ROOTDIR)/lib/unwarminder |
10 | UNWARM_SRC = $(call preprocess, $(UNWARM_DIR)/SOURCES) | 10 | UNWARMLIB_SRC = $(call preprocess, $(UNWARMLIB_DIR)/SOURCES) |
11 | UNWARM_OBJ := $(call c2obj, $(UNWARM_SRC)) | 11 | UNWARMLIB_OBJ := $(call c2obj, $(UNWARMLIB_SRC)) |
12 | 12 | ||
13 | OTHER_SRC += $(UNWARM_SRC) | 13 | OTHER_SRC += $(UNWARMLIB_SRC) |
14 | 14 | ||
15 | UNWARMINDER = $(BUILDDIR)/lib/libunwarminder.a | 15 | UNWARMLIB = $(BUILDDIR)/lib/libunwarminder.a |
16 | CORE_LIBS += $(UNWARMLIB) | ||
16 | 17 | ||
17 | INCLUDES += -I$(UNWARM_DIR) | 18 | INCLUDES += -I$(UNWARMLIB_DIR) |
18 | 19 | ||
19 | $(UNWARMINDER): $(UNWARM_OBJ) | 20 | $(UNWARMLIB): $(UNWARMLIB_OBJ) |
20 | $(SILENT)$(shell rm -f $@) | 21 | $(SILENT)$(shell rm -f $@) |
21 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 22 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |