Move libpostproc-specific uninstallation command to the libpostproc Makefile.

[ffmpeg] / common.mak

diff --git a/common.mak b/common.mak
index 0d5fdceec456aa8599bb3c6665dd33fae74443c9..191598aca1e09d1f5c319894a781fd9f45061335 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -8,10 +8,12 @@ SRC_DIR = "$(VPATH)"
 CFLAGS   += $(CFLAGS-yes)
 OBJS     += $(OBJS-yes)
 ASM_OBJS += $(ASM_OBJS-yes)
+CPP_OBJS += $(CPP_OBJS-yes)
 
 CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
           -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \
           -I$(SRC_PATH)/libavutil $(OPTFLAGS)
+
 SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp)
 OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
 STATIC_OBJS := $(OBJS) $(STATIC_OBJS)
@@ -63,8 +65,8 @@ install-libs: $(INSTLIBTARGETS)
 
 install-lib-shared: $(SLIBNAME)
        install -d "$(shlibdir)"
-       install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
-               "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
+       install -m 755 $(SLIBNAME) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
+       $(STRIP) "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
        cd "$(shlibdir)" && \
                ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
        cd "$(shlibdir)" && \
@@ -90,12 +92,10 @@ uninstall-libs:
               "$(shlibdir)/$(SLIBNAME_WITH_VERSION)"
        -rm -f "$(libdir)/$(LIB)"
 
-uninstall-headers:
+uninstall-headers::
        rm -f $(addprefix "$(incdir)/",$(HEADERS))
        rm -f "$(libdir)/pkgconfig/lib$(NAME).pc"
 
 .PHONY: all depend dep clean distclean install* uninstall*
 
-ifneq ($(wildcard .depend),)
-include .depend
-endif
+-include .depend