Merge commit '6641819feedb086ebba3d2be89b8d33980f367e1'

* commit '6641819feedb086ebba3d2be89b8d33980f367e1': build: Ignore generated mapfile and remove it on distclean Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
mbouron · Jun 26, 2016 · 5a9134f · 5a9134f
2 parents cd52ec2 + 6641819
commit 5a9134f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,4 @@
 /avversion.h
 /lcov/
 /src
+/mapfile
diff --git 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