udp: fix locking (fixes #14234) and cancellation

[vlc] / modules / Makefile.am

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 385942eb8f84005b7b26ab3120782f027464bc29..85fd000a6edd0817bb871978d68d7197e4b9b979 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1,64 +1,54 @@
 noinst_LTLIBRARIES =
 noinst_HEADERS =
+check_PROGRAMS =
+EXTRA_DIST =
 
-BASE_SUBDIRS = \
-       access/rtp \
-       audio_filter \
-       audio_mixer \
-       control \
-       gui \
-       misc \
-       notify \
-       packetizer \
-       stream_filter \
-       text_renderer \
-       video_chroma \
-       video_filter \
-       video_output \
-       video_splitter \
-       visualization
 EXTRA_SUBDIRS = \
-       access_output \
-       mux \
-       stream_out \
-       arm_neon \
-       hw/vdpau \
-       lua
+       hw/mmal
 
-SUBDIRS = . $(BASE_SUBDIRS)
-DIST_SUBDIRS = . $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
-if ENABLE_SOUT
-SUBDIRS += access_output mux stream_out
-endif
-if HAVE_NEON
-SUBDIRS += arm_neon
-endif
-if HAVE_VDPAU
-SUBDIRS += hw/vdpau
-endif
-if BUILD_LUA
-SUBDIRS += lua
+SUBDIRS = .
+DIST_SUBDIRS = . $(EXTRA_SUBDIRS)
+if HAVE_MMAL
+SUBDIRS += hw/mmal
 endif
 
+TESTS =
+
 dist_noinst_SCRIPTS = genmf list.sh module.rc.in
 dist_noinst_DATA = MODULES_LIST
-
-libvlc_pulse_la_SOURCES = vlcpulse.c vlcpulse.h
-libvlc_pulse_la_CPPFLAGS = -DMODULE_STRING=\"pulse\"
-libvlc_pulse_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS)
-libvlc_pulse_la_LDFLAGS = -static
-libvlc_pulse_la_LIBADD = $(PULSE_LIBS)
-if HAVE_PULSE
-noinst_LTLIBRARIES += libvlc_pulse.la
-endif
+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
 
 BUILT_SOURCES += dummy.cpp
 
@@ -80,3 +70,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" "$@"