Add warped motion config flag

Change-Id: I4b5e1251dc215073384e168a6f845ae059d6c4f2
diff --git a/configure b/configure
index 2620369..ced8cb2 100755
--- a/configure
+++ b/configure
@@ -288,6 +288,7 @@
     ext_partition_types
     ext_tile
     obmc
+    warped_motion
     entropy
     bidir_pred
 "
diff --git a/vp10/vp10_common.mk b/vp10/vp10_common.mk
index 650b6f3..9bc0ce0 100644
--- a/vp10/vp10_common.mk
+++ b/vp10/vp10_common.mk
@@ -88,6 +88,10 @@
 VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/mfqe_sse2.asm
 VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/postproc_sse2.asm
 endif
+ifeq (yes,$(filter yes,$(CONFIG_GLOBAL_MOTION) $(CONFIG_WARPED_MOTION)))
+VP10_COMMON_SRCS-yes += common/warped_motion.h
+VP10_COMMON_SRCS-yes += common/warped_motion.c
+endif
 
 ifneq ($(CONFIG_VP9_HIGHBITDEPTH),yes)
 VP10_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/itrans4_dspr2.c
diff --git a/vp10/vp10cx.mk b/vp10/vp10cx.mk
index ea537fe..007fb4e 100644
--- a/vp10/vp10cx.mk
+++ b/vp10/vp10cx.mk
@@ -96,8 +96,6 @@
 VP10_CX_SRCS-yes += encoder/temporal_filter.h
 VP10_CX_SRCS-yes += encoder/mbgraph.c
 VP10_CX_SRCS-yes += encoder/mbgraph.h
-VP10_CX_SRCS-$(CONFIG_GLOBAL_MOTION) += common/warped_motion.h
-VP10_CX_SRCS-$(CONFIG_GLOBAL_MOTION) += common/warped_motion.c
 
 VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm
 VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2.c