X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcommon.am;h=9bb5143547c26e4e7ff6c65576b4e3f20f12025e;hb=2f85ce3036d94b40ba3e72eb22bf5f6fb2f341b8;hp=a8f7d5de855fd12857afee17c996604465b16d2f;hpb=0bafe94c50caf457afc5d0a244695db4f6122a09;p=vlc

diff --git a/modules/common.am b/modules/common.am
index a8f7d5de85..9bb5143547 100644
--- a/modules/common.am
+++ b/modules/common.am
@@ -5,37 +5,38 @@
 #
 # Authors: Sam Hocevar <sam@zoy.org>
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 NULL =
-libvlcdir = $(vlclibdir)/plugins/$(basedir)
-EXTRA_DIST = Modules.am
+pluginsdir = $(vlclibdir)/plugins
 BUILT_SOURCES =
 CLEANFILES = $(BUILT_SOURCES)
 
 LTLIBVLCCORE = $(top_builddir)/src/libvlccore.la
 
 # Module name from object or executable file name.
-MODULE_NAME = $$(p="$@"; p="$${p\#\#*/}"; p="$${p\#lib}"; echo "$${p%_plugin*}")
+MODULE_NAME = $$(p="$@"; p="$${p\#\#*/}"; p="$${p\#lib}"; p="$${p%_plugin*}"; p="$${p%.lo}"; echo "$$p")
 
-AM_CPPFLAGS = \
-	-DMODULE_NAME=$(MODULE_NAME) \
-	-DMODULE_NAME_IS_$(MODULE_NAME) \
-	-DMODULE_STRING=\"$(MODULE_NAME)\"
+AM_CPPFLAGS = -DMODULE_STRING=\"$(MODULE_NAME)\"
 if HAVE_DYNAMIC_PLUGINS
 AM_CPPFLAGS += -D__PLUGIN__
+else
+AM_CPPFLAGS += -DMODULE_NAME=$(MODULE_NAME)
 endif
 AM_CFLAGS =
 AM_CXXFLAGS =
 AM_OBJCFLAGS =
-AM_LDFLAGS = -rpath '$(libvlcdir)' \
+AM_LDFLAGS = \
 	-avoid-version -module \
 	-export-symbols-regex ^vlc_entry \
 	-shrext $(LIBEXT) \
-	-no-undefined
-AM_LIBADD = $(LTLIBVLCCORE) $(top_builddir)/compat/libcompat.la $(LIBS_plugin)
+	-no-undefined \
+	$(top_builddir)/compat/libcompat.la $(LTLIBVLCCORE) 
+if HAVE_WIN32
+AM_LDFLAGS += $(top_builddir)/modules/module.rc.lo
+endif
 
-include $(srcdir)/Modules.am
+SUFFIXES = .asm
 
-if MAINTAINER_MODE
-$(srcdir)/Makefile.am: $(srcdir)/Modules.am $(top_srcdir)/modules/genmf
-	$(AM_V_GEN)cd \$(top_srcdir) && \$(SHELL) modules/genmf $(dir)
-endif
+.asm.lo:
+	$(LIBTOOL) --mode=compile --tag=ASM $(YASM) $(YASMFLAGS) $< -o $@