ffmpeg | branch: master | Hendrik Leppkes <[email protected]> | Sun Jun 26 15:43:05 2016 +0200| [5a9134f5f14210b953f12de8ee2c439958a3d6d1] | committer: Hendrik Leppkes
Merge commit '6641819feedb086ebba3d2be89b8d33980f367e1' * commit '6641819feedb086ebba3d2be89b8d33980f367e1': build: Ignore generated mapfile and remove it on distclean Merged-by: Hendrik Leppkes <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a9134f5f14210b953f12de8ee2c439958a3d6d1 --- .gitignore | 1 + Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2b251c9..524fb73 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /avversion.h /lcov/ /src +/mapfile diff --git a/Makefile b/Makefile index 4eca5d1..8aa72fd 100644 --- a/Makefile +++ b/Makefile @@ -184,7 +184,7 @@ clean:: distclean:: $(RM) $(DISTCLEANSUFFIXES) - $(RM) config.* .config libavutil/avconfig.h .version avversion.h version.h libavutil/ffversion.h libavcodec/codec_names.h libavcodec/bsf_list.c libavformat/protocol_list.c + $(RM) config.* .config libavutil/avconfig.h .version mapfile avversion.h version.h libavutil/ffversion.h libavcodec/codec_names.h libavcodec/bsf_list.c libavformat/protocol_list.c ifeq ($(SRC_LINK),src) $(RM) src endif ====================================================================== diff --cc .gitignore index 2b251c9,e71246c..524fb73 --- a/.gitignore +++ b/.gitignore @@@ -18,17 -17,13 +18,18 @@@ *.so.* *.swp *.ver +*_g +\#* +.\#* /.config /.version -/avconv -/avplay -/avprobe -/avversion.h +/ffmpeg +/ffplay +/ffprobe +/ffserver /config.* /coverage.info +/avversion.h /lcov/ +/src + /mapfile diff --cc Makefile index 4eca5d1,1f79705..8aa72fd --- a/Makefile +++ b/Makefile @@@ -184,16 -217,13 +184,16 @@@ clean: distclean:: $(RM) $(DISTCLEANSUFFIXES) - $(RM) config.* .config libavutil/avconfig.h .version avversion.h version.h libavutil/ffversion.h libavcodec/codec_names.h libavcodec/bsf_list.c libavformat/protocol_list.c - $(RM) config.* .config libavutil/avconfig.h .version avversion.h \ - mapfile libavcodec/bsf_list.c libavformat/protocol_list.c ++ $(RM) config.* .config libavutil/avconfig.h .version mapfile avversion.h version.h libavutil/ffversion.h libavcodec/codec_names.h libavcodec/bsf_list.c libavformat/protocol_list.c +ifeq ($(SRC_LINK),src) + $(RM) src +endif + $(RM) -rf doc/examples/pc-uninstalled config: - $(SRC_PATH)/configure $(value LIBAV_CONFIGURATION) + $(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION) -check: all alltools checkheaders examples testprogs fate +check: all alltools examples testprogs fate include $(SRC_PATH)/tests/Makefile _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
