Merge commit '1389b4c18d1042c196603ba66c25113bcee1738b'

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 7836a20f879d50de10166a05011cb213336a5f4d..d881fcc574de7e3a33fcf4c30085b897a09e7ed2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ include config.mak
 vpath %.c    $(SRC_PATH)
 vpath %.cpp  $(SRC_PATH)
 vpath %.h    $(SRC_PATH)
+vpath %.inc  $(SRC_PATH)
 vpath %.m    $(SRC_PATH)
 vpath %.S    $(SRC_PATH)
 vpath %.asm  $(SRC_PATH)
@@ -38,7 +39,7 @@ OBJS-ffmpeg-$(CONFIG_VIDEOTOOLBOX) += ffmpeg_videotoolbox.o
 OBJS-ffmpeg-$(CONFIG_LIBMFX)  += ffmpeg_qsv.o
 OBJS-ffserver                 += ffserver_config.o
 
-TESTTOOLS   = audiogen videogen rotozoom tiny_psnr tiny_ssim base64
+TESTTOOLS   = audiogen videogen rotozoom tiny_psnr tiny_ssim base64 audiomatch
 HOSTPROGS  := $(TESTTOOLS:%=tests/%) doc/print_options
 TOOLS       = qt-faststart trasher uncoded_frame
 TOOLS-$(CONFIG_ZLIB) += cws2fws
@@ -176,11 +177,14 @@ clean::
        $(RM) $(CLEANSUFFIXES)
        $(RM) $(CLEANSUFFIXES:%=tools/%)
        $(RM) -r coverage-html
-       $(RM) -rf coverage.info lcov
+       $(RM) -rf coverage.info coverage.info.in lcov
 
 distclean::
        $(RM) $(DISTCLEANSUFFIXES)
        $(RM) config.* .config libavutil/avconfig.h .version avversion.h version.h libavutil/ffversion.h libavcodec/codec_names.h
+ifeq ($(SRC_LINK),src)
+       $(RM) src
+endif
        $(RM) -rf doc/examples/pc-uninstalled
 
 config: