Fix setting muxer-specific options (SF-197).

[mlt] / src / modules / avformat / Makefile

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index 976f59513db5211ae136523a7d71d0b2a57bb2ab..0d26b04b8aeaa6d4bd34de3931340ad12eb155bb 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -1,15 +1,14 @@
-include ../../../config.mak
-
 CFLAGS += -I../..
-
 LDFLAGS += -L../../framework -lmlt -lpthread
 
+include ../../../config.mak
 include config.mak
 
 LDFLAGS += -lavformat$(AVFORMAT_SUFFIX)
 LDFLAGS += -lavcodec$(AVFORMAT_SUFFIX)
 LDFLAGS += -lavutil$(AVFORMAT_SUFFIX)
-LDFLAGS += -lavdevice$(AVFORMAT_SUFFIX) $(EXTRA_LIBS)
+LDFLAGS += -lswscale$(AVFORMAT_SUFFIX)
+LDFLAGS += $(EXTRA_LIBS)
 
 ifndef CODECS
 TARGET = ../libmltffmpeg$(LIBSUF)
@@ -22,64 +21,53 @@ OBJS = factory.o
 ifdef FILTERS
 OBJS += filter_avcolour_space.o \
            filter_avresample.o \
-           filter_avdeinterlace.o
-ifdef SWSCALE
-OBJS += filter_swscale.o
-endif
+           filter_avdeinterlace.o \
+           filter_swscale.o
 CFLAGS += -DFILTERS
 endif
 
+ifdef VDPAU
+CFLAGS += -DVDPAU `pkg-config --cflags x11`
+LDFLAGS += $(LIBDL) `pkg-config --libs x11`
+endif
+
 ifdef CODECS
 OBJS += producer_avformat.o \
            consumer_avformat.o
 CFLAGS += -DCODECS
 endif
 
-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) \
-                    ffmpeg/libavutil/libavdevice$(AVFORMAT_SUFFIX)
+ifdef DEVICES
+CFLAGS += -DAVDEVICE
+LDFLAGS += -lavdevice$(AVFORMAT_SUFFIX)
 endif
 
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)
 
-$(LOCAL_FFMPEG_OBJS):
-       if [ $(LOCAL_FFMPEG) ] ; then \
-               $(MAKE) -C ffmpeg ffmpeg ; \
-       fi
-
-$(TARGET): $(OBJS) $(LOCAL_FFMPEG_OBJS)
+$(TARGET): $(OBJS)
        $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
 
 depend:        $(SRCS)
-       if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg dep ; fi
        $(CC) -MM $(CFLAGS) $^ 1>.depend
 
 distclean:     clean
-       if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg distclean ; fi
        rm -f .depend
 
 clean: 
-       #if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg clean ; fi
        rm -f $(OBJS) ../libmltffmpeg$(LIBSUF) ../libmltavformat$(LIBSUF)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(datadir)/mlt/avformat"
-       install -m 644 producer_avformat.yml "$(DESTDIR)$(datadir)/mlt/avformat"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/avformat"
+       install -m 644 producer_avformat.yml "$(DESTDIR)$(mltdatadir)/avformat"
+       install -m 644 consumer_avformat.yml "$(DESTDIR)$(mltdatadir)/avformat"
 
 uninstall:
-       rm "$(DESTDIR)$(libdir)/mlt/libmltavformat$(LIBSUF)" 2> /dev/null || true
-       rm "$(DESTDIR)$(libdir)/mlt/libmltffmpeg$(LIBSUF)" 2> /dev/null || true
-       rm -rf "$(DESTDIR)$(datadir)/mlt/avformat"
+       rm "$(DESTDIR)$(moduledir)/libmltavformat$(LIBSUF)" 2> /dev/null || true
+       rm "$(DESTDIR)$(moduledir)/libmltffmpeg$(LIBSUF)" 2> /dev/null || true
+       rm -rf "$(DESTDIR)$(mltdatadir)/avformat"
 
 ifneq ($(wildcard .depend),)
 include .depend