diff options
| author | Tim-Philipp Müller <tim at centricular dot net> | 2008-01-31 21:35:56 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim at centricular dot net> | 2008-01-31 21:35:56 +0000 |
| commit | 104b318c7ed4825762ece4e0e41b005668fe2ac1 (patch) | |
| tree | 89d535b3ada296e23e764d537a9e44f8389af3a5 | |
| parent | 368ed554b5dbc597e7b191615bc6a4057c556dfb (diff) | |
* 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.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | gst-libs/gst/gl/Makefile.am | 3 | ||||
| -rw-r--r-- | gst/gl/Makefile.am | 5 |
3 files changed, 15 insertions, 3 deletions
@@ -1,5 +1,15 @@ 2008-01-31 Tim-Philipp Müller <tim at centricular dot net> + * 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. + +2008-01-31 Tim-Philipp Müller <tim at centricular dot net> + * configure.ac: When using the non-pkg-config check, set and export GL_LIBS correctly. diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am index 375f154..656b8b5 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 e3a6354..66bb6f0 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) |