X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2FMakefile;h=6a6dd5cbfb548fd251542947e416ea6aece8a0ca;hb=20e57e509a9849d166c4e3d9805746788a275ab7;hp=dd83b8bfb6fe127558e83911445b533f33d01d04;hpb=9ec066d86a9b790b19c44f4908e3897fef56042b;p=melted

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index dd83b8b..6a6dd5c 100644
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -4,51 +4,66 @@ include config.mak
 TARGET = ../libmltavformat$(LIBSUF)
 
 OBJS = factory.o \
-	   producer_avformat.o \
-	   consumer_avformat.o \
 	   filter_avcolour_space.o \
-	   filter_avresample.o
+	   filter_avresample.o \
+	   filter_avdeinterlace.o
 
-ifdef MMX_FLAGS
-	OBJS += filter_avdeinterlace.o
+ifdef CODECS
+OBJS += producer_avformat.o \
+	    consumer_avformat.o
+CFLAGS += -DCODECS
 endif
 
 CFLAGS+=-I../..
 
 LDFLAGS+=-L../../framework
 
-LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(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
+	LDFLAGS+=-lswscale$(AVFORMAT_SUFFIX)
+endif
+
+ifdef LOCAL_FFMPEG
+	LOCAL_FFMPEG_OBJS = ffmpeg/libavformat/libavformat$(AVFORMAT_SUFFIX) \
+	                    ffmpeg/libavcodec/libavcodec$(AVFORMAT_SUFFIX) \
+	                    ffmpeg/libavutil/libavutil$(AVFORMAT_SUFFIX) \
+	                    ffmpeg/libavutil/libavdevice$(AVFORMAT_SUFFIX)
+endif
 
 SRCS := $(OBJS:.o=.c)
 
 all: 	$(TARGET)
 
-$(TARGET): $(OBJS)
-		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) ; \
-		fi
-		$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
+$(LOCAL_FFMPEG_OBJS):
+	if [ $(LOCAL_FFMPEG) ] ; then \
+		$(MAKE) -C ffmpeg ffmpeg ; \
+	fi
+
+$(TARGET): $(OBJS) $(LOCAL_FFMPEG_OBJS)
+	$(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
 
-dist-clean:	clean
-		if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg dist-clean ; fi
-		rm -f .depend
+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 ../../framework/libavcodec$(AVFORMAT_SUFFIX)$(LIBSUF) ../../framework/libavformat$(AVFORMAT_SUFFIX)$(LIBSUF) $(OBJS) $(TARGET) 
+	#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$(AVFORMAT_SUFFIX)$(LIBSUF) "$(prefix)/lib" ; \
-			install -m 755 ../../framework/libavformat$(AVFORMAT_SUFFIX)$(LIBSUF) "$(prefix)/lib" ; \
-		fi
+	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