diff options
author | Víctor Paesa <victorpaesa@googlemail.com> | 2008-01-12 11:17:37 +0000 |
---|---|---|
committer | Víctor Paesa <victorpaesa@googlemail.com> | 2008-01-12 11:17:37 +0000 |
commit | a585c469a380858f25954c6c893abedbdf68bc2c (patch) | |
tree | 6950c912513cf1b2458aa9b70cffa8b2f90edf8e | |
parent | 4eb7a735cb7218794909e19773415be57ec959e4 (diff) | |
download | ffmpeg-a585c469a380858f25954c6c893abedbdf68bc2c.tar.gz |
Link to libraries in dependency order.
Based on a patch by Gonzalo Garramuño, ggarra advancedsl com ar
Originally committed as revision 11515 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavdevice/Makefile | 4 | ||||
-rw-r--r-- | 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 |