X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2FMakefile;h=8d45fc6a2071d093053b1350cf83f833d45c5b18;hb=2c3bf9c72ca4986dee0d6abcefb9227d7172c7cf;hp=b9e801adf188eba217a2a3a25a7cbccf34cc0987;hpb=30bf05a2dc3d17d9cf87300e07e66828fd729c17;p=melted

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index b9e801a..8d45fc6 100644
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -19,17 +19,27 @@ LDFLAGS+=-L../../framework
 
 LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(AVFORMAT_SUFFIX) -lavutil$(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)
+endif
+
 SRCS := $(OBJS:.o=.c)
 
 all: 	$(TARGET)
 
-$(TARGET): $(OBJS)
+$(LOCAL_FFMPEG_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) ; \
+			$(MAKE) -C ffmpeg lib ; \
 		fi
+
+$(TARGET): $(OBJS) $(LOCAL_FFMPEG_OBJS)
 		$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
 
 depend:	$(SRCS)
@@ -42,15 +52,10 @@ distclean:	clean
 
 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) 
+		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
 
 ifneq ($(wildcard .depend),)
 include .depend