Merge "fix --disable-runtime-cpu-detect on x86"

[profile/ivi/libvpx.git] / libs.mk

diff --git a/libs.mk b/libs.mk
index 1819b24..c09581c 100644 (file)
--- a/libs.mk
+++ b/libs.mk
@@ -184,7 +184,7 @@ BUILD_LIBVPX_SO         := $(if $(BUILD_LIBVPX),$(CONFIG_SHARED))
 LIBVPX_SO               := libvpx.so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)
 LIBS-$(BUILD_LIBVPX_SO) += $(BUILD_PFX)$(LIBVPX_SO)
 $(BUILD_PFX)$(LIBVPX_SO): $(LIBVPX_OBJS) libvpx.ver
-$(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm -pthread
+$(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm
 $(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.so.$(VERSION_MAJOR)
 $(BUILD_PFX)$(LIBVPX_SO): SO_VERSION_SCRIPT = libvpx.ver
 LIBVPX_SO_SYMLINKS      := $(addprefix $(LIBSUBDIR)/, \
@@ -262,14 +262,17 @@ ifeq ($(filter icc gcc,$(TGT_CC)), $(TGT_CC))
     asm_com_offsets.asm: $(VP8_PREFIX)common/asm_com_offsets.c.S
        grep EQU $< | tr -d '$$\#' $(ADS2GAS) > $@
     $(VP8_PREFIX)common/asm_com_offsets.c.S: vp8/common/asm_com_offsets.c
+    CLEAN-OBJS += asm_com_offsets.asm $(VP8_PREFIX)common/asm_com_offsets.c.S
 
     asm_enc_offsets.asm: $(VP8_PREFIX)encoder/asm_enc_offsets.c.S
        grep EQU $< | tr -d '$$\#' $(ADS2GAS) > $@
     $(VP8_PREFIX)encoder/asm_enc_offsets.c.S: vp8/encoder/asm_enc_offsets.c
+    CLEAN-OBJS += asm_enc_offsets.asm $(VP8_PREFIX)encoder/asm_enc_offsets.c.S
 
     asm_dec_offsets.asm: $(VP8_PREFIX)decoder/asm_dec_offsets.c.S
        grep EQU $< | tr -d '$$\#' $(ADS2GAS) > $@
     $(VP8_PREFIX)decoder/asm_dec_offsets.c.S: vp8/decoder/asm_dec_offsets.c
+    CLEAN-OBJS += asm_dec_offsets.asm $(VP8_PREFIX)decoder/asm_dec_offsets.c.S
 else
   ifeq ($(filter rvct,$(TGT_CC)), $(TGT_CC))
     asm_com_offsets.asm: obj_int_extract