[Ffmpeg-cvslog] r5442 - in trunk: common.mak libavcodec/Makefile libavformat/Makefile libavutil/Makefile libpostproc/Makefile

[mru]

Author: mru
Date: Thu Jun  1 23:57:44 2006
New Revision: 5442

Modified:
   trunk/common.mak
   trunk/libavcodec/Makefile
   trunk/libavformat/Makefile
   trunk/libavutil/Makefile
   trunk/libpostproc/Makefile

Log:
remove redundant make variable SUBDIR


Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	(original)
+++ trunk/common.mak	Thu Jun  1 23:57:44 2006
@@ -2,7 +2,7 @@
 # common bits used by all libraries
 #
 
-SRC_DIR = $(SRC_PATH)/$(SUBDIR)
+SRC_DIR = $(SRC_PATH)/lib$(NAME)
 VPATH = $(SRC_DIR)
 
 #FIXME: This should be in configure/config.mak

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	(original)
+++ trunk/libavcodec/Makefile	Thu Jun  1 23:57:44 2006
@@ -417,7 +417,6 @@
 endif
 
 NAME=avcodec
-SUBDIR=libavcodec
 LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF)
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVCVERSION)

Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile	(original)
+++ trunk/libavformat/Makefile	Thu Jun  1 23:57:44 2006
@@ -83,7 +83,6 @@
 endif
 
 NAME=avformat
-SUBDIR=libavformat
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVFVERSION)
 LIBMAJOR=$(LAVFMAJOR)

Modified: trunk/libavutil/Makefile
==============================================================================
--- trunk/libavutil/Makefile	(original)
+++ trunk/libavutil/Makefile	Thu Jun  1 23:57:44 2006
@@ -15,7 +15,6 @@
           intfloat_readwrite.h
 
 NAME=avutil
-SUBDIR = libavutil
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVUVERSION)
 LIBMAJOR=$(LAVUMAJOR)

Modified: trunk/libpostproc/Makefile
==============================================================================
--- trunk/libpostproc/Makefile	(original)
+++ trunk/libpostproc/Makefile	Thu Jun  1 23:57:44 2006
@@ -5,7 +5,6 @@
 incdir=$(prefix)/include/postproc
 
 NAME=postproc
-SUBDIR=libpostproc
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(SPPVERSION)
 LIBMAJOR=$(SPPMAJOR)