From f269aa0060950f7b9c42216267c639a2fb556196 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Mon, 26 Mar 2012 22:24:57 +0200 Subject: 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 --- lib/unwarminder/unwarminder.make | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'lib/unwarminder/unwarminder.make') 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 @@ # \/ \/ \/ \/ \/ # -UNWARM_DIR = $(ROOTDIR)/lib/unwarminder -UNWARM_SRC = $(call preprocess, $(UNWARM_DIR)/SOURCES) -UNWARM_OBJ := $(call c2obj, $(UNWARM_SRC)) +UNWARMLIB_DIR = $(ROOTDIR)/lib/unwarminder +UNWARMLIB_SRC = $(call preprocess, $(UNWARMLIB_DIR)/SOURCES) +UNWARMLIB_OBJ := $(call c2obj, $(UNWARMLIB_SRC)) -OTHER_SRC += $(UNWARM_SRC) +OTHER_SRC += $(UNWARMLIB_SRC) -UNWARMINDER = $(BUILDDIR)/lib/libunwarminder.a +UNWARMLIB = $(BUILDDIR)/lib/libunwarminder.a +CORE_LIBS += $(UNWARMLIB) -INCLUDES += -I$(UNWARM_DIR) +INCLUDES += -I$(UNWARMLIB_DIR) -$(UNWARMINDER): $(UNWARM_OBJ) +$(UNWARMLIB): $(UNWARMLIB_OBJ) $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null -- cgit