remove redundant make variable SUBDIR

Originally committed as revision 5442 to svn://svn.ffmpeg.org/ffmpeg/trunk
19 years ago · 42225a3058
parent 21f9324b60
commit 42225a3058
5 changed files with 1 additions and 5 deletions
--- 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
--- 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)
--- 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)
--- 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)
--- 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)