Merge commit '6641819feedb086ebba3d2be89b8d33980f367e1'

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

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

diff --cc .gitignore
index 2b251c9,e71246c..524fb73
--- 1/.gitignore
--- 2/.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
--- 1/Makefile
--- 2/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