X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2FMakefile.am;h=dc0fb39e6384b80aa1b9ac4d283ad68017458580;hb=b2edfd78d4d572171dd9a43ee82fcc599fc1e7df;hp=e622ecb9d4923c734ca3be43de5e63d22784b1ac;hpb=7e3c4b6648314a6f0cc79d9818540c0479fb8815;p=vlc

diff --git a/modules/Makefile.am b/modules/Makefile.am
index e622ecb9d4..dc0fb39e63 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1,66 +1,70 @@
-NULL =
+noinst_LTLIBRARIES =
+noinst_HEADERS =
+check_PROGRAMS =
+
 BASE_SUBDIRS = \
-	access \
 	audio_filter \
-	audio_mixer \
-	audio_output \
-	codec \
 	control \
-	demux \
 	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 \
-	mmx \
-	sse2 \
-	altivec \
-	arm_neon \
-	hw/vdpau \
-	lua \
-	$(NULL)
+	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_MMX
-SUBDIRS += mmx
-endif
-if HAVE_SSE2
-SUBDIRS += sse2
-endif
-if HAVE_ALTIVEC
-SUBDIRS += altivec
-endif
-if HAVE_NEON
-SUBDIRS += arm_neon
-endif
 if HAVE_VDPAU
 SUBDIRS += hw/vdpau
 endif
-if BUILD_LUA
-SUBDIRS += lua
-endif
-SUBDIRS += .
+
+TESTS =
 
 dist_noinst_SCRIPTS = genmf list.sh module.rc.in
-dist_noinst_DATA = LIST
+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
+
+BUILT_SOURCES += dummy.cpp
+
+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