]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'cbcdb2d8e47f62f69accee62c08f487a27848174'
authorJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 02:15:09 +0000 (23:15 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 02:15:31 +0000 (23:15 -0300)
* commit 'cbcdb2d8e47f62f69accee62c08f487a27848174':
  build: Delete compiler-generated compat files on 'make clean'

See
d100dc6c9955af8b7a7a60a37a362a51c819222e
a2ca9e11ff7166cbbc0314d152702a201f6a14fb

Merged-by: James Almer <jamrial@gmail.com>
1  2 
Makefile

diff --cc Makefile
index 22f194be9b6dd56afb819fee04d885e922c78665,b1a2c301b56c33904f263eae2d3a4bdacd1ffed6..e088e30687ed81a7b390ad4edd3b4062f5e0f241
+++ 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)