mpegvideo: use av_get_picture_type_char() in ff_print_debug_info()

[ffmpeg] / subdir.mak

diff --git a/subdir.mak b/subdir.mak
index 8a407fe1648e8fce4073d03a4de3d8d17a1f98be..092662fc1448801ec7fad9d21b163f3b51c84872 100644 (file)
--- a/subdir.mak
+++ b/subdir.mak
@@ -50,12 +50,12 @@ endif
 
 clean::
        $(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
-           $(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS)))) \
+           $(foreach dir,$(DIRS),$(CLEANSUFFIXES:%=$(SUBDIR)$(dir)/%)) \
            $(HOSTOBJS) $(HOSTPROGS)
 
 distclean:: clean
-       $(RM)  $(addprefix $(SUBDIR),$(DISTCLEANSUFFIXES)) \
-            $(addprefix $(SUBDIR), $(foreach suffix,$(DISTCLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
+       $(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) \
+           $(foreach dir,$(DIRS),$(DISTCLEANSUFFIXES:%=$(SUBDIR)$(dir)/%))
 
 install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
        $(Q)mkdir -p "$(SHLIBDIR)"
@@ -88,9 +88,9 @@ uninstall-libs::
        -$(RM) "$(LIBDIR)/$(LIBNAME)"
 
 uninstall-headers::
-       $(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS))
+       $(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS)) $(addprefix "$(INCINSTDIR)/",$(BUILT_HEADERS))
        $(RM) "$(LIBDIR)/pkgconfig/lib$(NAME).pc"
-       -rmdir "$(INCDIR)"
+       -rmdir "$(INCINSTDIR)"
 endef
 
 $(eval $(RULES))