Merge commit 'a2a9e4eea0e4fde2ed8d3405b4f33f655b600c2d'
[ffmpeg.git] / Makefile
index 22f194b..9defdde 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -127,21 +127,18 @@ install-data: $(DATA_FILES)
        $(Q)mkdir -p "$(DATADIR)"
        $(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
 
-uninstall: uninstall-libs uninstall-headers uninstall-data
+uninstall: uninstall-data uninstall-headers uninstall-libs uninstall-pkgconfig
 
 uninstall-data:
        $(RM) -r "$(DATADIR)"
 
 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
 
-distclean::
-       $(RM) $(DISTCLEANSUFFIXES)
+distclean:: clean
        $(RM) .version avversion.h config.asm config.h mapfile  \
                ffbuild/.config ffbuild/config.* libavutil/avconfig.h \
                version.h libavutil/ffversion.h libavcodec/codec_names.h \