X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2FMakefile;h=d36d6c68d30ece14c00734674174cd85c6f8046d;hb=bb52b9f3ce843820aca77ca7bc18adf1dcd61122;hp=38bfbecf117d5f469cc6a352f61ce9a0a7b288fc;hpb=6fd86f1596d75ebaa4703ca6e9735813331e5c2f;p=melted

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index 38bfbec..d36d6c6 100644
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -1,16 +1,28 @@
 include ../../../config.mak
 include config.mak
 
+ifndef CODECS
+TARGET = ../libmltffmpeg$(LIBSUF)
+else
 TARGET = ../libmltavformat$(LIBSUF)
+endif
+
+OBJS = factory.o
 
-OBJS = factory.o \
-	   producer_avformat.o \
-	   consumer_avformat.o \
-	   filter_avcolour_space.o \
-	   filter_avresample.o
+ifdef FILTERS
+OBJS += filter_avcolour_space.o \
+	    filter_avresample.o \
+	    filter_avdeinterlace.o
+ifdef SWSCALE
+OBJS += filter_swscale.o
+endif
+CFLAGS += -DFILTERS
+endif
 
-ifdef MMX_FLAGS
-	OBJS += filter_avdeinterlace.o
+ifdef CODECS
+OBJS += producer_avformat.o \
+	    consumer_avformat.o
+CFLAGS += -DCODECS
 endif
 
 CFLAGS+=-I../..
@@ -37,7 +49,7 @@ all: 	$(TARGET)
 
 $(LOCAL_FFMPEG_OBJS):
 	if [ $(LOCAL_FFMPEG) ] ; then \
-		$(MAKE) -C ffmpeg lib ; \
+		$(MAKE) -C ffmpeg ffmpeg ; \
 	fi
 
 $(TARGET): $(OBJS) $(LOCAL_FFMPEG_OBJS)
@@ -53,7 +65,7 @@ distclean:	clean
 
 clean:	
 	#if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg clean ; fi
-	rm -f $(OBJS) $(TARGET)
+	rm -f $(OBJS) ../libmltffmpeg$(LIBSUF) ../libmltavformat$(LIBSUF)
 
 install: all
 	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
@@ -61,8 +73,9 @@ install: all
 	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" 
+	rm "$(DESTDIR)$(libdir)/mlt/libmltavformat$(LIBSUF)" 2> /dev/null || true
+	rm "$(DESTDIR)$(libdir)/mlt/libmltffmpeg$(LIBSUF)" 2> /dev/null || true
+	rm -rf "$(DESTDIR)$(prefix)/share/mlt/avformat"
 
 ifneq ($(wildcard .depend),)
 include .depend