[FFmpeg-cvslog] r22395 - trunk/configure

mru subversion
Tue Mar 9 15:58:22 CET 2010


Author: mru
Date: Tue Mar  9 15:58:22 2010
New Revision: 22395

Log:
configure: always write shared lib variables to config.mak

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Tue Mar  9 15:58:18 2010	(r22394)
+++ trunk/configure	Tue Mar  9 15:58:22 2010	(r22395)
@@ -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/avfo
 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



More information about the ffmpeg-cvslog mailing list