X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2FMakefile;h=7d889435ca1d23d7aded41a845039c9eaa7c2009;hb=e89b21b07607ae485f56b32f3e67f83f528f2ae6;hp=6a6dd5cbfb548fd251542947e416ea6aece8a0ca;hpb=20e57e509a9849d166c4e3d9805746788a275ab7;p=melted

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index 6a6dd5c..7d88943 100644
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -1,12 +1,33 @@
 include ../../../config.mak
+
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt
+
 include config.mak
 
+LDFLAGS += -lavformat$(AVFORMAT_SUFFIX)
+LDFLAGS += -lavcodec$(AVFORMAT_SUFFIX)
+LDFLAGS += -lavutil$(AVFORMAT_SUFFIX)
+LDFLAGS += -lavdevice$(AVFORMAT_SUFFIX) $(EXTRA_LIBS)
+
+ifndef CODECS
+TARGET = ../libmltffmpeg$(LIBSUF)
+else
 TARGET = ../libmltavformat$(LIBSUF)
+endif
+
+OBJS = factory.o
 
-OBJS = factory.o \
-	   filter_avcolour_space.o \
-	   filter_avresample.o \
-	   filter_avdeinterlace.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 CODECS
 OBJS += producer_avformat.o \
@@ -14,22 +35,16 @@ OBJS += producer_avformat.o \
 CFLAGS += -DCODECS
 endif
 
-CFLAGS+=-I../..
-
-LDFLAGS+=-L../../framework
-
-LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(AVFORMAT_SUFFIX) -lavutil$(AVFORMAT_SUFFIX) -lavdevice$(AVFORMAT_SUFFIX) $(EXTRA_LIBS) -lmlt
-
 ifdef SWSCALE
-	CFLAGS+=-DSWSCALE
-	LDFLAGS+=-lswscale$(AVFORMAT_SUFFIX)
+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)
+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)
@@ -54,7 +69,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"
@@ -62,8 +77,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