From: Johann Koenig <johannkoenig@google.com>
Date: Fri, 28 Aug 2015 23:18:18 +0000 (-0700)
Subject: Check CONFIG_VP<N> instead of encoder and decoder
X-Git-Tag: v1.5.0~206^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0231e27bf0491baa6e8a4bb59d449ab61d2dd606;p=libvpx

Check CONFIG_VP<N> instead of encoder and decoder

If either the encoder or the decoder is enabled, CONFIG_VP<N> will be
set. This simplifies the conditional and passes the chromium update
script when CONFIG_ values are passed in with 'yes' and 'no' values.

This was failing because it was checking against empty strings but
they are set to 'no'

Change-Id: I02ecd557210088ba1458cd0e89eead5666f6597a
---

diff --git a/libs.mk b/libs.mk
index b9d4b2868..811a6e5b9 100644
--- a/libs.mk
+++ b/libs.mk
@@ -76,7 +76,7 @@ ifeq ($(CONFIG_VP8_DECODER),yes)
   CODEC_DOC_SECTIONS += vp8 vp8_decoder
 endif
 
-ifneq ($(CONFIG_VP9_ENCODER)$(CONFIG_VP9_DECODER),)
+ifeq ($(CONFIG_VP9),yes)
   VP9_PREFIX=vp9/
   include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9_common.mk
 endif
@@ -110,7 +110,7 @@ VP9_PREFIX=vp9/
 $(BUILD_PFX)$(VP9_PREFIX)%.c.o: CFLAGS += -Wextra
 
 #  VP10 make file
-ifneq ($(CONFIG_VP10_ENCODER)$(CONFIG_VP10_DECODER),)
+ifeq ($(CONFIG_VP10),yes)
   VP10_PREFIX=vp10/
   include $(SRC_PATH_BARE)/$(VP10_PREFIX)vp10_common.mk
 endif