rawvid: fix error handling

[vlc] / modules / Makefile.am

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 4ac47bda1431a8d4256f81f827a3cda757844d67..dc0fb39e6384b80aa1b9ac4d283ad68017458580 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1,31 +1,70 @@
+noinst_LTLIBRARIES =
+noinst_HEADERS =
+check_PROGRAMS =
+
 BASE_SUBDIRS = \
-       access \
        audio_filter \
-       audio_mixer \
-       audio_output \
-       codec \
        control \
-       demux \
        gui \
-       meta_engine \
        misc \
        packetizer \
-       services_discovery \
-       stream_filter \
-       video_chroma \
+       text_renderer \
        video_filter \
        video_output \
        visualization
 EXTRA_SUBDIRS = \
        access_output \
        mux \
-       stream_out
+       stream_out \
+       hw/vdpau
 
-SUBDIRS = $(BASE_SUBDIRS)
-DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
+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
+endif
+
+TESTS =
+
+dist_noinst_SCRIPTS = genmf list.sh module.rc.in
+dist_noinst_DATA = MODULES_LIST
+
+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 lua/Makefile.am
+include meta_engine/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
 
-dist_noinst_SCRIPTS = genmf list.sh
-dist_noinst_DATA = LIST
+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