From a13a97376afa286f6afd8f80bbab02c5725614b0 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 5 May 2008 23:27:30 +0000 Subject: [PATCH] Merge both pkg-config creation commands into one. Originally committed as revision 13064 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/configure b/configure index 73dd202ba5..d65a83cfd5 100755 --- a/configure +++ b/configure @@ -2148,15 +2148,6 @@ Conflicts: Libs: -L\${libdir} -l${shortname} $libs Cflags: -I\${includedir} EOF -} - -pkgconfig_generate_uninstalled(){ -name=$1 -shortname=${name#lib} -comment=$2 -version=$3 -libs=$4 -requires=$5 cat <$name-uninstalled.pc prefix= exec_prefix= @@ -2174,32 +2165,23 @@ EOF } pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" -pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION" -pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION" pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION" -pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION" pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$pkg_requires libavformat = $LIBAVFORMAT_VERSION" -pkgconfig_generate_uninstalled libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$pkg_requires libavformat = $LIBAVFORMAT_VERSION" if enabled postproc; then pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" - pkgconfig_generate_uninstalled libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" fi if enabled swscale; then pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION" - pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION" else pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION" - pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION" apply libswscale.pc sed s/^Libs:.*$/Libs:/ - apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/ fi if enabled avfilter; then pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION" - pkgconfig_generate_uninstalled libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION" fi