X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2FMakefile;h=42180f7ff6bc678944a7fe94a1d047b429baa50f;hb=70933f360aa7d16e5140267ce2f716de924464c7;hp=d9ee317879eb0d60ca978e863c2f22aea5d95718;hpb=cef70011d08af33924ab3b97d628deefce47b953;p=melted

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index d9ee317..42180f7 100644
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -17,45 +17,52 @@ CFLAGS+=-I../..
 
 LDFLAGS+=-L../../framework
 
-LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(AVFORMAT_SUFFIX) -lavutil$(AVFORMAT_SUFFIX) $(EXTRA_LIBS) -lmlt
+LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(AVFORMAT_SUFFIX) -lavutil$(AVFORMAT_SUFFIX) -lavdevice$(AVFORMAT_SUFFIX) $(EXTRA_LIBS) -lmlt
 
-ifdef MMX_FLAGS
+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) ; \
-			cp -f ffmpeg/libavutil/libavutil$(AVFORMAT_SUFFIX)$(LIBSUF) ../../framework/libavutil$(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
 
 distclean:	clean
-		if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg distclean ; fi
-		rm -f .depend
+	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) ../../framework/libavutil$(AVFORMAT_SUFFIX)$(LIBSUF) $(OBJS) $(TARGET) 
+	#if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg clean ; fi
+	rm -f $(OBJS) $(TARGET)
 
 install: all
-		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
+	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