summaryrefslogtreecommitdiffstats
path: root/lib/libsetjmp
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/libsetjmp
parent9445d4625a3d47b28d756a5763165eb73d6b4ada (diff)
downloadrockbox-f269aa0060950f7b9c42216267c639a2fb556196.tar.gz
rockbox-f269aa0060950f7b9c42216267c639a2fb556196.tar.bz2
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.make16
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 @@
# \/ \/ \/ \/ \/
#
-SETJMP_DIR = $(ROOTDIR)/lib/libsetjmp
-SETJMP_SRC = $(call preprocess, $(SETJMP_DIR)/SOURCES)
-SETJMP_OBJ := $(call c2obj, $(SETJMP_SRC))
+SETJMPLIB_DIR = $(ROOTDIR)/lib/libsetjmp
+SETJMPLIB_SRC = $(call preprocess, $(SETJMPLIB_DIR)/SOURCES)
+SETJMPLIB_OBJ := $(call c2obj, $(SETJMPLIB_SRC))
-OTHER_SRC += $(SETJMP_SRC)
+SETJMPLIB = $(BUILDDIR)/lib/libsetjmp.a
-LIBSETJMP = $(BUILDDIR)/lib/libsetjmp.a
+INCLUDES += -I$(SETJMPLIB_DIR)
+OTHER_SRC += $(SETJMPLIB_SRC)
+EXTRA_LIBS += $(SETJMPLIB)
-INCLUDES += -I$(SETJMP_DIR)
-
-$(LIBSETJMP): $(SETJMP_OBJ)
+$(SETJMPLIB): $(SETJMPLIB_OBJ)
$(SILENT)$(shell rm -f $@)
$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null