Remove un-needed vlc-config --target mode

[vlc] / modules / genmf

diff --git a/modules/genmf b/modules/genmf
index ba670f40125366d13532dcf27fe416b474c72d65..904b3d48619f2c0c47415f0e8fb45cc447a60592 100755 (executable)
--- a/modules/genmf
+++ b/modules/genmf
@@ -29,6 +29,7 @@ do
 # DO NOT EDIT - edit Modules.am or \$(top_srcdir)/bootstrap instead
 
 basedir = ${basedir}
+dir = ${dir}
 mods = ${mods}
 SUBDIRS = ${subdirs}
 EXTRA_LTLIBRARIES = ${extra_ltlibs}
@@ -38,39 +39,20 @@ include \$(top_srcdir)/modules/common.am
 EOF
   for mod in $mods
   do
-    if grep '^nodist_SOURCES_'${mod}'' < "${modf}" >/dev/null 2>&1; then
-        NODIST=''; else
-        NODIST='#'; fi
     cat >> m4/private.m4 << EOF
     ${mod}) list="\\\${list} ${dir}/lib${mod}" ;;
 EOF
-# Generation of modules/**/Makefile.am
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# - L_ is for LIBRARIES_, D_ for DATA_, B_ for BUILT_SOURCES_, F_ for LDFLAGS_,
-#   S_ for SOURCES_, _p is for _plugin, _b is for _builtin. This is to reduce
-#   the resulting file size.
-# - *_CFLAGS, *_CXXFLAGS etc. because per-object CPPFLAGS does not seem to
-#   work properly with any automake version I tested.
     cat >> "${makf}" << EOF
 # The ${mod} plugin
-EOF
-    cat >> "${makf}" << EOF
 lib${mod}_plugin_la_SOURCES = \$(SOURCES_${mod})
-EOF
-    if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
 nodist_lib${mod}_plugin_la_SOURCES = \$(nodist_SOURCES_${mod})
-CLEANFILES += \$(nodist_SOURCES_${mod})
-BUILT_SOURCES += \$(B${mod})
-EOF
-    fi
-    cat >> "${makf}" << EOF
+# Force per-target objects:
 lib${mod}_plugin_la_CFLAGS = \$(AM_CFLAGS)
 lib${mod}_plugin_la_CXXFLAGS = \$(AM_CXXFLAGS)
 lib${mod}_plugin_la_OBJCFLAGS = \$(AM_OBJCFLAGS)
-lib${mod}_plugin_la_LIBADD = \$(AM_LIBADD) \\
-       \`\$(VLC_CONFIG) -libs plugin ${mod}\`
-# Automake does not understand \`...\` very well inside LIBADD...
-lib${mod}_plugin_la_DEPENDENCIES = \$(AM_LIBADD)
+# Set LIBADD and DEPENDENCIES manually:
+lib${mod}_plugin_la_LIBADD = \$(AM_LIBADD)
+lib${mod}_plugin_la_DEPENDENCIES =
 
 EOF
   done