Corrections to --avformat-cvs option

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@719 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index 9354339..07ac987 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -1,7 +1,7 @@
 include ../../../config.mak
 include config.mak
 
-TARGET = ../libmltffmpeg$(LIBSUF)
+TARGET = ../libmltavformat$(LIBSUF)
 
 OBJS = factory.o \
           producer_avformat.o \
@@ -18,7 +18,7 @@ CFLAGS+=-I../..
 LDFLAGS+=-L../../framework
 
 ifdef LOCAL_FFMPEG 
-       LDFLAGS+=-lmltavformat -lmltavcodec $(EXTRA_LIBS) -lmlt
+       LDFLAGS+=-lavformat.mlt -lavcodec.mlt $(EXTRA_LIBS) -lmlt
 else
        LDFLAGS+=-lavformat -lavcodec $(EXTRA_LIBS) -lmlt
 endif
@@ -30,8 +30,8 @@ all:  $(TARGET)
 $(TARGET): $(OBJS)
                if [ $(LOCAL_FFMPEG) ] ; then \
                        $(MAKE) -C ffmpeg all ; \
-                       cp -f ffmpeg/libavcodec/libavcodec$(LIBSUF) ../../framework/libmltavcodec$(LIBSUF) ; \
-                       cp -f ffmpeg/libavformat/libavformat$(LIBSUF) ../../framework/libmltavformat$(LIBSUF) ; \
+                       cp -f ffmpeg/libavcodec/libavcodec$(LIBSUF) ../../framework/libavcodec.mlt$(LIBSUF) ; \
+                       cp -f ffmpeg/libavformat/libavformat$(LIBSUF) ../../framework/libavformat.mlt$(LIBSUF) ; \
                fi
                $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
 
@@ -50,8 +50,8 @@ clean:
 install: all
                install -m 755 $(TARGET) "$(prefix)/share/mlt/modules"
                if [ $(LOCAL_FFMPEG) ] ; then \
-                       install -m 755 ../../framework/libmltavcodec$(LIBSUF) "$(prefix)/share/mlt/modules" ; \
-                       install -m 755 ../../framework/libmltavformat$(LIBSUF) "$(prefix)/share/mlt/modules" ; \
+                       install -m 755 ../../framework/libavcodec.mlt$(LIBSUF) "$(prefix)/lib" ; \
+                       install -m 755 ../../framework/libavformat.mlt$(LIBSUF) "$(prefix)/lib" ; \
                fi
 
 ifneq ($(wildcard .depend),)

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 53276db..b6a94e3 100755 (executable)
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -88,17 +88,17 @@ else
        echo "EXTRA_LIBS=$extra_libs" >> config.mak
 
 cat << EOF >> ../producers.dat
-avformat               libmltffmpeg$LIBSUF
+avformat               libmltavformat$LIBSUF
 EOF
 
 cat << EOF >> ../filters.dat
-avdeinterlace  libmltffmpeg$LIBSUF
-avresample             libmltffmpeg$LIBSUF
-avcolour_space libmltffmpeg$LIBSUF
+avdeinterlace  libmltavformat$LIBSUF
+avresample             libmltavformat$LIBSUF
+avcolour_space libmltavformat$LIBSUF
 EOF
 
 cat << EOF >> ../consumers.dat
-avformat               libmltffmpeg$LIBSUF
+avformat               libmltavformat$LIBSUF
 EOF
 
 fi