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

diego subversion at mplayerhq.hu
Sat Nov 25 17:55:20 CET 2006


Author: diego
Date: Sat Nov 25 17:55:02 2006
New Revision: 21226

Modified:
   trunk/common.mak

Log:
Sync with FFmpeg r7167.


Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	(original)
+++ trunk/common.mak	Sat Nov 25 17:55:02 2006
@@ -2,8 +2,8 @@
 # common bits used by all libraries
 #
 
-SRC_DIR = $(SRC_PATH)/lib$(NAME)
-VPATH = $(SRC_DIR)
+VPATH = $(SRC_PATH_BARE)/lib$(NAME)
+SRC_DIR = "$(VPATH)"
 
 CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
           -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \
@@ -45,7 +45,7 @@
 
 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
@@ -78,7 +78,7 @@
 install-headers:
 	install -d "$(incdir)"
 	install -d "$(libdir)/pkgconfig"
-	install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(incdir)"
+	install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(incdir)"
 	install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(libdir)/pkgconfig"
 
 uninstall: uninstall-libs uninstall-headers
@@ -95,9 +95,6 @@
 
 .PHONY: all depend dep clean distclean install* uninstall*
 
-#
-# include dependency files if they exist
-#
 ifneq ($(wildcard .depend),)
 include .depend
 endif



More information about the MPlayer-cvslog mailing list