remove redundant make variable SUBDIR
authorMåns Rullgård <mans@mansr.com>
Thu, 1 Jun 2006 21:57:44 +0000 (21:57 +0000)
committerMåns Rullgård <mans@mansr.com>
Thu, 1 Jun 2006 21:57:44 +0000 (21:57 +0000)
Originally committed as revision 5442 to svn://svn.ffmpeg.org/ffmpeg/trunk

common.mak
libavcodec/Makefile
libavformat/Makefile
libavutil/Makefile
libpostproc/Makefile

index 36e5fe83764b6cfffb3a7431fcb36c18fa21c1b3..5815fd48f6a35ba9e8ea11b27eadfef68aebd7b3 100644 (file)
@@ -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)
 
 #FIXME: This should be in configure/config.mak
 VPATH = $(SRC_DIR)
 
 #FIXME: This should be in configure/config.mak
index 554d0e6b6cb5f5e0fe127710264d68e582a133f4..a8a06dc2dba1568dc4ed7d03c5776840403527e7 100644 (file)
@@ -417,7 +417,6 @@ sparc/%.o: sparc/%.c
 endif
 
 NAME=avcodec
 endif
 
 NAME=avcodec
-SUBDIR=libavcodec
 LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF)
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVCVERSION)
 LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF)
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVCVERSION)
index e8be261b591a9138e42d917f50189cfb84466984..c9f3b8e503c158017be12546c25363804bd2ace5 100644 (file)
@@ -83,7 +83,6 @@ OBJS+= ogg.o
 endif
 
 NAME=avformat
 endif
 
 NAME=avformat
-SUBDIR=libavformat
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVFVERSION)
 LIBMAJOR=$(LAVFMAJOR)
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVFVERSION)
 LIBMAJOR=$(LAVFMAJOR)
index ed10a7d490652f978b257b495edcbc10845d2ac6..373337b4e3d4eee96f77dc9cff4e3183fedf9b74 100644 (file)
@@ -15,7 +15,6 @@ HEADERS = avutil.h common.h mathematics.h integer.h rational.h \
           intfloat_readwrite.h
 
 NAME=avutil
           intfloat_readwrite.h
 
 NAME=avutil
-SUBDIR = libavutil
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVUVERSION)
 LIBMAJOR=$(LAVUMAJOR)
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVUVERSION)
 LIBMAJOR=$(LAVUMAJOR)
index 10b3175a2918f5e85c40bc3908c6a2cfd3d874c9..29563aee4a31178763d3f7dc127a11aebeca2b2c 100644 (file)
@@ -5,7 +5,6 @@ include ../config.mak
 incdir=$(prefix)/include/postproc
 
 NAME=postproc
 incdir=$(prefix)/include/postproc
 
 NAME=postproc
-SUBDIR=libpostproc
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(SPPVERSION)
 LIBMAJOR=$(SPPMAJOR)
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(SPPVERSION)
 LIBMAJOR=$(SPPMAJOR)