libs: g-i: avoid multiple libraries in the shared-library tag

Using multiple libraries causes problems for the C# bindings and
will for similiar languages such as Java when there are bindings
for them.

Also change --library=libgstfoo-X.la to --library=gstfoo-X as
the man page suggests it should be done.

https://bugzilla.gnome.org/show_bug.cgi?id=679315

diff --git a/libs/gst/base/Makefile.am b/libs/gst/base/Makefile.am
index e591fb2..a5bd2d4 100644 (file)
--- a/libs/gst/base/Makefile.am
+++ b/libs/gst/base/Makefile.am
@@ -87,8 +87,7 @@ GstBase-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstbase-@GST_API_VERS
                $(gir_cincludes) \
                --add-include-path=$(top_builddir)/gst \
                --library-path=$(top_builddir)/gst \
-               --library=$(top_builddir)/gst/libgstreamer-@GST_API_VERSION@.la \
-               --library=libgstbase-@GST_API_VERSION@.la \
+               --library=gstbase-@GST_API_VERSION@ \
                --include=Gst-@GST_API_VERSION@ \
                --libtool="$(top_builddir)/libtool" \
                --pkg gstreamer-@GST_API_VERSION@ \

diff --git a/libs/gst/check/Makefile.am b/libs/gst/check/Makefile.am
index c2c6976..c329fdc 100644 (file)
--- a/libs/gst/check/Makefile.am
+++ b/libs/gst/check/Makefile.am
@@ -130,8 +130,7 @@ GstCheck-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstcheck-@GST_API_VE
                $(gir_cincludes) \
                --add-include-path=$(top_builddir)/gst \
                --library-path=$(top_builddir)/gst \
-               --library=$(top_builddir)/gst/libgstreamer-@GST_API_VERSION@.la \
-               --library=libgstcheck-@GST_API_VERSION@.la \
+               --library=gstcheck-@GST_API_VERSION@ \
                --include=Gst-@GST_API_VERSION@ \
                --libtool="$(top_builddir)/libtool" \
                --pkg gstreamer-@GST_API_VERSION@ \

diff --git a/libs/gst/controller/Makefile.am b/libs/gst/controller/Makefile.am
index 0cd1e62..ec4c805 100644 (file)
--- a/libs/gst/controller/Makefile.am
+++ b/libs/gst/controller/Makefile.am
@@ -61,8 +61,7 @@ GstController-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstcontroller-@
                $(gir_cincludes) \
                --add-include-path=$(top_builddir)/gst \
                --library-path=$(top_builddir)/gst \
-               --library=$(top_builddir)/gst/libgstreamer-@GST_API_VERSION@.la \
-               --library=libgstcontroller-@GST_API_VERSION@.la \
+               --library=gstcontroller-@GST_API_VERSION@ \
                --include=Gst-@GST_API_VERSION@ \
                --libtool="$(top_builddir)/libtool" \
                --pkg gstreamer-@GST_API_VERSION@ \

diff --git a/libs/gst/net/Makefile.am b/libs/gst/net/Makefile.am
index a75742d..8b30db6 100644 (file)
--- a/libs/gst/net/Makefile.am
+++ b/libs/gst/net/Makefile.am
@@ -59,8 +59,7 @@ GstNet-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstnet-@GST_API_VERSIO
                $(gir_cincludes) \
                --add-include-path=$(top_builddir)/gst \
                --library-path=$(top_builddir)/gst \
-               --library=$(top_builddir)/gst/libgstreamer-@GST_API_VERSION@.la \
-               --library=libgstnet-@GST_API_VERSION@.la \
+               --library=gstnet-@GST_API_VERSION@ \
                --include=Gst-@GST_API_VERSION@ \
                --include=Gio-2.0 \
                --libtool="$(top_builddir)/libtool" \