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

diff --git a/modules/Makefile.am b/modules/Makefile.am
index b84f2d91db..dc0fb39e63 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1,20 +1,14 @@
-NULL =
+noinst_LTLIBRARIES =
+noinst_HEADERS =
+check_PROGRAMS =
+
 BASE_SUBDIRS = \
-	access \
 	audio_filter \
-	audio_mixer \
-	audio_output \
-	codec \
 	control \
-	demux \
 	gui \
-	meta_engine \
 	misc \
-	media_library \
 	packetizer \
-	services_discovery \
-	stream_filter \
-	video_chroma \
+	text_renderer \
 	video_filter \
 	video_output \
 	visualization
@@ -22,61 +16,55 @@ EXTRA_SUBDIRS = \
 	access_output \
 	mux \
 	stream_out \
-	mmx \
-	mmxext \
-	sse2 \
-	3dnow \
-	altivec \
-	arm_neon \
-	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_MMXEXT
-SUBDIRS += mmxext
-endif
-if HAVE_SSE2
-SUBDIRS += sse2
-endif
-if HAVE_3DNOW
-SUBDIRS += 3dnow
-endif
-if HAVE_ALTIVEC
-SUBDIRS += altivec
-endif
-if HAVE_ARM_NEON
-SUBDIRS += arm_neon
+if HAVE_VDPAU
+SUBDIRS += hw/vdpau
 endif
-if BUILD_LUA
-SUBDIRS += lua
-endif
-SUBDIRS += .
 
-dist_noinst_SCRIPTS = genmf list.sh
-dist_noinst_DATA = LIST
-MOSTLYCLEANFILES = plugins.dat*
+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
 
-.PHONY: stamp-cache
+BUILT_SOURCES += dummy.cpp
 
-stamp-cache:
-	$(AM_V_GEN)if test "$(build)" = "$(host)"; then \
-		../bin/vlc-cache-gen$(EXEEXT) . ; \
-	else \
-		echo "Cross-compilation: cache generation skipped!" ; \
-	fi
+dummy.cpp:
+	touch dummy.cpp
 
-install-exec-hook:
-	if test -z "$(DESTDIR)" -a "$(build)" = "$(host)"; then \
-		LD_LIBRARY_PATH="$(libdir)" \
-		"$(vlclibdir)/vlc-cache-gen$(EXEEXT)" \
-			 "$(vlclibdir)/plugins" ; \
-	else \
-		echo "Staged installation: cache generation skipped!" ; \
-	fi
+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