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/rbcodec/rbcodec.make | |
| parent | 9445d4625a3d47b28d756a5763165eb73d6b4ada (diff) | |
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/rbcodec/rbcodec.make')
| -rw-r--r-- | lib/rbcodec/rbcodec.make | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/rbcodec/rbcodec.make b/lib/rbcodec/rbcodec.make index afa289ba28..cd669d22c9 100644 --- a/lib/rbcodec/rbcodec.make +++ b/lib/rbcodec/rbcodec.make @@ -5,15 +5,15 @@ # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ # \/ \/ \/ \/ \/ -RBCODEC_LIB = $(RBCODEC_BLD)/librbcodec.a -RBCODEC_SRC := $(call preprocess, $(RBCODEC_DIR)/SOURCES) -RBCODEC_OBJ := $(call c2obj, $(RBCODEC_SRC)) -INCLUDES += -I$(RBCODEC_DIR) -I$(RBCODEC_DIR)/dsp -I$(RBCODEC_DIR)/metadata -OTHER_SRC += $(RBCODEC_SRC) +# RBCODEC_BLD is defined in the calling Makefile +RBCODECLIB_DIR := $(ROOTDIR)/lib/rbcodec +RBCODECLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/SOURCES) +RBCODECLIB_OBJ := $(call c2obj, $(RBCODECLIB_SRC)) +RBCODECLIB := $(BUILDDIR)/lib/librbcodec.a -$(RBCODEC_BLD)/%.o: $(RBCODEC_DIR)/%.c - $(SILENT)mkdir -p $(dir $@) - $(call PRINTS,CC $<)$(CC) $(CFLAGS) $(RBCODEC_CFLAGS) -c $< -o $@ +INCLUDES += -I$(RBCODECLIB_DIR) -I$(RBCODECLIB_DIR)/dsp -I$(RBCODECLIB_DIR)/metadata +OTHER_SRC += $(RBCODECLIB_SRC) +CORE_LIBS += $(RBCODECLIB) -$(RBCODEC_LIB): $(RBCODEC_OBJ) +$(RBCODECLIB): $(RBCODECLIB_OBJ) $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |