avformat/Makefile, configure: fix --avformat-swscale and the removal of the

[melted] / src / modules / avformat / Makefile

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index 8d45fc6..42180f7 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -17,7 +17,7 @@ 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
@@ -27,7 +27,8 @@ endif
 ifdef LOCAL_FFMPEG
        LOCAL_FFMPEG_OBJS = ffmpeg/libavformat/libavformat$(AVFORMAT_SUFFIX) \
                            ffmpeg/libavcodec/libavcodec$(AVFORMAT_SUFFIX) \
-                           ffmpeg/libavutil/libavutil$(AVFORMAT_SUFFIX)
+                           ffmpeg/libavutil/libavutil$(AVFORMAT_SUFFIX) \
+                           ffmpeg/libavutil/libavdevice$(AVFORMAT_SUFFIX)
 endif
 
 SRCS := $(OBJS:.o=.c)
@@ -35,27 +36,33 @@ SRCS := $(OBJS:.o=.c)
 all:   $(TARGET)
 
 $(LOCAL_FFMPEG_OBJS):
-               if [ $(LOCAL_FFMPEG) ] ; then \
-                       $(MAKE) -C ffmpeg lib ; \
-               fi
+       if [ $(LOCAL_FFMPEG) ] ; then \
+               $(MAKE) -C ffmpeg ffmpeg ; \
+       fi
 
 $(TARGET): $(OBJS) $(LOCAL_FFMPEG_OBJS)
-               $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
 
 depend:        $(SRCS)
-               if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg dep ; fi
-               $(CC) -MM $(CFLAGS) $^ 1>.depend
+       if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg dep ; fi
+       $(CC) -MM $(CFLAGS) $^ 1>.depend
 
 distclean:     clean
-               if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg distclean ; fi
-               rm -f .depend
+       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)
+       #if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg clean ; fi
+       rm -f $(OBJS) $(TARGET)
 
 install: all
-               install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
+       install -d "$(DESTDIR)$(prefix)/share/mlt/avformat"
+       install -m 644 producer_avformat.yml "$(DESTDIR)$(prefix)/share/mlt/avformat"
+
+uninstall:
+       rm "$(DESTDIR)$(libdir)/mlt/libmltavformat$(LIBSUF)"
+       rm -rf "$(DESTDIR)$(prefix)/share/mlt/avformat" 
 
 ifneq ($(wildcard .depend),)
 include .depend