summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2016-06-26 15:43:05 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2016-06-26 15:43:05 +0200
commit5a9134f5f14210b953f12de8ee2c439958a3d6d1 (patch)
tree39fbad50c4664893fd441965d6965a97059a5c20 /Makefile
parentcd52ec2337ae0d78c53ed32602a100a67b829fe4 (diff)
parent6641819feedb086ebba3d2be89b8d33980f367e1 (diff)
downloadffmpeg-streaming-5a9134f5f14210b953f12de8ee2c439958a3d6d1.zip
ffmpeg-streaming-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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
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
OpenPOWER on IntegriCloud