[FFmpeg-cvslog] Merge commit 'cbcdb2d8e47f62f69accee62c08f487a27848174'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 23:15:09 2017 -0300| [e29e7b630504489c9ddb4d6a88a9c7651ccced37] | committer: James Almer

Merge commit 'cbcdb2d8e47f62f69accee62c08f487a27848174'

* commit 'cbcdb2d8e47f62f69accee62c08f487a27848174':
  build: Delete compiler-generated compat files on 'make clean'

See
d100dc6c9955af8b7a7a60a37a362a51c819222e
a2ca9e11ff7166cbbc0314d152702a201f6a14fb

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e29e7b630504489c9ddb4d6a88a9c7651ccced37
---

 Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 22f194be9b..e088e30687 100644
--- a/Makefile
+++ b/Makefile
@@ -134,9 +134,7 @@ uninstall-data:
 
 clean::
 	$(RM) $(CLEANSUFFIXES)
-	$(RM) $(CLEANSUFFIXES:%=compat/msvcrt/%)
-	$(RM) $(CLEANSUFFIXES:%=compat/atomics/pthread/%)
-	$(RM) $(CLEANSUFFIXES:%=compat/%)
+	$(RM) $(addprefix compat/,$(CLEANSUFFIXES)) $(addprefix compat/*/,$(CLEANSUFFIXES))
 	$(RM) -r coverage-html
 	$(RM) -rf coverage.info coverage.info.in lcov
 


======================================================================

diff --cc Makefile
index 22f194be9b,b1a2c301b5..e088e30687
--- a/Makefile
+++ b/Makefile
@@@ -134,11 -168,8 +134,9 @@@ uninstall-data
  
  clean::
  	$(RM) $(CLEANSUFFIXES)
- 	$(RM) $(CLEANSUFFIXES:%=compat/msvcrt/%)
- 	$(RM) $(CLEANSUFFIXES:%=compat/atomics/pthread/%)
- 	$(RM) $(CLEANSUFFIXES:%=compat/%)
+ 	$(RM) $(addprefix compat/,$(CLEANSUFFIXES)) $(addprefix compat/*/,$(CLEANSUFFIXES))
 -	$(RM) -rf coverage.info lcov
 +	$(RM) -r coverage-html
 +	$(RM) -rf coverage.info coverage.info.in lcov
  
  distclean::
  	$(RM) $(DISTCLEANSUFFIXES)