aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-08 14:24:06 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-08 14:24:16 +0100
commitaba1a48cc5b3f1ee77d5b8e9e72c27bbf3625d85 (patch)
treeee196d11ef4664211aa64b3e64855786437eccaf /Makefile
parent89c8eaa3216a48c1d18cc390525e90db74513f0c (diff)
parentb326755989b346d0d935e0628e8865f9b2951c30 (diff)
downloadffmpeg-aba1a48cc5b3f1ee77d5b8e9e72c27bbf3625d85.tar.gz
Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'
* commit 'b326755989b346d0d935e0628e8865f9b2951c30': arm: rename ARMVFP config symbol to VFP Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index fcb7e5501b..ca1ace18cb 100644
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ config.h: .config
SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \
HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \
- ARMV5TE-OBJS ARMV6-OBJS ARMVFP-OBJS NEON-OBJS \
+ ARMV5TE-OBJS ARMV6-OBJS VFP-OBJS NEON-OBJS \
ALTIVEC-OBJS VIS-OBJS \
MMX-OBJS YASM-OBJS \
MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSPR1-OBJS MIPS32R2-OBJS \