mediacodec: skip prerolled frames

[vlc] / modules / Makefile.am

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 39abdbc73419b5b15e650935608fd24d723c3103..85fd000a6edd0817bb871978d68d7197e4b9b979 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1,77 +1,83 @@
-NULL =
-BASE_SUBDIRS = \
-       access \
-       audio_filter \
-       audio_mixer \
-       audio_output \
-       codec \
-       control \
-       demux \
-       gui \
-       meta_engine \
-       misc \
-       packetizer \
-       services_discovery \
-       stream_filter \
-       video_chroma \
-       video_filter \
-       video_output \
-       visualization
+noinst_LTLIBRARIES =
+noinst_HEADERS =
+check_PROGRAMS =
+EXTRA_DIST =
+
 EXTRA_SUBDIRS = \
-       access_output \
-       mux \
-       stream_out \
-       mmx \
-       mmxext \
-       sse2 \
-       3dnow \
-       altivec \
-       arm_neon \
-       $(NULL)
+       hw/mmal
 
-SUBDIRS = $(BASE_SUBDIRS)
-DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS) .
-if ENABLE_SOUT
-SUBDIRS += access_output mux stream_out
-endif
-if HAVE_MMX
-SUBDIRS += mmx
-endif
-if HAVE_MMXEXT
-SUBDIRS += mmxext
+SUBDIRS = .
+DIST_SUBDIRS = . $(EXTRA_SUBDIRS)
+if HAVE_MMAL
+SUBDIRS += hw/mmal
 endif
-if HAVE_SSE2
-SUBDIRS += sse2
-endif
-if HAVE_3DNOW
-SUBDIRS += 3dnow
-endif
-if HAVE_ALTIVEC
-SUBDIRS += altivec
-endif
-if HAVE_ARM_NEON
-SUBDIRS += arm_neon
+
+TESTS =
+
+dist_noinst_SCRIPTS = genmf list.sh module.rc.in
+dist_noinst_DATA = MODULES_LIST
+EXTRA_LTLIBRARIES =
+
+include common.am
+include access/Makefile.am
+include access/rtp/Makefile.am
+include arm_neon/Makefile.am
+include audio_filter/Makefile.am
+include audio_mixer/Makefile.am
+include audio_output/Makefile.am
+include codec/Makefile.am
+include control/Makefile.am
+include demux/Makefile.am
+include gui/Makefile.am
+include hw/vdpau/Makefile.am
+include logger/Makefile.am
+include lua/Makefile.am
+include meta_engine/Makefile.am
+include misc/Makefile.am
+include notify/Makefile.am
+include packetizer/Makefile.am
+include services_discovery/Makefile.am
+include stream_filter/Makefile.am
+include text_renderer/Makefile.am
+include video_chroma/Makefile.am
+include video_filter/Makefile.am
+include video_splitter/Makefile.am
+include video_output/Makefile.am
+include visualization/Makefile.am
+if ENABLE_SOUT
+include access_output/Makefile.am
+include mux/Makefile.am
+include stream_out/Makefile.am
 endif
-SUBDIRS += .
 
-dist_noinst_SCRIPTS = genmf list.sh
-dist_noinst_DATA = LIST
-noinst_DATA = stamp-cache
-MOSTLYCLEANFILES = stamp-cache plugins-*-*.dat
+BUILT_SOURCES += dummy.cpp
+
+dummy.cpp:
+       touch dummy.cpp
+
+if HAVE_WIN32
+BUILT_SOURCES += module.rc.lo
+CLEANFILES += module.rc
+#noinst_DATA = module.rc.lo
+
+module.rc: module.rc.in $(top_builddir)/config.status
+       $(AM_V_GEN) cd "$(top_builddir)" && $(SHELL) ./config.status --file="modules/$@"
+
+module.rc.lo: module.rc
+       $(AM_V_GEN) $(LIBTOOL) --tag=RC --mode=compile $(WINDRES) \
+               --include-dir $(top_srcdir)/share \
+               --include-dir $(top_srcdir)/extras/package/win32 \
+               -i $< -o $@
+       echo HELLO
+endif
 
-.PHONY: stamp-cache
+# Wayland
+SUFFIXES += -client-protocol.h -protocol.c .xml
 
-stamp-cache:
-       $(AM_V_GEN)if test "$(build)" = "$(host)"; then \
-               ../bin/vlc-cache-gen$(EXEEXT) . ; \
-       else \
-               echo "Cross-compilation: cache generation skipped!" ; \
-       fi
-       $(AM_V_at)touch stamp-cache
+.xml-client-protocol.h:
+       $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < "$^" > "$@.tmp"
+       $(AM_V_at)mv -f -- "$@.tmp" "$@"
 
-install-exec-hook:
-       if test -z "$(DESTDIR)" -a "$(build)" = "$(host)"; then \
-               ../bin/vlc-cache-gen$(EXEEXT) "$(vlclibdir)/plugins" ; \
-       else \
-               echo "Staged installation: cache generation skipped!" ; \
-       fi
+.xml-protocol.c:
+       $(AM_V_GEN)$(WAYLAND_SCANNER) code < "$^" > "$@.tmp"
+       $(AM_V_at)mv -f -- "$@.tmp" "$@"