X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgenmf;h=aefd560b16d9a3bc11170efb95d8aff22e7257e6;hb=85ed6b991f2aff8490ee23dffd96b431ddc22e7c;hp=ec314a3e914145aef234cb793bc9cb3fab1ef412;hpb=be5bff39e503467aba0875c4feb490e4f91405d0;p=vlc

diff --git a/modules/genmf b/modules/genmf
index ec314a3e91..aefd560b16 100755
--- a/modules/genmf
+++ b/modules/genmf
@@ -11,15 +11,16 @@ cd $(dirname "$0")/.. || exit 1
 
 while test "$1"
 do
-  printf "."
   dir="$1"
   modf="modules/${dir}/Modules.am"
+  if ! test -f "$modf"; then
+    echo "$modf does not exist!" >&2
+    exit 1
+  fi
   makf="modules/${dir}/Makefile.am"
   basedir="`echo "${dir}" | cut -f1 -d/`"
-  # automake will not recurse for make dist if we don't define SUBDIRS = .
-  subdirs="`sed -ne 's,'modules/${dir}'/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`"
-  mods="`sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < "${modf}" | xargs`"
-  plugins="`sed -n -e 's/^.*lib\([^ ]*\)_plugin\.la.*/\1/p' < "${modf}" | xargs`"
+  mods="`sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < "${modf}" | sort | uniq | xargs`"
+  plugins="`sed -n -e 's/^.*lib\([^ ]*\)_plugin\.la.*/\1/p' < "${modf}" | sort | uniq | xargs`"
   libvlc_ltlibs=""
   extra_ltlibs=""
   for mod in $mods
@@ -40,7 +41,6 @@ do
 basedir = ${basedir}
 dir = ${dir}
 mods = ${mods}
-SUBDIRS = ${subdirs}
 libvlc_LTLIBRARIES = ${libvlc_ltlibs}
 EXTRA_LTLIBRARIES = ${extra_ltlibs}
 
@@ -54,11 +54,13 @@ EOF
 lib${mod}_plugin_la_SOURCES = \$(SOURCES_${mod})
 nodist_lib${mod}_plugin_la_SOURCES = \$(nodist_SOURCES_${mod})
 # 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_CPPFLAGS = \$(AM_CPPFLAGS) \$(CPPFLAGS_${mod})
+lib${mod}_plugin_la_CFLAGS = \$(AM_CFLAGS) \$(CFLAGS_${mod})
+lib${mod}_plugin_la_CXXFLAGS = \$(AM_CXXFLAGS) \$(CXXFLAGS_${mod})
+lib${mod}_plugin_la_OBJCFLAGS = \$(AM_OBJCFLAGS) \$(OBJCFLAGS_${mod})
 # Set LIBADD and DEPENDENCIES manually:
-lib${mod}_plugin_la_LIBADD = \$(AM_LIBADD)
+lib${mod}_plugin_la_LIBADD = \$(AM_LIBADD) \$(LIBS_${mod})
+lib${mod}_plugin_la_LDFLAGS = \$(AM_LDFLAGS) \$(LDFLAGS_${mod})
 lib${mod}_plugin_la_DEPENDENCIES =
 
 EOF
@@ -66,4 +68,3 @@ EOF
 
   shift
 done
-printf "\n"