From 8b18de8b7ca90fcbaa6b4d0ab3f564db34575708 Mon Sep 17 00:00:00 2001 From: "Timothy B. Terriberry" Date: Tue, 22 May 2012 19:51:19 -0700 Subject: [PATCH] Bug 757594 - Add explicit rules for obj_int_extract sources to libvpx, r=khuey --- media/libvpx/Makefile.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/media/libvpx/Makefile.in b/media/libvpx/Makefile.in index ae9682238fe..b5f87828f1d 100644 --- a/media/libvpx/Makefile.in +++ b/media/libvpx/Makefile.in @@ -472,9 +472,13 @@ endif HOST_CSRCS = obj_int_extract.c HOST_PROGRAM = host_obj_int_extract$(HOST_BIN_SUFFIX) +CSRCS += asm_com_offsets.c + GARBAGE += asm_com_offsets.$(OBJ_SUFFIX) asm_com_offsets.asm ifdef MOZ_VP8_ENCODER +CSRCS += asm_enc_offsets.c + GARBAGE += asm_enc_offsets.$(OBJ_SUFFIX) asm_enc_offsets.asm endif @@ -517,12 +521,20 @@ asm_com_offsets.asm: asm_com_offsets.$(OBJ_SUFFIX) $(HOST_PROGRAM) ./$(HOST_PROGRAM) $(VPX_OIE_FORMAT) $< \ $(if $(VPX_AS_CONVERSION),| $(VPX_AS_CONVERSION)) > $@ +# Filter out this object, because we don't want to link against it. +# It was generated solely so it could be parsed by obj_int_extract. +OBJS := $(filter-out asm_com_offsets.$(OBJ_SUFFIX),$(OBJS)) + ifdef MOZ_VP8_ENCODER asm_enc_offsets.asm: asm_enc_offsets.$(OBJ_SUFFIX) $(HOST_PROGRAM) ./$(HOST_PROGRAM) $(VPX_OIE_FORMAT) $< \ $(if $(VPX_AS_CONVERSION),| $(VPX_AS_CONVERSION)) > $@ +# Filter out this object, because we don't want to link against it. +# It was generated solely so it could be parsed by obj_int_extract. +OBJS := $(filter-out asm_enc_offsets.$(OBJ_SUFFIX),$(OBJS)) + endif endif