diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 15:43:05 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 15:43:05 +0200 |
| commit | 5a9134f5f14210b953f12de8ee2c439958a3d6d1 (patch) | |
| tree | 39fbad50c4664893fd441965d6965a97059a5c20 | |
| parent | cd52ec2337ae0d78c53ed32602a100a67b829fe4 (diff) | |
| parent | 6641819feedb086ebba3d2be89b8d33980f367e1 (diff) | |
| download | ffmpeg-5a9134f5f14210b953f12de8ee2c439958a3d6d1.tar.gz | |
Merge commit '6641819feedb086ebba3d2be89b8d33980f367e1'
* commit '6641819feedb086ebba3d2be89b8d33980f367e1':
build: Ignore generated mapfile and remove it on distclean
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 2b251c96c9..524fb73c16 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /avversion.h /lcov/ /src +/mapfile @@ -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 |