change --avformat-svn configure option to do a static build of ffmpeg libs only and...

[melted] / src / modules / avformat / Makefile

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index d307bc2..c3031ef 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -17,10 +17,11 @@ 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) $(EXTRA_LIBS) -lmlt
+
+ifdef SWSCALE
+       CFLAGS+=-DSWSCALE
+       LDFLAGS+=-lswscale$(AVFORMAT_SUFFIX)
 endif
 
 SRCS := $(OBJS:.o=.c)
@@ -29,9 +30,7 @@ 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) ; \
+                       $(MAKE) -C ffmpeg lib ; \
                fi
                $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
 
@@ -39,20 +38,16 @@ 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.$(LIBSUF) "$(prefix)/share/mlt/modules" ; \
-                       install -m 755 ../../framework/libmltavformat.$(LIBSUF) "$(prefix)/share/mlt/modules" ; \
-               fi
+               install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
 
 ifneq ($(wildcard .depend),)
 include .depend