scale_npp: fix passthrough mode

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index d90d9be344caf707f227b0260284e16537d5ad83..e860f2c728657d50b9eac9a15678b5d29cf95a62 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -56,15 +56,17 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC)
 %_host.o: %.c
        $(COMPILE_HOSTC)
 
+%.o: %.asm
+       $(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
+       $(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $<
+       -$(STRIP) $(STRIPFLAGS) $@
+
 %.i: %.c
        $(CC) $(CCFLAGS) $(CC_E) $<
 
 %.h.c:
        $(Q)echo '#include "$*.h"' >$@
 
-%.ver: %.v
-       $(M)sed 's/MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@
-
 %.c %.h %.ver: TAG = GEN
 
 AVPROGS-$(CONFIG_AVCONV)   += avconv
@@ -119,8 +121,13 @@ $(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
 
 tools/cws2fws$(EXESUF): ELIBS = $(ZLIB)
 
+CONFIGURABLE_COMPONENTS =                                           \
+    $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c))                 \
+    $(SRC_PATH)/libavcodec/bitstream_filters.c                      \
+    $(SRC_PATH)/libavformat/protocols.c                             \
+
 config.h: .config
-.config: $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c))
+.config: $(CONFIGURABLE_COMPONENTS)
        @-tput bold 2>/dev/null
        @-printf '\nWARNING: $(?F) newer than config.h, rerun configure\n\n'
        @-tput sgr0 2>/dev/null
@@ -128,7 +135,7 @@ config.h: .config
 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
 
 define RESET