mediacodec: fix warning

[vlc] / modules / common.am

diff --git a/modules/common.am b/modules/common.am
index 479b244d7fec199e6848e207f8b8335e6d0fa45a..c3b3f8ef571bc35c3348f64a2b4149e7e89de6c0 100644 (file)
--- a/modules/common.am
+++ b/modules/common.am
@@ -5,40 +5,39 @@
 #
 # Authors: Sam Hocevar <sam@zoy.org>
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 NULL =
-SUFFIXES =
-libvlcdir = $(libdir)/vlc/$(basedir)
-EXTRA_DIST = Modules.am
+pluginsdir = $(vlclibdir)/plugins
 BUILT_SOURCES =
 CLEANFILES = $(BUILT_SOURCES)
 
-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 = `$(VLC_CONFIG) -libs plugin $@` $(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
-endif
+AM_CPPFLAGS += -DMODULE_NAME=$(MODULE_NAME)
 endif
-
-include $(srcdir)/Modules.am
-
-if MAINTAINER_MODE
-$(srcdir)/Makefile.am: $(srcdir)/Modules.am $(top_srcdir)/modules/genmf
-       cd \$(top_srcdir) && \$(SHELL) modules/genmf $(dir)
+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 \
+              -Wc,--static -Wc,-static-libgcc
 endif
 
-nice:
-       $(top_builddir)/compile
+SUFFIXES = .asm
 
-.PHONY: nice
+.asm.lo:
+       $(LIBTOOL) --mode=compile --tag=ASM $(YASM) $(YASMFLAGS) $< -o $@