Qt: do not extend the dialog minimum width for long lines

[vlc] / modules / common.am

diff --git a/modules/common.am b/modules/common.am
index 3dd8ad2e4ed5e54845d4f7a8e338d7e28dfe33b5..4899988baa54423c917dd249c1ab606e6ffc4180 100644 (file)
--- a/modules/common.am
+++ b/modules/common.am
@@ -7,35 +7,29 @@
 
 NULL =
 libvlcdir = $(vlclibdir)/plugins/$(basedir)
-EXTRA_DIST = Modules.am
 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}"; 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__
+else
+AM_CPPFLAGS += -DMODULE_NAME=$(MODULE_NAME)
 endif
 AM_CFLAGS =
 AM_CXXFLAGS =
 AM_OBJCFLAGS =
+AM_LIBADD = $(LIBPTHREAD)
 AM_LDFLAGS = -rpath '$(libvlcdir)' \
        -avoid-version -module \
        -export-symbols-regex ^vlc_entry \
        -shrext $(LIBEXT) \
-       -no-undefined
-AM_LIBADD = $(LTLIBVLCCORE) $(top_builddir)/compat/libcompat.la $(LIBS_plugin)
-
-include $(srcdir)/Modules.am
-
-if MAINTAINER_MODE
-$(srcdir)/Makefile.am: $(srcdir)/Modules.am $(top_srcdir)/modules/genmf
-       $(AM_V_GEN)cd \$(top_srcdir) && \$(SHELL) modules/genmf $(dir)
-endif
+       -no-undefined \
+       $(LTLIBVLCCORE) $(top_builddir)/compat/libcompat.la