tests: fix build with alternate X11 paths.

[profile/ivi/libva.git] / test / encode / Makefile.am

diff --git a/test/encode/Makefile.am b/test/encode/Makefile.am
index 94e5edf..db7f13c 100644 (file)
--- a/test/encode/Makefile.am
+++ b/test/encode/Makefile.am
@@ -25,27 +25,23 @@ if USE_X11
 bin_PROGRAMS += h264encode
 endif
 
-libva_helpers = \
-       $(top_builddir)/test/common/libva-display.la    \
-       $(NULL)
-
 INCLUDES = \
-       -I$(top_srcdir)                         \
-       -I$(top_srcdir)/test/common             \
-       $(NULL)
-
-TEST_LIBS = \
-       $(top_builddir)/va/$(libvabackendlib)   \
-       $(top_builddir)/va/$(libvacorelib)      \
-       $(libva_helpers)                        \
+       -I$(top_srcdir)                 \
+       -I$(top_srcdir)/va              \
        $(NULL)
 
-h264encode_LDADD = $(TEST_LIBS)
-h264encode_SOURCES = h264encode_x11.c
+h264encode_SOURCES     = h264encode_x11.c
+h264encode_CFLAGS      = $(X11_CFLAGS)
+h264encode_LDADD       = \
+       $(top_builddir)/va/libva.la \
+       $(top_builddir)/va/libva-x11.la \
+       $(X11_LIBS)
 
-avcenc_LDADD           = $(TEST_LIBS) -lpthread
 avcenc_SOURCES         = avcenc.c
-avcenc_DEPENDENCIES    = $(libva_helpers)
+avcenc_CFLAGS          = -I$(top_srcdir)/test/common
+avcenc_LDADD           = \
+       $(top_builddir)/va/libva.la \
+       $(top_builddir)/test/common/libva-display.la
 
 EXTRA_DIST = h264encode_common.c