X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2FMakefile.am;h=f05787149870e657fa88bcd6248498231de6cab8;hb=bf2b378cbabb55c864298a7368efcfa41c2aba76;hp=a589972f7072c98e926ece5a5f564fea38357829;hpb=37af544562bcb1fa1aadd0f3f1379569fa4bc128;p=vlc

diff --git a/modules/Makefile.am b/modules/Makefile.am
index a589972f70..f057871498 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1,64 +1,55 @@
 noinst_LTLIBRARIES =
 noinst_HEADERS =
+check_PROGRAMS =
+EXTRA_DIST =
 
 BASE_SUBDIRS = \
-	access/rtp \
 	audio_filter \
-	audio_mixer \
-	audio_output \
 	control \
 	gui \
-	meta_engine \
-	misc \
-	notify \
 	packetizer \
-	services_discovery \
-	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
+if HAVE_MMAL
+SUBDIRS += hw/mmal
 endif
 
-dist_noinst_SCRIPTS = genmf list.sh module.rc.in
-dist_noinst_DATA = LIST
+TESTS =
 
-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
+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_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
 
@@ -66,6 +57,28 @@ dummy.cpp:
 	touch dummy.cpp
 
 if HAVE_WIN32
-module.rc: $(top_builddir)/modules/module.rc.in $(top_builddir)/config.status
+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
+
+# 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" "$@"