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

[ffmpeg] / common.mak

diff --git a/common.mak b/common.mak
index cecb48897df8cc58fe380305f6fe1638009c777f..43a133c4fa72bdff0c8edfe8c6382b3e2d5ba01f 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -5,6 +5,11 @@
 VPATH = $(SRC_PATH_BARE)/lib$(NAME)
 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)
@@ -33,10 +38,6 @@ $(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
 %.o: %.S
        $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
 
-# BeOS: remove -Wall to get rid of all the "multibyte constant" warnings
-%.o: %.cpp
-       g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
-
 %: %.o $(LIB)
        $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
 
@@ -45,7 +46,7 @@ depend dep: $(SRCS)
 
 clean::
        rm -f *.o *.d *~ *.a *.lib *.so *.so.* *.dylib *.dll \
-             *.lib *.def *.dll.a *.exp
+             *.def *.dll.a *.exp
 
 distclean: clean
        rm -f .depend
@@ -63,12 +64,13 @@ 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)" && \
                ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
+       $(SLIB_INSTALL_EXTRA_CMD)
 
 install-lib-static: $(LIB)
        install -d "$(libdir)"
@@ -95,9 +97,4 @@ uninstall-headers:
 
 .PHONY: all depend dep clean distclean install* uninstall*
 
-#
-# include dependency files if they exist
-#
-ifneq ($(wildcard .depend),)
-include .depend
-endif
+-include .depend