aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Bellard <fabrice@bellard.org>2002-11-29 14:56:03 +0000
committerFabrice Bellard <fabrice@bellard.org>2002-11-29 14:56:03 +0000
commita382b927ed7f75784343df43dacfdd5c27110d7a (patch)
tree5819e91d1b973ca42aee398e221128ed8b028c1f
parent6207ba95f3010bc884e0ce815281bb610d4f7818 (diff)
downloadffmpeg-a382b927ed7f75784343df43dacfdd5c27110d7a.tar.gz
fixed multidir compile
Originally committed as revision 1289 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure6
-rw-r--r--libavformat/Makefile2
-rw-r--r--vhook/Makefile2
3 files changed, 5 insertions, 5 deletions
diff --git a/configure b/configure
index c28eec2f71..85631c9332 100755
--- a/configure
+++ b/configure
@@ -678,9 +678,9 @@ echo "#define restrict $_restrict" >> $TMPH
# build tree in object directory if source path is different from current one
if test "$source_path_used" = "yes" ; then
- DIRS="libav libavcodec libavcodec/alpha libavcodec/armv4l libavcodec/i386 \
- libavcodec/ppc libavcodec/liba52 libavcodec/mlib tests"
- FILES="Makefile libav/Makefile libavcodec/Makefile tests/Makefile"
+ DIRS="libavformat libavcodec libavcodec/alpha libavcodec/armv4l libavcodec/i386 \
+ libavcodec/ppc libavcodec/liba52 libavcodec/mlib tests vhook"
+ FILES="Makefile libavformat/Makefile libavcodec/Makefile tests/Makefile vhook/Makefile"
for dir in $DIRS ; do
mkdir -p $dir
done
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 0ee4f09e4a..3bcddebb4a 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -4,7 +4,7 @@
#
include ../config.mak
-VPATH=$(SRC_PATH)/libav
+VPATH=$(SRC_PATH)/libavformat
CFLAGS= $(OPTFLAGS) -Wall -g -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
diff --git a/vhook/Makefile b/vhook/Makefile
index 98280e2721..e6755cc457 100644
--- a/vhook/Makefile
+++ b/vhook/Makefile
@@ -2,7 +2,7 @@ include ../config.mak
VPATH=$(SRC_PATH)/vhook
-CFLAGS=-fPIC $(OPTFLAGS) -g -Wall -I$(SRC_PATH) -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H
+CFLAGS=-fPIC $(OPTFLAGS) -g -Wall -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H
ifeq ($(CONFIG_DARWIN),yes)
SHFLAGS+=-bundle -flat_namespace -undefined suppress