X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2FMakefile;h=d5096fa44f473f0185e1b6520445fca816b4978e;hb=d4457eefde2e74e4dd5d927f37a89ed52e4b4cf9;hp=5ca36627a01aa72e714b0fb0a4d30dba59f467c8;hpb=a4799884f16e60db669cdf7ce6e15f160e3c7613;p=melted

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index 5ca3662..d5096fa 100644
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -1,33 +1,39 @@
 include ../../../config.mak
+include config.mak
 
 TARGET = ../libmltavformat.so
 
 OBJS = factory.o \
 	   producer_avformat.o \
-	   consumer_avformat.o
+	   consumer_avformat.o \
+	   filter_avdeinterlace.o \
+	   filter_avresample.o
 
-CFLAGS += -I../..
+CFLAGS+=-I../..
 
-LDFLAGS = -lavformat -lavcodec
+LDFLAGS+=-lavformat -lavcodec $(EXTRA_LIBS)
 
 SRCS := $(OBJS:.o=.c)
 
 all: 	$(TARGET)
 
 $(TARGET): $(OBJS)
+		if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg all ; fi
 		$(CC) -shared -o $@ $(OBJS) $(LDFLAGS)
 
 depend:	$(SRCS)
+		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
 
 clean:	
 		rm -f $(OBJS) $(TARGET) 
 
 install: all
-	install -m 755 $(TARGET) "$(prefix)/share/mlt/modules"
+		install -m 755 $(TARGET) "$(prefix)/share/mlt/modules"
 
 ifneq ($(wildcard .depend),)
 include .depend