Merge remote-tracking branch 'qatar/master'

[ffmpeg] / subdir.mak

diff --git a/subdir.mak b/subdir.mak
index e4d7377fcb045d16d2b49b18663c596fddac4171..f8473da596156cc078385cec033d69d648217eea 100644 (file)
--- a/subdir.mak
+++ b/subdir.mak
@@ -56,6 +56,7 @@ distclean:: clean
 install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
        $(Q)mkdir -p "$(SHLIBDIR)"
        $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
+       $$(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
        $(Q)cd "$(SHLIBDIR)" && \
                $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
        $(Q)cd "$(SHLIBDIR)" && \
@@ -83,9 +84,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))