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/libsetjmp | |
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/libsetjmp')
-rw-r--r-- | lib/libsetjmp/libsetjmp.make | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/libsetjmp/libsetjmp.make b/lib/libsetjmp/libsetjmp.make index b7d4cad25f..f8df7513c9 100644 --- a/lib/libsetjmp/libsetjmp.make +++ b/lib/libsetjmp/libsetjmp.make | |||
@@ -6,16 +6,16 @@ | |||
6 | # \/ \/ \/ \/ \/ | 6 | # \/ \/ \/ \/ \/ |
7 | # | 7 | # |
8 | 8 | ||
9 | SETJMP_DIR = $(ROOTDIR)/lib/libsetjmp | 9 | SETJMPLIB_DIR = $(ROOTDIR)/lib/libsetjmp |
10 | SETJMP_SRC = $(call preprocess, $(SETJMP_DIR)/SOURCES) | 10 | SETJMPLIB_SRC = $(call preprocess, $(SETJMPLIB_DIR)/SOURCES) |
11 | SETJMP_OBJ := $(call c2obj, $(SETJMP_SRC)) | 11 | SETJMPLIB_OBJ := $(call c2obj, $(SETJMPLIB_SRC)) |
12 | 12 | ||
13 | OTHER_SRC += $(SETJMP_SRC) | 13 | SETJMPLIB = $(BUILDDIR)/lib/libsetjmp.a |
14 | 14 | ||
15 | LIBSETJMP = $(BUILDDIR)/lib/libsetjmp.a | 15 | INCLUDES += -I$(SETJMPLIB_DIR) |
16 | OTHER_SRC += $(SETJMPLIB_SRC) | ||
17 | EXTRA_LIBS += $(SETJMPLIB) | ||
16 | 18 | ||
17 | INCLUDES += -I$(SETJMP_DIR) | 19 | $(SETJMPLIB): $(SETJMPLIB_OBJ) |
18 | |||
19 | $(LIBSETJMP): $(SETJMP_OBJ) | ||
20 | $(SILENT)$(shell rm -f $@) | 20 | $(SILENT)$(shell rm -f $@) |
21 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 21 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |