From a585c469a380858f25954c6c893abedbdf68bc2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Paesa?= Date: Sat, 12 Jan 2008 11:17:37 +0000 Subject: [PATCH] =?UTF-8?q?Link=20to=20libraries=20in=20dependency=20order?= =?UTF-8?q?.=20Based=20on=20a=20patch=20by=20Gonzalo=20Garramu=C3=B1o,=20g?= =?UTF-8?q?garra=20advancedsl=20com=20ar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Originally committed as revision 11515 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavdevice/Makefile | 4 ++-- libavformat/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 7d6e64371b..6047c11cb7 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -4,9 +4,9 @@ NAME=avdevice LIBVERSION=$(LAVDVERSION) LIBMAJOR=$(LAVDMAJOR) -EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \ +EXTRALIBS := -L$(BUILD_ROOT)/libavformat -lavformat$(BUILDSUF) \ -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) \ - -L$(BUILD_ROOT)/libavformat -lavformat$(BUILDSUF) $(EXTRALIBS) + -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) CFLAGS += -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat diff --git a/libavformat/Makefile b/libavformat/Makefile index 1d95a4c615..97c4440636 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -158,8 +158,8 @@ OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o riff.o OBJS-$(CONFIG_VHOOK) += framehook.o -EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \ - -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) $(EXTRALIBS) +EXTRALIBS := -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) \ + -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) # protocols I/O OBJS+= avio.o aviobuf.o