avformat/configure, avformat/Makefile: add libavdevice for newer versions of ffmpeg...

[melted] / src / modules / avformat / Makefile

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index c3031ef..21524f6 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -17,21 +17,30 @@ CFLAGS+=-I../..
 
 LDFLAGS+=-L../../framework
 
-LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(AVFORMAT_SUFFIX) -lavutil$(AVFORMAT_SUFFIX) $(EXTRA_LIBS) -lmlt
+LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(AVFORMAT_SUFFIX) -lavutil$(AVFORMAT_SUFFIX) -lavdevice$(AVFORMAT_SUFFIX) $(EXTRA_LIBS) -lmlt
 
 ifdef SWSCALE
        CFLAGS+=-DSWSCALE
        LDFLAGS+=-lswscale$(AVFORMAT_SUFFIX)
 endif
 
+ifdef LOCAL_FFMPEG
+       LOCAL_FFMPEG_OBJS = ffmpeg/libavformat/libavformat$(AVFORMAT_SUFFIX) \
+                           ffmpeg/libavcodec/libavcodec$(AVFORMAT_SUFFIX) \
+                           ffmpeg/libavutil/libavutil$(AVFORMAT_SUFFIX) \
+                           ffmpeg/libavutil/libavdevice$(AVFORMAT_SUFFIX)
+endif
+
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)
 
-$(TARGET): $(OBJS)
+$(LOCAL_FFMPEG_OBJS):
                if [ $(LOCAL_FFMPEG) ] ; then \
                        $(MAKE) -C ffmpeg lib ; \
                fi
+
+$(TARGET): $(OBJS) $(LOCAL_FFMPEG_OBJS)
                $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
 
 depend:        $(SRCS)
@@ -47,7 +56,7 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install: all
-               install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+               install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend