From 42225a3058e7698c9a02b4359959b7771c75715e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Thu, 1 Jun 2006 21:57:44 +0000
Subject: [PATCH] remove redundant make variable SUBDIR

Originally committed as revision 5442 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 common.mak           | 2 +-
 libavcodec/Makefile  | 1 -
 libavformat/Makefile | 1 -
 libavutil/Makefile   | 1 -
 libpostproc/Makefile | 1 -
 5 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/common.mak b/common.mak
index 36e5fe8376..5815fd48f6 100644
--- a/common.mak
+++ b/common.mak
@@ -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
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 554d0e6b6c..a8a06dc2db 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -417,7 +417,6 @@ sparc/%.o: sparc/%.c
 endif
 
 NAME=avcodec
-SUBDIR=libavcodec
 LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF)
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVCVERSION)
diff --git a/libavformat/Makefile b/libavformat/Makefile
index e8be261b59..c9f3b8e503 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -83,7 +83,6 @@ OBJS+= ogg.o
 endif
 
 NAME=avformat
-SUBDIR=libavformat
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVFVERSION)
 LIBMAJOR=$(LAVFMAJOR)
diff --git a/libavutil/Makefile b/libavutil/Makefile
index ed10a7d490..373337b4e3 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -15,7 +15,6 @@ HEADERS = avutil.h common.h mathematics.h integer.h rational.h \
           intfloat_readwrite.h
 
 NAME=avutil
-SUBDIR = libavutil
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVUVERSION)
 LIBMAJOR=$(LAVUMAJOR)
diff --git a/libpostproc/Makefile b/libpostproc/Makefile
index 10b3175a29..29563aee4a 100644
--- a/libpostproc/Makefile
+++ b/libpostproc/Makefile
@@ -5,7 +5,6 @@ include ../config.mak
 incdir=$(prefix)/include/postproc
 
 NAME=postproc
-SUBDIR=libpostproc
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(SPPVERSION)
 LIBMAJOR=$(SPPMAJOR)