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 37bf55a..21524f6 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -1,7 +1,7 @@
 include ../../../config.mak
 include config.mak
 
-TARGET = ../libmltavformat.so
+TARGET = ../libmltavformat$(LIBSUF)
 
 OBJS = factory.o \
           producer_avformat.o \
@@ -17,42 +17,46 @@ CFLAGS+=-I../..
 
 LDFLAGS+=-L../../framework
 
-ifdef LOCAL_FFMPEG 
-       LDFLAGS+=-lmltavformat -lmltavcodec $(EXTRA_LIBS) -lmlt
-else
-       LDFLAGS+=-lavformat -lavcodec $(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 all ; \
-                       cp -f ffmpeg/libavcodec/libavcodec.so ../../framework/libmltavcodec.so ; \
-                       cp -f ffmpeg/libavformat/libavformat.so ../../framework/libmltavformat.so ; \
+                       $(MAKE) -C ffmpeg lib ; \
                fi
-               $(CC) -shared -o $@ $(OBJS) $(LDFLAGS)
+
+$(TARGET): $(OBJS) $(LOCAL_FFMPEG_OBJS)
+               $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
 
 depend:        $(SRCS)
                if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg dep ; fi
                $(CC) -MM $(CFLAGS) $^ 1>.depend
 
-dist-clean:    clean
-               if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg dist-clean ; fi
+distclean:     clean
+               if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg distclean ; fi
                rm -f .depend
 
 clean: 
                #if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg clean ; fi
-               rm -f $(OBJS) $(TARGET) 
+               rm -f $(OBJS) $(TARGET)
 
 install: all
-               install -m 755 $(TARGET) "$(prefix)/share/mlt/modules"
-               if [ $(LOCAL_FFMPEG) ] ; then \
-                       install -m 755 ../../framework/libmltavcodec.so "$(prefix)/share/mlt/modules" ; \
-                       install -m 755 ../../framework/libmltavformat.so "$(prefix)/share/mlt/modules" ; \
-               fi
+               install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend