From 7c7801e34d6dbc2b3e12238d16ea93d2de8352b6 Mon Sep 17 00:00:00 2001 From: Johann Date: Thu, 15 Nov 2012 16:41:03 -0800 Subject: Each make file is responsible for its own directory Change-Id: Ia8a59ce79045af209e49c68810bae44616422db5 --- vp8/vp8cx.mk | 11 ++--------- vp8/vp8cx_arm.mk | 2 +- vp8/vp8dx.mk | 2 ++ 3 files changed, 5 insertions(+), 10 deletions(-) (limited to 'vp8') diff --git a/vp8/vp8cx.mk b/vp8/vp8cx.mk index 5976297bc..0ae2f106b 100644 --- a/vp8/vp8cx.mk +++ b/vp8/vp8cx.mk @@ -22,16 +22,9 @@ ifeq ($(ARCH_ARM),yes) include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8cx_arm.mk endif -VP8_CX_SRCS-yes += vp8_cx_iface.c +VP8_CX_SRCS-yes += vp8cx.mk -# encoder -#INCLUDES += algo/vpx_common/vpx_mem/include -#INCLUDES += common -#INCLUDES += common -#INCLUDES += common -#INCLUDES += algo/vpx_ref/cpu_id/include -#INCLUDES += common -#INCLUDES += encoder +VP8_CX_SRCS-yes += vp8_cx_iface.c VP8_CX_SRCS-yes += encoder/asm_enc_offsets.c VP8_CX_SRCS-yes += encoder/defaultcoefcounts.h diff --git a/vp8/vp8cx_arm.mk b/vp8/vp8cx_arm.mk index b16615d1b..b030ee57e 100644 --- a/vp8/vp8cx_arm.mk +++ b/vp8/vp8cx_arm.mk @@ -9,7 +9,7 @@ ## -#VP8_CX_SRCS list is modified according to different platforms. +VP8_CX_SRCS-$(ARCH_ARM) += vp8cx_arm.mk #File list for arm # encoder diff --git a/vp8/vp8dx.mk b/vp8/vp8dx.mk index 2cfd280cb..dd3919004 100644 --- a/vp8/vp8dx.mk +++ b/vp8/vp8dx.mk @@ -18,6 +18,8 @@ VP8_DX_SRCS-no += $(VP8_COMMON_SRCS-no) VP8_DX_SRCS_REMOVE-yes += $(VP8_COMMON_SRCS_REMOVE-yes) VP8_DX_SRCS_REMOVE-no += $(VP8_COMMON_SRCS_REMOVE-no) +VP8_DX_SRCS-yes += vp8dx.mk + VP8_DX_SRCS-yes += vp8_dx_iface.c # common -- cgit v1.2.3