[FFmpeg-cvslog] r12362 - in trunk: common.mak configure libavcodec/Makefile libavdevice/Makefile libavfilter/Makefile libavformat/Makefile libavutil/Makefile libpostproc/Makefile

[mru]

Author: mru
Date: Fri Mar  7 20:27:17 2008
New Revision: 12362

Log:
simplify library version handling


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

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	(original)
+++ trunk/common.mak	Fri Mar  7 20:27:17 2008
@@ -4,6 +4,9 @@
 
 LIBSRC = $(SRC_PATH_BARE)/lib$(NAME)
 
+LIBVERSION = $(lib$(NAME)_VERSION)
+LIBMAJOR   = $(lib$(NAME)_VERSION_MAJOR)
+
 vpath %.c $(LIBSRC)
 vpath %.h $(LIBSRC)
 vpath %.S $(LIBSRC)

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Fri Mar  7 20:27:17 2008
@@ -2006,6 +2006,9 @@ get_version(){
     file=$source_path/$2
     eval $(grep "#define ${name}_VERSION_M" "$file" | awk '{ print $2"="$3 }')
     eval ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO
+    lcname=$(tolower $name)
+    eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak
+    eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak
 }
 
 get_version LIBSWSCALE  libswscale/swscale.h
@@ -2019,20 +2022,6 @@ get_version LIBAVFILTER libavfilter/avfi
 if enabled shared; then
     echo "BUILD_SHARED=yes" >> config.mak
     echo "PIC=-fPIC -DPIC" >> config.mak
-    echo "SPPMAJOR=$LIBPOSTPROC_VERSION_MAJOR" >> config.mak
-    echo "SPPVERSION=$LIBPOSTPROC_VERSION" >> config.mak
-    echo "LAVCMAJOR=$LIBAVCODEC_VERSION_MAJOR" >> config.mak
-    echo "LAVCVERSION=$LIBAVCODEC_VERSION" >> config.mak
-    echo "LAVDMAJOR=$LIBAVDEVICE_VERSION_MAJOR" >> config.mak
-    echo "LAVDVERSION=$LIBAVDEVICE_VERSION" >> config.mak
-    echo "LAVFMAJOR=$LIBAVFORMAT_VERSION_MAJOR" >> config.mak
-    echo "LAVFVERSION=$LIBAVFORMAT_VERSION" >> config.mak
-    echo "LAVUMAJOR=$LIBAVUTIL_VERSION_MAJOR" >> config.mak
-    echo "LAVUVERSION=$LIBAVUTIL_VERSION" >> config.mak
-    echo "LAVFIMAJOR=$LIBAVFILTER_VERSION_MAJOR" >> config.mak
-    echo "LAVFIVERSION=$LIBAVFILTER_VERSION" >> config.mak
-    echo "SWSMAJOR=$LIBSWSCALE_VERSION_MAJOR" >> config.mak
-    echo "SWSVERSION=$LIBSWSCALE_VERSION" >> config.mak
     echo "SLIBNAME=${SLIBNAME}" >> config.mak
     echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
     echo "SLIBNAME_WITH_MAJOR=${SLIBNAME_WITH_MAJOR}" >> config.mak

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	(original)
+++ trunk/libavcodec/Makefile	Fri Mar  7 20:27:17 2008
@@ -457,8 +457,6 @@ ASM_OBJS-$(ARCH_BFIN)                  +
 FFLIBS = avutil
 
 NAME=avcodec
-LIBVERSION=$(LAVCVERSION)
-LIBMAJOR=$(LAVCMAJOR)
 
 TESTS = $(addsuffix -test$(EXESUF), cabac dct eval fft h264 imgresample rangecoder snow)
 ifeq ($(ARCH_X86),yes)

Modified: trunk/libavdevice/Makefile
==============================================================================
--- trunk/libavdevice/Makefile	(original)
+++ trunk/libavdevice/Makefile	Fri Mar  7 20:27:17 2008
@@ -1,8 +1,6 @@
 include ../config.mak
 
 NAME=avdevice
-LIBVERSION=$(LAVDVERSION)
-LIBMAJOR=$(LAVDMAJOR)
 
 FFLIBS = avformat avcodec avutil
 

Modified: trunk/libavfilter/Makefile
==============================================================================
--- trunk/libavfilter/Makefile	(original)
+++ trunk/libavfilter/Makefile	Fri Mar  7 20:27:17 2008
@@ -15,7 +15,5 @@ FFLIBS-$(CONFIG_SWSCALER)      += swscal
 FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat
 
 NAME=avfilter
-LIBVERSION=$(LAVFIVERSION)
-LIBMAJOR=$(LAVFIMAJOR)
 
 include ../common.mak

Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile	(original)
+++ trunk/libavformat/Makefile	Fri Mar  7 20:27:17 2008
@@ -193,7 +193,5 @@ OBJS-$(CONFIG_UDP_PROTOCOL)             
 FFLIBS = avcodec avutil
 
 NAME=avformat
-LIBVERSION=$(LAVFVERSION)
-LIBMAJOR=$(LAVFMAJOR)
 
 include ../common.mak

Modified: trunk/libavutil/Makefile
==============================================================================
--- trunk/libavutil/Makefile	(original)
+++ trunk/libavutil/Makefile	Fri Mar  7 20:27:17 2008
@@ -38,8 +38,6 @@ HEADERS = adler32.h \
           sha1.h
 
 NAME=avutil
-LIBVERSION=$(LAVUVERSION)
-LIBMAJOR=$(LAVUMAJOR)
 
 TESTS = $(addsuffix -test$(EXESUF), adler32 aes crc des lls md5 sha1 softfloat tree)
 

Modified: trunk/libpostproc/Makefile
==============================================================================
--- trunk/libpostproc/Makefile	(original)
+++ trunk/libpostproc/Makefile	Fri Mar  7 20:27:17 2008
@@ -4,8 +4,6 @@ include ../config.mak
 FFLIBS = avutil
 
 NAME=postproc
-LIBVERSION=$(SPPVERSION)
-LIBMAJOR=$(SPPMAJOR)
 
 HEADERS = postprocess.h