From 0d97a5f021232f4e2f0612b366126c960fca7e34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= Date: Mon, 15 Dec 2008 09:55:20 +0000 Subject: =?UTF-8?q?Better=20file=20suffix=20replacement.=20Bug=20fix=20by?= =?UTF-8?q?=20Nils=20Wallm=C3=83=C2=A9nius.=20Closes=20FS=20#9644.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19443 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/libmad/libmad.make | 2 +- apps/codecs/libspeex/libspeex.make | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'apps/codecs') diff --git a/apps/codecs/libmad/libmad.make b/apps/codecs/libmad/libmad.make index c09f7f0..0ee4eb7 100644 --- a/apps/codecs/libmad/libmad.make +++ b/apps/codecs/libmad/libmad.make @@ -27,7 +27,7 @@ $(MADLIB): $(MADLIB_OBJ) # libmad-mpeg MPEGMADLIB := $(CODECDIR)/libmad-mpeg.a MPEGMADLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libmad/SOURCES) -MPEGMADLIB_OBJ := $(subst .c,.o,$(subst .S,.o,$(subst $(ROOTDIR)/apps/codecs/libmad,$(BUILDDIR)/apps/codecs/libmad-mpeg,$(MPEGMADLIB_SRC)))) +MPEGMADLIB_OBJ := $(addsuffix .o,$(basename $(subst $(ROOTDIR)/apps/codecs/libmad,$(BUILDDIR)/apps/codecs/libmad-mpeg,$(MPEGMADLIB_SRC)))) $(MPEGMADLIB): $(MPEGMADLIB_OBJ) $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 diff --git a/apps/codecs/libspeex/libspeex.make b/apps/codecs/libspeex/libspeex.make index 80d74ec..483074a 100644 --- a/apps/codecs/libspeex/libspeex.make +++ b/apps/codecs/libspeex/libspeex.make @@ -37,7 +37,7 @@ $(SPEEXLIB): $(SPEEXLIB_OBJ) # libspeex-voice VOICESPEEXLIB := $(CODECDIR)/libspeex-voice.a VOICESPEEXLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libspeex/SOURCES) -VOICESPEEXLIB_OBJ := $(subst .c,.o,$(subst .S,.o,$(subst $(ROOTDIR)/apps/codecs/libspeex,$(BUILDDIR)/apps/codecs/libspeex-voice,$(VOICESPEEXLIB_SRC)))) +VOICESPEEXLIB_OBJ := $(addsuffix .o,$(basename $(subst $(ROOTDIR)/apps/codecs/libspeex,$(BUILDDIR)/apps/codecs/libspeex-voice,$(VOICESPEEXLIB_SRC)))) $(VOICESPEEXLIB): $(VOICESPEEXLIB_OBJ) $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 -- cgit v1.1