diff options
| author | Björn Stenberg <bjorn@haxx.se> | 2008-12-15 09:55:20 +0000 |
|---|---|---|
| committer | Björn Stenberg <bjorn@haxx.se> | 2008-12-15 09:55:20 +0000 |
| commit | 0d97a5f021232f4e2f0612b366126c960fca7e34 (patch) | |
| tree | 88cd3545bc5297b8485c339a22af2b2196180fcf /apps | |
| parent | e4cf6311cbaecdd6a46de36575a4efe543273277 (diff) | |
Better file suffix replacement. Bug fix by Nils Wallménius. Closes FS #9644.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19443 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/codecs/libmad/libmad.make | 2 | ||||
| -rw-r--r-- | apps/codecs/libspeex/libspeex.make | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/codecs/libmad/libmad.make b/apps/codecs/libmad/libmad.make index c09f7f091f..0ee4eb7768 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 80d74ec77f..483074a487 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 |