X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcommon.am;h=c3b3f8ef571bc35c3348f64a2b4149e7e89de6c0;hb=92aedc8040f1085e1672b452755ec0ff582aa201;hp=b005777cad6e007d3717e1426264b17bf8cca3f7;hpb=e67cf044cc56b0492e33c54ddeb7543a52ebdf85;p=vlc

diff --git a/modules/common.am b/modules/common.am
index b005777cad..c3b3f8ef57 100644
--- a/modules/common.am
+++ b/modules/common.am
@@ -15,11 +15,9 @@ 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
@@ -28,20 +26,18 @@ endif
 AM_CFLAGS =
 AM_CXXFLAGS =
 AM_OBJCFLAGS =
-AM_LIBADD = $(LIBPTHREAD)
 AM_LDFLAGS = \
 	-avoid-version -module \
 	-export-symbols-regex ^vlc_entry \
 	-shrext $(LIBEXT) \
 	-no-undefined \
-	$(LTLIBVLCCORE) $(top_builddir)/compat/libcompat.la
-
+	$(top_builddir)/compat/libcompat.la $(LTLIBVLCCORE) 
 if HAVE_WIN32
-AM_LDFLAGS += -Wl,lib$(MODULE_NAME)_plugin.rc.$(OBJEXT)
+AM_LDFLAGS += $(top_builddir)/modules/module.rc.lo \
+              -Wc,--static -Wc,-static-libgcc
+endif
 
-$(top_builddir)/modules/module.rc: $(top_builddir)/modules/module.rc.in $(top_builddir)/config.status
-	$(AM_V_GEN) cd "$(top_builddir)" && $(SHELL) ./config.status --file="modules/module.rc"
+SUFFIXES = .asm
 
-lib%_plugin.rc.$(OBJEXT): $(top_builddir)/modules/module.rc
-	$(AM_V_GEN) $(WINDRES) -DMODULE_NAME=\\\"$(MODULE_NAME)\\\" --include-dir $(top_srcdir)/share --include-dir $(top_srcdir)/extras/package/win32 -i $< -o $@
-endif
+.asm.lo:
+	$(LIBTOOL) --mode=compile --tag=ASM $(YASM) $(YASMFLAGS) $< -o $@