Remove redundant fastmemcpy.h #include, it is indirectly #included by avutil.h.

[ffmpeg] / common.mak

diff --git a/common.mak b/common.mak
index 0d5fdceec456aa8599bb3c6665dd33fae74443c9..43a133c4fa72bdff0c8edfe8c6382b3e2d5ba01f 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -8,6 +8,7 @@ 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) \
@@ -63,8 +64,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)" && \
@@ -96,6 +97,4 @@ uninstall-headers:
 
 .PHONY: all depend dep clean distclean install* uninstall*
 
-ifneq ($(wildcard .depend),)
-include .depend
-endif
+-include .depend