From 7fbd185eb5330455aa1c5e08cebe786fcc399fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 31 Jan 2008 21:35:56 +0000 Subject: [PATCH] [058/906] * gst-libs/gst/gl/Makefile.am: The library needs to link against libgstvideo-0.10. * gst/gl/Makefile.am: The plugin does not (I think) need to link against GL or libgstvideo, since our new gstreamer GL library already does that, but it does need to link against our brand-new libgstgl-0.10. --- gst-libs/gst/gl/Makefile.am | 3 ++- gst/gl/Makefile.am | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am index 375f15476f..656b8b58f0 100644 --- a/gst-libs/gst/gl/Makefile.am +++ b/gst-libs/gst/gl/Makefile.am @@ -15,7 +15,8 @@ libgstgl_@GST_MAJORMINOR@include_HEADERS = \ gstglfilter.h libgstgl_@GST_MAJORMINOR@_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) \ + $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ + $(GST_BASE_LIBS) $(GST_LIBS) \ $(X_LIBS) $(GL_LIBS) libgstgl_@GST_MAJORMINOR@_la_CFLAGS = \ diff --git a/gst/gl/Makefile.am b/gst/gl/Makefile.am index e3a6354338..66bb6f045b 100644 --- a/gst/gl/Makefile.am +++ b/gst/gl/Makefile.am @@ -24,8 +24,9 @@ libgstopengl_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) $(GL_CFLAGS) \ -I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs/gst/gl -libgstopengl_la_LIBADD = $(GL_LIBS) \ +libgstopengl_la_LIBADD = \ + $(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_MAJORMINOR).la \ $(GST_BASE_LIBS) \ - $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) + $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) libgstopengl_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)