From 165af439f1e51e5cc673416b6723197dd5d0ead9 Mon Sep 17 00:00:00 2001 From: Måns Rullgård Date: Tue, 14 Nov 2006 02:38:35 +0000 Subject: move makefile linking after config.* creation Originally committed as revision 7039 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 80 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/configure b/configure index 04df346258..8fdfb1ffd7 100755 --- a/configure +++ b/configure @@ -2020,46 +2020,6 @@ if test "$optimize" = "small"; then echo "#define CONFIG_SMALL 1" >> $TMPH fi -# build tree in object directory if source path is different from current one -if test "$source_path_used" = "yes" ; then - DIRS="\ - doc \ - libavformat \ - libavcodec \ - libavcodec/alpha \ - libavcodec/armv4l \ - libavcodec/bfin \ - libavcodec/i386 \ - libavcodec/sparc \ - libavcodec/mlib \ - libavcodec/ppc \ - libavcodec/liba52 \ - libpostproc \ - libavutil \ - libswscale \ - tests \ - vhook \ - " - FILES="\ - Makefile \ - common.mak \ - libavformat/Makefile \ - libavcodec/Makefile \ - libpostproc/Makefile \ - libavutil/Makefile \ - libswscale/Makefile \ - tests/Makefile \ - vhook/Makefile \ - doc/Makefile \ - doc/texi2pod.pl \ - " - for dir in $DIRS ; do - mkdir -p $dir - done - for f in $FILES ; do - ln -sf "$source_path/$f" $f - done -fi echo "SRC_PATH=\"$source_path\"" >> config.mak echo "SRC_PATH_BARE=$source_path" >> config.mak echo "BUILD_ROOT=\"$PWD\"" >> config.mak @@ -2100,6 +2060,46 @@ fi rm -f $TMPO $TMPC $TMPE $TMPS $TMPH +# build tree in object directory if source path is different from current one +if test "$source_path_used" = "yes" ; then + DIRS="\ + doc \ + libavformat \ + libavcodec \ + libavcodec/alpha \ + libavcodec/armv4l \ + libavcodec/bfin \ + libavcodec/i386 \ + libavcodec/sparc \ + libavcodec/mlib \ + libavcodec/ppc \ + libavcodec/liba52 \ + libpostproc \ + libavutil \ + libswscale \ + tests \ + vhook \ + " + FILES="\ + Makefile \ + common.mak \ + libavformat/Makefile \ + libavcodec/Makefile \ + libpostproc/Makefile \ + libavutil/Makefile \ + libswscale/Makefile \ + tests/Makefile \ + vhook/Makefile \ + doc/Makefile \ + doc/texi2pod.pl \ + " + for dir in $DIRS ; do + mkdir -p $dir + done + for f in $FILES ; do + ln -sf "$source_path/$f" $f + done +fi # build pkg-config files libav*.pc and libpostproc.pc # libavutil.pc -- cgit v1.2.3