X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2FMakefile;h=b9e801adf188eba217a2a3a25a7cbccf34cc0987;hb=3d366fcfb46c1ae8ae3e38e15012edb6affd9828;hp=558438355fc6702936102e7fc513e867a3b9bd40;hpb=de09bd0b00071c23666dc21bb15c619c0c9095d6;p=melted

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index 5584383..b9e801a 100644
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -1,40 +1,56 @@
 include ../../../config.mak
 include config.mak
 
-TARGET = ../libmltavformat.so
+TARGET = ../libmltavformat$(LIBSUF)
 
 OBJS = factory.o \
 	   producer_avformat.o \
 	   consumer_avformat.o \
-	   filter_avdeinterlace.o \
+	   filter_avcolour_space.o \
 	   filter_avresample.o
 
+ifdef MMX_FLAGS
+	OBJS += filter_avdeinterlace.o
+endif
+
 CFLAGS+=-I../..
 
-LDFLAGS+=-lavformat -lavcodec $(EXTRA_LIBS)
-LDFLAGS+=-L../../framework -lmlt
+LDFLAGS+=-L../../framework
+
+LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(AVFORMAT_SUFFIX) -lavutil$(AVFORMAT_SUFFIX) $(EXTRA_LIBS) -lmlt
 
 SRCS := $(OBJS:.o=.c)
 
 all: 	$(TARGET)
 
 $(TARGET): $(OBJS)
-		if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg all ; fi
-		$(CC) -shared -o $@ $(OBJS) $(LDFLAGS)
+		if [ $(LOCAL_FFMPEG) ] ; then \
+			$(MAKE) -C ffmpeg all ; \
+			cp -f ffmpeg/libavcodec/libavcodec$(AVFORMAT_SUFFIX)$(LIBSUF) ../../framework/libavcodec$(AVFORMAT_SUFFIX)$(LIBSUF) ; \
+			cp -f ffmpeg/libavformat/libavformat$(AVFORMAT_SUFFIX)$(LIBSUF) ../../framework/libavformat$(AVFORMAT_SUFFIX)$(LIBSUF) ; \
+			cp -f ffmpeg/libavutil/libavutil$(AVFORMAT_SUFFIX)$(LIBSUF) ../../framework/libavutil$(AVFORMAT_SUFFIX)$(LIBSUF) ; \
+		fi
+		$(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:	
-		rm -f $(OBJS) $(TARGET) 
+		#if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg clean ; fi
+		rm -f ../../framework/libavcodec$(AVFORMAT_SUFFIX)$(LIBSUF) ../../framework/libavformat$(AVFORMAT_SUFFIX)$(LIBSUF) ../../framework/libavutil$(AVFORMAT_SUFFIX)$(LIBSUF) $(OBJS) $(TARGET) 
 
 install: all
-		install -m 755 $(TARGET) "$(prefix)/share/mlt/modules"
+		install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+		if [ $(LOCAL_FFMPEG) ] ; then \
+			install -m 755 ../../framework/libavcodec$(AVFORMAT_SUFFIX)$(LIBSUF) "$(DESTDIR)$(libdir)" ; \
+			install -m 755 ../../framework/libavformat$(AVFORMAT_SUFFIX)$(LIBSUF) "$(DESTDIR)$(libdir)" ; \
+			install -m 755 ../../framework/libavutil$(AVFORMAT_SUFFIX)$(LIBSUF) "$(DESTDIR)$(libdir)" ; \
+		fi
 
 ifneq ($(wildcard .depend),)
 include .depend