diff options
| author | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2012-09-27 14:26:03 +0200 |
|---|---|---|
| committer | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2012-09-27 16:08:34 +0200 |
| commit | bfc0dfefd8c41b6d88f143c495128e6b9cf77dc7 (patch) | |
| tree | c6c9cd0f3762e8c9e89b43895b1a569ff30ec0af /va/Makefile.am | |
| parent | 0a49e64b7591ab286aefbffa5b1ef46dc41de54a (diff) | |
| download | libva-bfc0dfefd8c41b6d88f143c495128e6b9cf77dc7.tar.gz | |
Sanitize build dependencies.
Fix build dependencies for all backends (DRM, X11, GLX, EGL, Wayland),
especially when they don't live in standard locations.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Diffstat (limited to 'va/Makefile.am')
| -rw-r--r-- | va/Makefile.am | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/va/Makefile.am b/va/Makefile.am index bc726ec..2fef8e2 100644 --- a/va/Makefile.am +++ b/va/Makefile.am @@ -68,6 +68,16 @@ libva_tpi_la_LDFLAGS = $(LDADD) -no-undefined libva_tpi_la_DEPENDENCIES = $(libvacorelib) libva_tpi_la_LIBADD = $(libvacorelib) -ldl +if USE_DRM +SUBDIRS += drm +lib_LTLIBRARIES += libva-drm.la +libva_drm_la_SOURCES = +libva_drm_la_LDFLAGS = $(LDADD) +libva_drm_la_DEPENDENCIES = $(libvacorelib) drm/libva_drm.la +libva_drm_la_LIBADD = $(libvacorelib) drm/libva_drm.la \ + $(LIBVA_LIBS) $(DRM_LIBS) -ldl +endif + if USE_X11 SUBDIRS += x11 lib_LTLIBRARIES += libva-x11.la @@ -76,17 +86,7 @@ libva_x11_la_SOURCES = libva_x11_la_LDFLAGS = $(LDADD) libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la libva_x11_la_LIBADD = $(libvacorelib) x11/libva_x11.la \ - $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS) -ldl -endif - -if USE_DRM -SUBDIRS += drm -lib_LTLIBRARIES += libva-drm.la -libva_drm_la_SOURCES = -libva_drm_la_LDFLAGS = $(LDADD) -libva_drm_la_DEPENDENCIES = $(libvacorelib) drm/libva_drm.la -libva_drm_la_LIBADD = $(libvacorelib) drm/libva_drm.la \ - $(LIBVA_LIBS) $(DRM_LIBS) -ldl + $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(XFIXES_LIBS) $(DRM_LIBS) -ldl endif if USE_GLX @@ -96,7 +96,7 @@ libva_glx_la_SOURCES = libva_glx_la_LDFLAGS = $(LDADD) libva_glx_la_DEPENDENCIES = $(libvacorelib) glx/libva_glx.la libva-x11.la libva_glx_la_LIBADD = $(libvacorelib) glx/libva_glx.la libva-x11.la \ - $(GL_DEPS_LIBS) -ldl + $(GLX_LIBS) -ldl endif if USE_EGL @@ -106,7 +106,7 @@ libva_egl_la_SOURCES = libva_egl_la_LDFLAGS = $(LDADD) libva_egl_la_DEPENDENCIES = $(libvacorelib) egl/libva_egl.la libva-x11.la libva_egl_la_LIBADD = $(libvacorelib) egl/libva_egl.la libva-x11.la \ - $(GL_DEPS_LIBS) -ldl + $(EGL_LIBS) -ldl endif if USE_WAYLAND |