[MPlayer-cvslog] r23544 - trunk/common.mak

[diego]

Author: diego
Date: Mon Jun 11 00:20:24 2007
New Revision: 23544

Log:
Sync with FFmpeg r9278.


Modified:
   trunk/common.mak

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	(original)
+++ trunk/common.mak	Mon Jun 11 00:20:24 2007
@@ -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)
@@ -44,7 +46,7 @@ depend dep: $(SRCS)
 	$(CC) -MM $(CFLAGS) $^ 1>.depend
 
 clean::
-	rm -f *.o *.d *~ *.a *.lib *.so *.so.* *.dylib *.dll \
+	rm -f *.o *~ *.a *.lib *.so *.so.* *.dylib *.dll \
 	      *.def *.dll.a *.exp
 
 distclean: clean
@@ -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