diff options
| author | Xiang, Haihao <haihao.xiang@intel.com> | 2012-01-12 15:36:50 +0800 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2012-01-12 15:36:50 +0800 |
| commit | f0e7788c32013ec71c45ed82b8bfba0b6c602fe3 (patch) | |
| tree | 7aacaee2f482ea33c9b6b2b5697cc0964809fea5 /va/Makefile.am | |
| parent | 088d87d1f1a336088a73b2a3b8f216ae4f94214f (diff) | |
| parent | cff1adedd3c9ee5348c7b992d50f87569625f142 (diff) | |
Merge branch 'master' into vaapi-ext
Conflicts:
configure.ac
test/Makefile.am
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Diffstat (limited to 'va/Makefile.am')
| -rw-r--r-- | va/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/va/Makefile.am b/va/Makefile.am index 16a1e8f..bc70435 100644 --- a/va/Makefile.am +++ b/va/Makefile.am @@ -92,7 +92,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_DEPS_LIBS) -ldl endif if BUILD_DUMMY_BACKEND |