X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2FMakefile;h=07ac987c9c89a382ae013cd06e05c2a6be50efa3;hb=21dc56743b907328aee0625b023539dc7bb912d8;hp=aba87afffb7462ac2939eaf13de7c47c13e243ed;hpb=8cf0f77981284b7549c811b67283eb73d0c520d6;p=melted

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index aba87af..07ac987 100644
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -1,27 +1,39 @@
 include ../../../config.mak
 include config.mak
 
-TARGET = ../libmltavformat.so
+TARGET = ../libmltavformat$(LIBSUF)
 
 OBJS = factory.o \
 	   producer_avformat.o \
 	   consumer_avformat.o \
 	   filter_avcolour_space.o \
-	   filter_avdeinterlace.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
+
+ifdef LOCAL_FFMPEG 
+	LDFLAGS+=-lavformat.mlt -lavcodec.mlt $(EXTRA_LIBS) -lmlt
+else
+	LDFLAGS+=-lavformat -lavcodec $(EXTRA_LIBS) -lmlt
+endif
 
 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$(LIBSUF) ../../framework/libavcodec.mlt$(LIBSUF) ; \
+			cp -f ffmpeg/libavformat/libavformat$(LIBSUF) ../../framework/libavformat.mlt$(LIBSUF) ; \
+		fi
+		$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
 
 depend:	$(SRCS)
 		if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg dep ; fi
@@ -32,11 +44,15 @@ dist-clean:	clean
 		rm -f .depend
 
 clean:	
-		if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg clean ; fi
+		#if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg clean ; fi
 		rm -f $(OBJS) $(TARGET) 
 
 install: all
 		install -m 755 $(TARGET) "$(prefix)/share/mlt/modules"
+		if [ $(LOCAL_FFMPEG) ] ; then \
+			install -m 755 ../../framework/libavcodec.mlt$(LIBSUF) "$(prefix)/lib" ; \
+			install -m 755 ../../framework/libavformat.mlt$(LIBSUF) "$(prefix)/lib" ; \
+		fi
 
 ifneq ($(wildcard .depend),)
 include .depend