+2005-03-31 David Schleef <ds@schleef.org>
+
+ * gst/gstplugin.c: (gst_plugin_check_file), (gst_plugin_load_file):
+ Switch to using G_MODULE_BIND_LOCAL, which means plugins are now
+ expected to link against libgstreamer.
+ * gst/base/Makefile.am: link against libgstreamer
+ * gst/elements/Makefile.am: same
+
2005-03-31 Andy Wingo <wingo@pobox.com>
* tests/instantiate/Makefile.am:
EXTRA_DIST = $(as_libtool_EXTRA_DIST)
noinst_DATA = $(as_libtool_noinst_DATA_files)
-libgstbase_@GST_MAJORMINOR@_la_DEPENDENCIES = ../libgstreamer-@GST_MAJORMINOR@.la
+libgstbase_@GST_MAJORMINOR@_la_DEPENDENCIES = \
+ ../libgstreamer-@GST_MAJORMINOR@.la
libgstbase_@GST_MAJORMINOR@_la_SOURCES = \
gstbasesink.c \
gstbasetransform.c
libgstbase_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS)
-libgstbase_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS)
+libgstbase_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) \
+ ../libgstreamer-@GST_MAJORMINOR@.la
libgstbase_@GST_MAJORMINOR@_la_LDFLAGS = $(as_libtool_LDFLAGS)
libgstbase_@GST_MAJORMINOR@includedir = \
libgstelements_la_CFLAGS = $(GST_OBJ_CFLAGS)
-libgstelements_la_LIBADD = $(GST_OBJ_LIBS)
-libgstelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(as_libtool_LDFLAGS) \
- $(top_builddir)/gst/base/libgstbase-@GST_MAJORMINOR@.la
+libgstelements_la_LIBADD = $(GST_OBJ_LIBS) \
+ $(top_builddir)/gst/base/libgstbase-@GST_MAJORMINOR@.la \
+ $(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la
+libgstelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(as_libtool_LDFLAGS)
noinst_HEADERS = \
gstaggregator.h \
return FALSE;
}
- module = g_module_open (filename, G_MODULE_BIND_LAZY);
+ module = g_module_open (filename, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
if (module == NULL) {
GST_DEBUG ("Error loading plugin %s, reason: %s\n", filename,
if (!gst_plugin_check_file (filename, error))
return NULL;
- module = g_module_open (filename, G_MODULE_BIND_LAZY);
+ module = g_module_open (filename, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
if (module == NULL)
goto load_error;
EXTRA_DIST = $(as_libtool_EXTRA_DIST)
noinst_DATA = $(as_libtool_noinst_DATA_files)
-libgstbase_@GST_MAJORMINOR@_la_DEPENDENCIES = ../libgstreamer-@GST_MAJORMINOR@.la
+libgstbase_@GST_MAJORMINOR@_la_DEPENDENCIES = \
+ ../libgstreamer-@GST_MAJORMINOR@.la
libgstbase_@GST_MAJORMINOR@_la_SOURCES = \
gstbasesink.c \
gstbasetransform.c
libgstbase_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS)
-libgstbase_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS)
+libgstbase_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) \
+ ../libgstreamer-@GST_MAJORMINOR@.la
libgstbase_@GST_MAJORMINOR@_la_LDFLAGS = $(as_libtool_LDFLAGS)
libgstbase_@GST_MAJORMINOR@includedir = \
libgstelements_la_CFLAGS = $(GST_OBJ_CFLAGS)
-libgstelements_la_LIBADD = $(GST_OBJ_LIBS)
-libgstelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(as_libtool_LDFLAGS) \
- $(top_builddir)/gst/base/libgstbase-@GST_MAJORMINOR@.la
+libgstelements_la_LIBADD = $(GST_OBJ_LIBS) \
+ $(top_builddir)/gst/base/libgstbase-@GST_MAJORMINOR@.la \
+ $(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la
+libgstelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(as_libtool_LDFLAGS)
noinst_HEADERS = \
gstaggregator.h \