X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2FMakefile.am;h=85fd000a6edd0817bb871978d68d7197e4b9b979;hb=d47fcbb413a08efbe65d72c3b79d83c39c8685fa;hp=0e76750d646ad9e82e920ce61dac21fbb1328f04;hpb=9854c23e68d44e792ebfff16b4968ee344c50973;p=vlc

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 0e76750d64..85fd000a6e 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1,49 +1,54 @@
 noinst_LTLIBRARIES =
 noinst_HEADERS =
+check_PROGRAMS =
+EXTRA_DIST =
 
-BASE_SUBDIRS = \
-	access/rtp \
-	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)
-DIST_SUBDIRS = . $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
-if ENABLE_SOUT
-SUBDIRS += access_output mux stream_out
-endif
-if HAVE_VDPAU
-SUBDIRS += hw/vdpau
+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
+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
 
@@ -65,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" "$@"