X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2FMakefile;h=14ecbb84235da5c05d7e432bdcca343c542740de;hb=9a0ecebf52e5953b5fd7f0e9535d0a19dd085169;hp=4a8ff3a0866ead5d95c6b40e2d42006d603604d1;hpb=7fd4b678aec4cace40b23077c7e1275c16f45a1c;p=mlt

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index 4a8ff3a0..14ecbb84 100644
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -1,15 +1,13 @@
-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 += $(EXTRA_LIBS)
 
 ifndef CODECS
 TARGET = ../libmltffmpeg$(LIBSUF)
@@ -29,6 +27,11 @@ endif
 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
@@ -40,46 +43,37 @@ 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)$(prefix)/share/mlt/avformat"
-	install -m 644 producer_avformat.yml "$(DESTDIR)$(prefix)/share/mlt/avformat"
+	install -d "$(DESTDIR)$(datadir)/mlt/avformat"
+	install -m 644 producer_avformat.yml "$(DESTDIR)$(datadir)/mlt/avformat"
+	install -m 644 consumer_avformat.yml "$(DESTDIR)$(datadir)/mlt/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)$(prefix)/share/mlt/avformat"
+	rm -rf "$(DESTDIR)$(datadir)/mlt/avformat"
 
 ifneq ($(wildcard .depend),)
 include .depend