summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorXiang, Haihao <haihao.xiang@intel.com>2011-09-19 09:12:33 +0800
committerXiang, Haihao <haihao.xiang@intel.com>2011-09-19 09:22:50 +0800
commit06891b177626604019f779d4151a04c2ad2f1d5a (patch)
treead667e99af407dcedae0c97ae932f23f0105eeda /test
parentfde78c4488dd65430c9452fba4ca04d9b8f94c18 (diff)
va/test: Fix DSO link issue
I didn't see this issue until I upgraded my system recently. It's evident the default behavior of the linker is changed. Explicitly adding the missing libraries to the link step can resolve this issue. Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Diffstat (limited to 'test')
-rw-r--r--test/decode/Makefile.am2
-rw-r--r--test/encode/Makefile.am2
-rw-r--r--test/putsurface/Makefile.am2
-rw-r--r--test/vainfo/Makefile.am3
4 files changed, 5 insertions, 4 deletions
diff --git a/test/decode/Makefile.am b/test/decode/Makefile.am
index 9343a4d..d0c5f39 100644
--- a/test/decode/Makefile.am
+++ b/test/decode/Makefile.am
@@ -24,7 +24,7 @@ bin_PROGRAMS = mpeg2vldemo
INCLUDES = -I$(top_srcdir)
-TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) $(top_builddir)/va/$(libvacorelib) -lX11
mpeg2vldemo_LDADD = $(TEST_LIBS)
mpeg2vldemo_SOURCES = mpeg2vldemo.cpp
diff --git a/test/encode/Makefile.am b/test/encode/Makefile.am
index 7e48fdd..de42d31 100644
--- a/test/encode/Makefile.am
+++ b/test/encode/Makefile.am
@@ -24,7 +24,7 @@ bin_PROGRAMS = h264encode avcenc
INCLUDES = -I$(top_srcdir)
-TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) $(top_builddir)/va/$(libvacorelib) -lpthread -lX11
h264encode_LDADD = $(TEST_LIBS)
h264encode_SOURCES = h264encode_x11.c
diff --git a/test/putsurface/Makefile.am b/test/putsurface/Makefile.am
index 0d67df0..fbf23d3 100644
--- a/test/putsurface/Makefile.am
+++ b/test/putsurface/Makefile.am
@@ -24,7 +24,7 @@ bin_PROGRAMS = putsurface
INCLUDES = -I$(top_srcdir)
-TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) -lpthread
+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) $(top_builddir)/va/$(libvacorelib) -lpthread -lX11
putsurface_LDADD = $(TEST_LIBS)
putsurface_SOURCES = putsurface_x11.c
diff --git a/test/vainfo/Makefile.am b/test/vainfo/Makefile.am
index 82a15b6..8d9d017 100644
--- a/test/vainfo/Makefile.am
+++ b/test/vainfo/Makefile.am
@@ -25,7 +25,8 @@ bin_PROGRAMS = vainfo
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/test/basic
-vainfo_LDADD = $(top_builddir)/va/$(libvacorelib) $(top_builddir)/va/$(libvabackendlib)
+vainfo_LDADD = $(top_builddir)/va/$(libvacorelib) $(top_builddir)/va/$(libvabackendlib) -lX11
+
vainfo_DEPENDENCIES = $(top_builddir)/va/$(libvacorelib) $(top_builddir)/va/$(libvabackendlib)
vainfo_SOURCES = vainfo.c