diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-10-15 10:02:21 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-10-15 10:02:21 +0000 |
| commit | 07a1b05e66a690437811cf90b3a1132627ca2126 (patch) | |
| tree | 4741e41398f3a2b484b4d791cb288819c49c9a7d | |
| parent | a8789714ba858a663d30f4676016d5bc7368c823 (diff) | |
| download | ffmpeg-07a1b05e66a690437811cf90b3a1132627ca2126.tar.gz | |
Consistently use $(BUILD_ROOT).
Originally committed as revision 6695 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavformat/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -605,7 +605,7 @@ v4l="no" v4l2="no" audio_oss="yes" dv1394="no" -VHOOKSHFLAGS="-shared -L../libavformat -L../libavcodec -L../libavutil" +VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil' VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)' extralibs="" EXESUF=".exe" diff --git a/libavformat/Makefile b/libavformat/Makefile index ce3527ae40..95be67b298 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -161,7 +161,7 @@ OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.o OBJS-$(CONFIG_AUDIO_MUXER) += audio.o endif -EXTRALIBS := -lavcodec$(BUILDSUF) -L../libavcodec $(EXTRALIBS) +EXTRALIBS := -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS) ifeq ($(CONFIG_AUDIO_BEOS),yes) CPPOBJS+= beosaudio.o |