X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcommon.am;h=94fb399bd067caa22b2d2c3dbf8f73beba46e802;hb=c931473048eb066b1f06d6679a01c13a18e048ee;hp=4899988baa54423c917dd249c1ab606e6ffc4180;hpb=b14d3897e26d001afec0fd394d7b9ec06455e6b2;p=vlc

diff --git a/modules/common.am b/modules/common.am
index 4899988baa..94fb399bd0 100644
--- a/modules/common.am
+++ b/modules/common.am
@@ -5,19 +5,19 @@
 #
 # Authors: Sam Hocevar <sam@zoy.org>
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 NULL =
-libvlcdir = $(vlclibdir)/plugins/$(basedir)
+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_IS_$(MODULE_NAME) \
-	-DMODULE_STRING=\"$(MODULE_NAME)\"
+AM_CPPFLAGS = -DMODULE_STRING=\"$(MODULE_NAME)\"
 if HAVE_DYNAMIC_PLUGINS
 AM_CPPFLAGS += -D__PLUGIN__
 else
@@ -26,10 +26,12 @@ endif
 AM_CFLAGS =
 AM_CXXFLAGS =
 AM_OBJCFLAGS =
-AM_LIBADD = $(LIBPTHREAD)
-AM_LDFLAGS = -rpath '$(libvlcdir)' \
+AM_LDFLAGS = \
 	-avoid-version -module \
 	-export-symbols-regex ^vlc_entry \
 	-shrext $(LIBEXT) \
 	-no-undefined \
 	$(LTLIBVLCCORE) $(top_builddir)/compat/libcompat.la
+if HAVE_WIN32
+AM_LDFLAGS += $(top_builddir)/modules/module.rc.lo
+endif