X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgenmf;h=be97990031088aa86feb257fe90e5c9d1ba95f8f;hb=23c8d864bb82c2b464c1c2b03b483afd9d11802b;hp=adc40a1a47362300ed024a448149f83cfddb89a2;hpb=7e3c4b6648314a6f0cc79d9818540c0479fb8815;p=vlc

diff --git a/modules/genmf b/modules/genmf
index adc40a1a47..be97990031 100755
--- a/modules/genmf
+++ b/modules/genmf
@@ -21,26 +21,13 @@ do
   basedir="`echo "${dir}" | cut -f1 -d/`"
   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
-  do
-    case " ${plugins} " in
-      *\ ${mod}\ *)
-	;;
-      *)
-        libvlc_ltlibs="${libvlc_ltlibs} \$(LTLIB${mod})"
-        extra_ltlibs="${extra_ltlibs} lib${mod}_plugin.la"
-      ;;
-    esac
-  done
   rm -f "${makf}" && cat > "${makf}" << EOF
 # ${makf} automatically generated from ${modf} by $0
 # DO NOT EDIT THIS FILE DIRECTLY! See Modules.am instead.
 
-basedir = ${basedir}
-libvlc_LTLIBRARIES = ${libvlc_ltlibs}
-EXTRA_LTLIBRARIES = ${extra_ltlibs}
+${basedir}dir = \$(pluginsdir)/${basedir}
+${basedir}_LTLIBRARIES =
+EXTRA_LTLIBRARIES =
 
 EXTRA_DIST = Modules.am
 
@@ -51,27 +38,30 @@ if MAINTAINER_MODE
 \$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/modules/genmf
 	\$(AM_V_GEN)cd \\\$(top_srcdir) && \\\$(SHELL) modules/genmf ${dir}
 endif
-
 EOF
   for mod in $mods
   do
     cat >> "${makf}" << EOF
-# The ${mod} plugin
-if HAVE_WIN32
-lib${mod}_plugin_la_DEPENDENCIES = lib${mod}_plugin.rc.o
-endif
+
 lib${mod}_plugin_la_SOURCES = \$(SOURCES_${mod})
-nodist_lib${mod}_plugin_la_SOURCES = \$(nodist_SOURCES_${mod})
-# Force per-target objects:
-lib${mod}_plugin_la_CPPFLAGS = \$(AM_CPPFLAGS) \$(CPPFLAGS_${mod})
+lib${mod}_plugin_la_CPPFLAGS = \$(AM_CPPFLAGS) \$(CPPFLAGS_${mod}) \
+	-DMODULE_NAME_IS_${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 manually:
-lib${mod}_plugin_la_LIBADD = \$(AM_LIBADD) \$(LIBS_${mod})
-lib${mod}_plugin_la_LDFLAGS = \$(AM_LDFLAGS) \$(LDFLAGS_${mod})
-
+lib${mod}_plugin_la_LIBADD = \$(LIBS_${mod})
+lib${mod}_plugin_la_LDFLAGS = \$(AM_LDFLAGS) -rpath '\$(${basedir}dir)' \$(LDFLAGS_${mod})
+EOF
+    case " ${plugins} " in
+      *\ ${mod}\ *)
+	;;
+      *)
+        cat >> "${makf}" << EOF
+EXTRA_LTLIBRARIES += lib${mod}_plugin.la
+${basedir}_LTLIBRARIES += \$(LTLIB${mod})
 EOF
+      ;;
+    esac
   done
 
   shift