build: fix with --no-undefined linker flags.

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

diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am
index b88f1db6cbbf31c951a6be9207593da343ebf902..9d90f71ed08df3825906cc4280c42cd542d692be 100644 (file)
--- a/gst-libs/gst/vaapi/Makefile.am
+++ b/gst-libs/gst/vaapi/Makefile.am
@@ -317,6 +317,7 @@ libgstvaapi_drm_@GST_API_VERSION@_la_CFLAGS =       \
 
 libgstvaapi_drm_@GST_API_VERSION@_la_LIBADD =  \
        $(GLIB_LIBS)                            \
+       $(GST_LIBS)                             \
        $(UDEV_LIBS)                            \
        $(DRM_LIBS)                             \
        $(LIBVA_DRM_LIBS)                       \
@@ -355,6 +356,7 @@ libgstvaapi_x11_@GST_API_VERSION@_la_CFLAGS =       \
 
 libgstvaapi_x11_@GST_API_VERSION@_la_LIBADD =  \
        $(GLIB_LIBS)                            \
+       $(GST_LIBS)                             \
        $(X11_LIBS)                             \
        $(XRANDR_LIBS)                          \
        $(XRENDER_LIBS)                         \
@@ -392,11 +394,14 @@ libgstvaapi_glx_@GST_API_VERSION@_la_CFLAGS =     \
 
 libgstvaapi_glx_@GST_API_VERSION@_la_LIBADD =  \
        $(GLIB_LIBS)                            \
+       $(GST_LIBS)                             \
        $(GST_BASE_LIBS)                        \
        $(GST_VIDEO_LIBS)                       \
+       $(X11_LIBS)                             \
        $(GL_LIBS)                              \
        $(LIBVA_GLX_LIBS)                       \
        libgstvaapi-x11-$(GST_API_VERSION).la   \
+       libgstvaapi-$(GST_API_VERSION).la       \
        $(DLOPEN_LIBS)                          \
        $(NULL)
 
@@ -431,6 +436,8 @@ libgstvaapi_wayland_@GST_API_VERSION@_la_CFLAGS = \
 
 libgstvaapi_wayland_@GST_API_VERSION@_la_LIBADD = \
        $(GLIB_LIBS)                            \
+       $(GST_LIBS)                             \
+       $(GST_VIDEO_LIBS)                       \
        $(WAYLAND_LIBS)                         \
        $(LIBVA_WAYLAND_LIBS)                   \
        libgstvaapi-$(GST_API_VERSION).la       \

diff --git a/gst/vaapi/Makefile.am b/gst/vaapi/Makefile.am
index a52bc2fe1e612215d5be665148509ec4ed91360f..58800db59cb9a690767b1a6455004b6f32017f23 100644 (file)
--- a/gst/vaapi/Makefile.am
+++ b/gst/vaapi/Makefile.am
@@ -7,7 +7,8 @@ libgstvaapi_CFLAGS = \
        -I$(top_builddir)/gst-libs      \
        $(NULL)
 
-libgstvaapi_LIBS =
+libgstvaapi_LIBS = \
+       $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_API_VERSION).la
 
 if USE_DRM
 libgstvaapi_LIBS += \
@@ -16,6 +17,7 @@ endif
 
 if USE_X11
 libgstvaapi_LIBS += \
+       $(X11_LIBS) \
        $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_API_VERSION).la
 endif