diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-08-02 05:21:10 -0700 |
|---|---|---|
| committer | Code Review <code-review@webmproject.org> | 2011-08-02 05:21:10 -0700 |
| commit | f475f0c1bb2786251b8bd9aafa17c320d1b90633 (patch) | |
| tree | 73f1e2ae48f03f1c004b3a26b3a3d4ef931ebf8b | |
| parent | 81da41732cb27df46d40c4ab0a1452d03418cbbb (diff) | |
| parent | 3e8c6d3d3577d9698d6ac61747c1a2ea9cdaa346 (diff) | |
| download | libvpx-f475f0c1bb2786251b8bd9aafa17c320d1b90633.tar libvpx-f475f0c1bb2786251b8bd9aafa17c320d1b90633.tar.gz libvpx-f475f0c1bb2786251b8bd9aafa17c320d1b90633.tar.bz2 libvpx-f475f0c1bb2786251b8bd9aafa17c320d1b90633.zip | |
Merge "include the arm header files in make dist" into cayuga
| -rw-r--r-- | libs.mk | 4 | ||||
| -rw-r--r-- | vp8/vp8_common.mk | 5 | ||||
| -rw-r--r-- | vp8/vp8cx_arm.mk | 7 | ||||
| -rw-r--r-- | vp8/vp8dx_arm.mk | 2 |
4 files changed, 13 insertions, 5 deletions
@@ -35,6 +35,7 @@ ifeq ($(CONFIG_VP8_ENCODER),yes) CODEC_SRCS-yes += $(addprefix $(VP8_PREFIX),$(call enabled,VP8_CX_SRCS)) CODEC_EXPORTS-yes += $(addprefix $(VP8_PREFIX),$(VP8_CX_EXPORTS)) CODEC_SRCS-yes += $(VP8_PREFIX)vp8cx.mk vpx/vp8.h vpx/vp8cx.h vpx/vp8e.h + CODEC_SRCS-$(ARCH_ARM) += $(VP8_PREFIX)vp8cx_arm.mk INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8e.h include/vpx/vp8cx.h INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP8_PREFIX)/% CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8cx.h @@ -47,6 +48,7 @@ ifeq ($(CONFIG_VP8_DECODER),yes) CODEC_SRCS-yes += $(addprefix $(VP8_PREFIX),$(call enabled,VP8_DX_SRCS)) CODEC_EXPORTS-yes += $(addprefix $(VP8_PREFIX),$(VP8_DX_EXPORTS)) CODEC_SRCS-yes += $(VP8_PREFIX)vp8dx.mk vpx/vp8.h vpx/vp8dx.h + CODEC_SRCS-$(ARCH_ARM) += $(VP8_PREFIX)vp8dx_arm.mk INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8dx.h INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP8_PREFIX)/% CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8dx.h @@ -101,7 +103,7 @@ CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/x86_abi_support.asm CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/x86_cpuid.c endif CODEC_SRCS-$(ARCH_ARM) += vpx_ports/arm_cpudetect.c -CODEC_SRCS-$(ARCH_ARM) += $(BUILD_PFX)vpx_config.asm +CODEC_SRCS-$(ARCH_ARM) += vpx_ports/arm.h CODEC_EXPORTS-$(BUILD_LIBVPX) += vpx/exports_com CODEC_EXPORTS-$(CONFIG_ENCODERS) += vpx/exports_enc CODEC_EXPORTS-$(CONFIG_DECODERS) += vpx/exports_dec diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk index f55c899db..0542ff771 100644 --- a/vp8/vp8_common.mk +++ b/vp8/vp8_common.mk @@ -103,12 +103,15 @@ endif # common (c) VP8_COMMON_SRCS-$(ARCH_ARM) += common/asm_com_offsets.c VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/arm_systemdependent.c - VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/bilinearfilter_arm.c VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/bilinearfilter_arm.h VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/filter_arm.c +VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/idct_arm.h VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/loopfilter_arm.c +VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/loopfilter_arm.h +VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/recon_arm.h VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/reconintra_arm.c +VP8_COMMON_SRCS-$(ARCH_ARM) += common/arm/subpixel_arm.h # common (armv6) VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/bilinearfilter_v6$(ASM) diff --git a/vp8/vp8cx_arm.mk b/vp8/vp8cx_arm.mk index 599bf4753..e8dbd5d7e 100644 --- a/vp8/vp8cx_arm.mk +++ b/vp8/vp8cx_arm.mk @@ -15,9 +15,12 @@ # encoder VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/arm_csystemdependent.c -VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/quantize_arm.c -VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/picklpf_arm.c VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/dct_arm.c +VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/dct_arm.h +VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/encodemb_arm.h +VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/picklpf_arm.c +VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/quantize_arm.c +VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/quantize_arm.h VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/variance_arm.c VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/variance_arm.h diff --git a/vp8/vp8dx_arm.mk b/vp8/vp8dx_arm.mk index 583562b97..16c8375af 100644 --- a/vp8/vp8dx_arm.mk +++ b/vp8/vp8dx_arm.mk @@ -13,8 +13,8 @@ VP8_DX_SRCS-$(ARCH_ARM) += decoder/arm/arm_dsystemdependent.c VP8_CX_SRCS-$(ARCH_ARM) += decoder/asm_dec_offsets.c - VP8_DX_SRCS-$(ARCH_ARM) += decoder/arm/dequantize_arm.c +VP8_DX_SRCS-$(ARCH_ARM) += decoder/arm/dequantize_arm.h #File list for armv6 VP8_DX_SRCS-$(HAVE_ARMV6) += decoder/arm/armv6/dequant_dc_idct_v6$(ASM) |