mmal/vout: Use cached framerate for phase adjust

[vlc] / modules / Makefile.am

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 005c15017dce23a7ab74fe4dbc8fa7dfb0c274c2..f05787149870e657fa88bcd6248498231de6cab8 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1,22 +1,20 @@
 noinst_LTLIBRARIES =
 noinst_HEADERS =
 check_PROGRAMS =
+EXTRA_DIST =
 
 BASE_SUBDIRS = \
        audio_filter \
        control \
        gui \
-       misc \
        packetizer \
        text_renderer \
        video_filter \
-       video_output \
        visualization
 EXTRA_SUBDIRS = \
        access_output \
        mux \
        stream_out \
-       hw/vdpau \
        hw/mmal
 
 SUBDIRS = . $(BASE_SUBDIRS)
@@ -24,9 +22,6 @@ DIST_SUBDIRS = . $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
 if ENABLE_SOUT
 SUBDIRS += access_output mux stream_out
 endif
-if HAVE_VDPAU
-SUBDIRS += hw/vdpau
-endif
 if HAVE_MMAL
 SUBDIRS += hw/mmal
 endif
@@ -35,6 +30,7 @@ TESTS =
 
 dist_noinst_SCRIPTS = genmf list.sh module.rc.in
 dist_noinst_DATA = MODULES_LIST
+EXTRA_LTLIBRARIES =
 
 include common.am
 include access/Makefile.am
@@ -44,13 +40,16 @@ include audio_mixer/Makefile.am
 include audio_output/Makefile.am
 include codec/Makefile.am
 include demux/Makefile.am
+include hw/vdpau/Makefile.am
 include lua/Makefile.am
 include meta_engine/Makefile.am
+include misc/Makefile.am
 include notify/Makefile.am
 include services_discovery/Makefile.am
 include stream_filter/Makefile.am
 include video_chroma/Makefile.am
 include video_splitter/Makefile.am
+include video_output/Makefile.am
 
 BUILT_SOURCES += dummy.cpp
 
@@ -72,3 +71,14 @@ module.rc.lo: module.rc
                -i $< -o $@
        echo HELLO
 endif
+
+# Wayland
+SUFFIXES += -client-protocol.h -protocol.c .xml
+
+.xml-client-protocol.h:
+       $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < "$^" > "$@.tmp"
+       $(AM_V_at)mv -f -- "$@.tmp" "$@"
+
+.xml-protocol.c:
+       $(AM_V_GEN)$(WAYLAND_SCANNER) code < "$^" > "$@.tmp"
+       $(AM_V_at)mv -f -- "$@.tmp" "$@"