aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-01-19 04:40:10 +0000
committerMåns Rullgård <mans@mansr.com>2010-01-19 04:40:10 +0000
commitdf642790791808bf9aca245bac213b0f97ec6583 (patch)
tree92d54890d4de48f9fa6c8db09cc24bfefb0ad457
parentc34681df42a8ffe93491ce710ca01a6151f11004 (diff)
downloadffmpeg-df642790791808bf9aca245bac213b0f97ec6583.tar.gz
configure: create dirs before generating config.*
Originally committed as revision 21319 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure77
1 files changed, 38 insertions, 39 deletions
diff --git a/configure b/configure
index b3170dd778..fb78be48c5 100755
--- a/configure
+++ b/configure
@@ -2783,6 +2783,44 @@ echo "License: $license"
echo "Creating config.mak and config.h..."
+# build tree in object directory if source path is different from current one
+if enabled source_path_used; then
+ DIRS="
+ doc
+ libavcodec
+ libavcodec/$arch
+ libavdevice
+ libavfilter
+ libavformat
+ libavutil
+ libavutil/$arch
+ libpostproc
+ libswscale
+ libswscale/$arch
+ tests
+ tools
+ "
+ FILES="
+ Makefile
+ common.mak
+ subdir.mak
+ doc/texi2pod.pl
+ libavcodec/Makefile
+ libavdevice/Makefile
+ libavfilter/Makefile
+ libavformat/Makefile
+ libavutil/Makefile
+ libpostproc/Makefile
+ libswscale/Makefile
+ "
+ for dir in $DIRS ; do
+ mkdir -p $dir
+ done
+ for f in $FILES ; do
+ $ln_s "$source_path/$f" $f
+ done
+fi
+
enabled stripping || strip="echo skipping strip"
cat > config.mak <<EOF
@@ -2917,45 +2955,6 @@ echo "endif # FFMPEG_CONFIG_MAK" >> config.mak
# Do not overwrite an unchanged config.h to avoid superfluous rebuilds.
cp_if_changed $TMPH config.h
-# build tree in object directory if source path is different from current one
-if enabled source_path_used; then
- DIRS="
- doc
- libavcodec
- libavcodec/$arch
- libavdevice
- libavfilter
- libavformat
- libavutil
- libavutil/$arch
- libpostproc
- libswscale
- libswscale/$arch
- tests
- tools
- "
- FILES="
- Makefile
- common.mak
- subdir.mak
- doc/texi2pod.pl
- libavcodec/Makefile
- libavdevice/Makefile
- libavfilter/Makefile
- libavformat/Makefile
- libavutil/Makefile
- libpostproc/Makefile
- libswscale/Makefile
- "
- for dir in $DIRS ; do
- mkdir -p $dir
- done
- for f in $FILES ; do
- $ln_s "$source_path/$f" $f
- done
-fi
-
-
# build pkg-config files
pkgconfig_generate(){