Commit 42225a30 authored by Måns Rullgård's avatar Måns Rullgård

remove redundant make variable SUBDIR

Originally committed as revision 5442 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 21f9324b
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# common bits used by all libraries # common bits used by all libraries
# #
SRC_DIR = $(SRC_PATH)/$(SUBDIR) SRC_DIR = $(SRC_PATH)/lib$(NAME)
VPATH = $(SRC_DIR) VPATH = $(SRC_DIR)
#FIXME: This should be in configure/config.mak #FIXME: This should be in configure/config.mak
......
...@@ -417,7 +417,6 @@ sparc/%.o: sparc/%.c ...@@ -417,7 +417,6 @@ sparc/%.o: sparc/%.c
endif endif
NAME=avcodec NAME=avcodec
SUBDIR=libavcodec
LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF) LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF)
ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(LAVCVERSION) LIBVERSION=$(LAVCVERSION)
......
...@@ -83,7 +83,6 @@ OBJS+= ogg.o ...@@ -83,7 +83,6 @@ OBJS+= ogg.o
endif endif
NAME=avformat NAME=avformat
SUBDIR=libavformat
ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(LAVFVERSION) LIBVERSION=$(LAVFVERSION)
LIBMAJOR=$(LAVFMAJOR) LIBMAJOR=$(LAVFMAJOR)
......
...@@ -15,7 +15,6 @@ HEADERS = avutil.h common.h mathematics.h integer.h rational.h \ ...@@ -15,7 +15,6 @@ HEADERS = avutil.h common.h mathematics.h integer.h rational.h \
intfloat_readwrite.h intfloat_readwrite.h
NAME=avutil NAME=avutil
SUBDIR = libavutil
ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(LAVUVERSION) LIBVERSION=$(LAVUVERSION)
LIBMAJOR=$(LAVUMAJOR) LIBMAJOR=$(LAVUMAJOR)
......
...@@ -5,7 +5,6 @@ include ../config.mak ...@@ -5,7 +5,6 @@ include ../config.mak
incdir=$(prefix)/include/postproc incdir=$(prefix)/include/postproc
NAME=postproc NAME=postproc
SUBDIR=libpostproc
ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(SPPVERSION) LIBVERSION=$(SPPVERSION)
LIBMAJOR=$(SPPMAJOR) LIBMAJOR=$(SPPMAJOR)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment