[Ffmpeg-cvslog] r6695 - in trunk: configure libavformat/Makefile

[diego]

Author: diego
Date: Sun Oct 15 12:02:21 2006
New Revision: 6695

Modified:
   trunk/configure
   trunk/libavformat/Makefile

Log:
Consistently use $(BUILD_ROOT).


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sun Oct 15 12:02:21 2006
@@ -605,7 +605,7 @@
 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"

Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile	(original)
+++ trunk/libavformat/Makefile	Sun Oct 15 12:02:21 2006
@@ -161,7 +161,7 @@
 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