flac demux: don't skip STREAMINFO block twice

[vlc] / modules / common.am

diff --git a/modules/common.am b/modules/common.am
index f001a7f80ecb430a84549312e5f90477cd185ff1..59a68d9c8664cb84c95eb1d8da2921e7a2659ca7 100644 (file)
--- a/modules/common.am
+++ b/modules/common.am
@@ -13,17 +13,25 @@ CLEANFILES = $(BUILT_SOURCES)
 
 LTLIBVLCCORE = $(top_builddir)/src/libvlccore.la
 
-AM_CFLAGS = `$(VLC_CONFIG) --cflags $(VLC_DEFAULT_PLUGIN_TYPE) $@`
-AM_CXXFLAGS = `$(VLC_CONFIG) --cxxflags $(VLC_DEFAULT_PLUGIN_TYPE) $@`
-AM_OBJCFLAGS = `$(VLC_CONFIG) --objcflags $(VLC_DEFAULT_PLUGIN_TYPE) $@`
+# Module name from object or executable file name.
+MODULE_NAME = $$(p="$@"; p="$${p\#\#*/}"; p="$${p\#lib}"; echo "$${p%_plugin*}")
+
+AM_CPPFLAGS = \
+       -DMODULE_NAME=$(MODULE_NAME) \
+       -DMODULE_NAME_IS_$(MODULE_NAME) \
+       -DMODULE_STRING=\"$(MODULE_NAME)\"
+if HAVE_DYNAMIC_PLUGINS
+AM_CPPFLAGS += -D__PLUGIN__
+endif
+AM_CFLAGS =
+AM_CXXFLAGS =
+AM_OBJCFLAGS =
+AM_LIBADD = $(LIBPTHREAD)
 AM_LDFLAGS = -rpath '$(libvlcdir)' \
        -avoid-version -module \
        -export-symbols-regex ^vlc_entry \
        -shrext $(LIBEXT) \
-       -rpath "$(libvlcdir)" \
        -no-undefined \
-        `$(VLC_CONFIG) --ldflags $(VLC_DEFAULT_PLUGIN_TYPE) $@`
-AM_LIBADD = `$(VLC_CONFIG) -libs $(VLC_DEFAULT_PLUGIN_TYPE) $@` \
        $(LTLIBVLCCORE) $(top_builddir)/compat/libcompat.la
 
 include $(srcdir)/Modules.am