X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcommon.am;h=9bb5143547c26e4e7ff6c65576b4e3f20f12025e;hb=c9fb696cf17a2dda3850e2e40ac4f3f057905ee7;hp=47aa97c3f42cd608c0878ee0d18eab2801f18d94;hpb=41ce29d54dd9fc4a3989e03fce0aa9d6c93f42f0;p=vlc

diff --git a/modules/common.am b/modules/common.am
index 47aa97c3f4..9bb5143547 100644
--- a/modules/common.am
+++ b/modules/common.am
@@ -5,70 +5,38 @@
 #
 # Authors: Sam Hocevar <sam@zoy.org>
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 NULL =
-SUFFIXES =
-libvlcdir = $(libdir)/vlc/$(basedir)
-libvlc_LTLIBRARIES =
-EXTRA_DIST = Modules.am
+pluginsdir = $(vlclibdir)/plugins
 BUILT_SOURCES =
 CLEANFILES = $(BUILT_SOURCES)
 
-include $(srcdir)/Modules.am
-
-if HAVE_PLUGINS
-LTLIBVLC = $(top_builddir)/src/libvlc.la
+LTLIBVLCCORE = $(top_builddir)/src/libvlccore.la
 
-AM_CFLAGS = `$(VLC_CONFIG) --cflags plugin $@`
-AM_CXXFLAGS = `$(VLC_CONFIG) --cxxflags plugin $@`
-AM_OBJCFLAGS = `$(VLC_CONFIG) --objcflags plugin $@`
-AM_LDFLAGS = -rpath '$(libvlcdir)' \
-	-avoid-version -module -no-undefined \
-	-shrext $(LIBEXT) \
-	 `$(VLC_CONFIG) --ldflags plugin $@`
-AM_LIBADD = $(LTLIBVLC)
+# Module name from object or executable file name.
+MODULE_NAME = $$(p="$@"; p="$${p\#\#*/}"; p="$${p\#lib}"; p="$${p%_plugin*}"; p="$${p%.lo}"; echo "$$p")
 
-if HAVE_COMPILER_EXPORT
-AM_LDFLAGS += -export-dynamic
+AM_CPPFLAGS = -DMODULE_STRING=\"$(MODULE_NAME)\"
+if HAVE_DYNAMIC_PLUGINS
+AM_CPPFLAGS += -D__PLUGIN__
 else
-AM_LDFLAGS += -export-symbol-regex ^vlc_entry
+AM_CPPFLAGS += -DMODULE_NAME=$(MODULE_NAME)
 endif
+AM_CFLAGS =
+AM_CXXFLAGS =
+AM_OBJCFLAGS =
+AM_LDFLAGS = \
+	-avoid-version -module \
+	-export-symbols-regex ^vlc_entry \
+	-shrext $(LIBEXT) \
+	-no-undefined \
+	$(top_builddir)/compat/libcompat.la $(LTLIBVLCCORE) 
+if HAVE_WIN32
+AM_LDFLAGS += $(top_builddir)/modules/module.rc.lo
 endif
 
-all: all-modules
-
-nice:
-	$(top_builddir)/compile
-
-# Find out which modules were enabled and tell make to build them
-all-modules:
-	@set fnord $$MAKEFLAGS; amf=$$2; targets=`\
-	z=$$($(VLC_CONFIG) --list plugin); for mod in $(mods); do case "$$z " in *\ $${mod}\ *) echo lib$${mod}_plugin.la;; esac; done; \
-	`; case "$$targets" in *lib*) $(MAKE) $(AM_MAKEFLAGS) $$targets || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; ;; esac; \
-	test -z "$$fail"
-
-if MAINTAINER_MODE
-$(srcdir)/Makefile.am: $(srcdir)/Modules.am $(top_srcdir)/modules/genmf
-	cd \$(top_srcdir) && \$(SHELL) modules/genmf $(dir)
-endif
-
-mostlyclean-local:
-	-rm -f -- *.la
-
-### automake creates libvlcdir after running install-*-local
-### so we have to create it ourselves first
-install-exec-local: all-modules
-	@if test -z "$(libvlc_LTLIBRARIES)"; then \
-	  z=$$($(VLC_CONFIG) --list plugin); \
-	  m=`for mod in $(mods); do case "$$z " in *\ $${mod}\ *) printf " lib$${mod}_plugin.la" ;; esac; done` ; \
-	  test -z "$$m" || \
-	    $(MAKE) $(AM_MAKEFLAGS) libvlc_LTLIBRARIES="$$m" install-libvlcLTLIBRARIES || exit $$? ; \
-	fi
-
-uninstall-local:
-	@if test -z "$(libvlc_LTLIBRARIES)"; then \
-	  z=$$($(VLC_CONFIG) --list plugin); \
-	  m=`for mod in $(mods); do case "$$z " in *\ $${mod}\ *) printf " lib$${mod}_plugin.la" ;; esac; done` ; \
-	  test -z "$$m" || \
-	    $(MAKE) $(AM_MAKEFLAGS) libvlc_LTLIBRARIES="$$m" uninstall-libvlcLTLIBRARIES || exit $$?; \
-	fi
+SUFFIXES = .asm
 
+.asm.lo:
+	$(LIBTOOL) --mode=compile --tag=ASM $(YASM) $(YASMFLAGS) $< -o $@