[SCM] libav/experimental: configure: always write shared lib variables to config.mak

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:03:53 UTC 2013


The following commit has been merged in the experimental branch:
commit 1afc4750efb03dfb082348f82bd468bd0ab9cefd
Author: Måns Rullgård <mans at mansr.com>
Date:   Tue Mar 9 14:58:22 2010 +0000

    configure: always write shared lib variables to config.mak
    
    Originally committed as revision 22395 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index a923d74..4164557 100755
--- a/configure
+++ b/configure
@@ -3009,6 +3009,14 @@ SDL_CFLAGS=$sdl_cflags
 LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
 EXTRALIBS=$extralibs
 INSTALL=install
+LIBTARGET=${LIBTARGET}
+SLIBNAME=${SLIBNAME}
+SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}
+SLIBNAME_WITH_MAJOR=${SLIBNAME_WITH_MAJOR}
+SLIB_CREATE_DEF_CMD=${SLIB_CREATE_DEF_CMD}
+SLIB_EXTRA_CMD=${SLIB_EXTRA_CMD}
+SLIB_INSTALL_EXTRA_CMD=${SLIB_INSTALL_EXTRA_CMD}
+SLIB_UNINSTALL_EXTRA_CMD=${SLIB_UNINSTALL_EXTRA_CMD}
 EOF
 
 get_version(){
@@ -3029,17 +3037,6 @@ get_version LIBAVFORMAT libavformat/avformat.h
 get_version LIBAVUTIL   libavutil/avutil.h
 get_version LIBAVFILTER libavfilter/avfilter.h
 
-enabled shared && cat >> config.mak <<EOF
-LIBTARGET=${LIBTARGET}
-SLIBNAME=${SLIBNAME}
-SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}
-SLIBNAME_WITH_MAJOR=${SLIBNAME_WITH_MAJOR}
-SLIB_CREATE_DEF_CMD=${SLIB_CREATE_DEF_CMD}
-SLIB_EXTRA_CMD=${SLIB_EXTRA_CMD}
-SLIB_INSTALL_EXTRA_CMD=${SLIB_INSTALL_EXTRA_CMD}
-SLIB_UNINSTALL_EXTRA_CMD=${SLIB_UNINSTALL_EXTRA_CMD}
-EOF
-
 enabled asmalign_pot || align_shift="1 <<"
 
 cat > $TMPH <<EOF

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list