From: James Almer <jamrial@gmail.com>
Date: Thu, 23 Mar 2017 21:20:29 +0000 (-0300)
Subject: Merge commit 'd32571626a2c36c026b7fa13d19ac4ed1aad75c9'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=78c52e2721cad97f4ac4a4a38c09e1cee2a4e7e2;p=ffmpeg

Merge commit 'd32571626a2c36c026b7fa13d19ac4ed1aad75c9'

* commit 'd32571626a2c36c026b7fa13d19ac4ed1aad75c9':
  build: Add VSX-OBJS to SUBDIR_VARS

Merged-by: James Almer <jamrial@gmail.com>
---

78c52e2721cad97f4ac4a4a38c09e1cee2a4e7e2
diff --cc Makefile
index 72c95939381,34f0c9c2781..f8ddb99e6b3
--- a/Makefile
+++ b/Makefile
@@@ -88,9 -130,8 +88,9 @@@ config.h: .confi
  SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS      \
                 HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS            \
                 ARMV5TE-OBJS ARMV6-OBJS ARMV8-OBJS VFP-OBJS NEON-OBJS     \
-                ALTIVEC-OBJS MMX-OBJS YASM-OBJS                           \
+                ALTIVEC-OBJS VSX-OBJS MMX-OBJS YASM-OBJS                  \
 -               OBJS HOSTOBJS TESTOBJS
 +               MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSP-OBJS MSA-OBJS         \
 +               MMI-OBJS OBJS SLIBOBJS HOSTOBJS TESTOBJS
  
  define RESET
  $(1) :=