X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2FMakefile;h=aba87afffb7462ac2939eaf13de7c47c13e243ed;hb=8cf0f77981284b7549c811b67283eb73d0c520d6;hp=e258004fb4e6f5ddde71c3c186b71b55aade1ce6;hpb=1f8135566477df29f2b62528f9bf18359c0ab971;p=melted

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index e258004..aba87af 100644
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -1,35 +1,42 @@
 include ../../../config.mak
+include config.mak
 
 TARGET = ../libmltavformat.so
 
 OBJS = factory.o \
 	   producer_avformat.o \
 	   consumer_avformat.o \
+	   filter_avcolour_space.o \
 	   filter_avdeinterlace.o \
 	   filter_avresample.o
 
-CFLAGS += -I../..
+CFLAGS+=-I../..
 
-LDFLAGS += -lavformat -lavcodec
+LDFLAGS+=-lavformat -lavcodec $(EXTRA_LIBS)
+LDFLAGS+=-L../../framework -lmlt
 
 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:	
+		if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg clean ; fi
 		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