1. ffmpeg
  2. Commit 5a9134f5f14210b953f12de8ee2c439958a3d6d1
Browse code

Merge commit '6641819feedb086ebba3d2be89b8d33980f367e1'

* commit '6641819feedb086ebba3d2be89b8d33980f367e1':
build: Ignore generated mapfile and remove it on distclean

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Hendrik Leppkes authored on 2016/06/26 22:43:05
Showing 2 changed files
.gitignore
History View file @ 5a9134f
... ... 
@@ -32,3 +32,4 @@
32 32 
 /avversion.h
33 33 
 /lcov/
34 34 
 /src
35 
+/mapfile
Makefile
History View file @ 5a9134f
... ... 
@@ -184,7 +184,7 @@ clean::
184 184
185 185 
 distclean::
186 186 
 	$(RM) $(DISTCLEANSUFFIXES)
187 
-	$(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
187 
+	$(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
188 188 
 ifeq ($(SRC_LINK),src)
189 189 
 	$(RM) src
190 190 
 endif