diff options
| author | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2012-10-04 15:28:07 +0200 |
|---|---|---|
| committer | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2012-10-04 15:30:51 +0200 |
| commit | c31d2e8a1bb2c1210fee922b5c54e14ec3077605 (patch) | |
| tree | 3780abb213e75a6b1223a0b668af49699d713a42 | |
| parent | 2703f4144df261be2f93f256d9bc616fb4b617d6 (diff) | |
tests: fix build with alternate X11 paths.
If a program explicitly uses libfoo functions (libX11 for instance here),
then it shall be explicitly linked against that library. So, fix all
instances where X11 functions are called to include the right paths
to headers and libraries.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
| -rw-r--r-- | test/basic/Makefile.am | 2 | ||||
| -rw-r--r-- | test/encode/Makefile.am | 4 | ||||
| -rw-r--r-- | test/v4l_h264/decode/Makefile.am | 5 | ||||
| -rw-r--r-- | test/v4l_h264/encode/Makefile.am | 5 |
4 files changed, 11 insertions, 5 deletions
diff --git a/test/basic/Makefile.am b/test/basic/Makefile.am index b52f02e..21f48dd 100644 --- a/test/basic/Makefile.am +++ b/test/basic/Makefile.am @@ -37,11 +37,13 @@ noinst_PROGRAMS = \ AM_CFLAGS = \ -DIN_LIBVA \ -I$(top_srcdir) \ + $(X11_CFLAGS) \ $(NULL) TEST_LIBS = \ $(top_builddir)/va/libva.la \ $(top_builddir)/va/libva-x11.la \ + $(X11_LIBS) \ $(NULL) test_01_LDADD = $(TEST_LIBS) diff --git a/test/encode/Makefile.am b/test/encode/Makefile.am index 01550e2..db7f13c 100644 --- a/test/encode/Makefile.am +++ b/test/encode/Makefile.am @@ -31,9 +31,11 @@ INCLUDES = \ $(NULL) h264encode_SOURCES = h264encode_x11.c +h264encode_CFLAGS = $(X11_CFLAGS) h264encode_LDADD = \ $(top_builddir)/va/libva.la \ - $(top_builddir)/va/libva-x11.la + $(top_builddir)/va/libva-x11.la \ + $(X11_LIBS) avcenc_SOURCES = avcenc.c avcenc_CFLAGS = -I$(top_srcdir)/test/common diff --git a/test/v4l_h264/decode/Makefile.am b/test/v4l_h264/decode/Makefile.am index ecc832a..4e77dd5 100644 --- a/test/v4l_h264/decode/Makefile.am +++ b/test/v4l_h264/decode/Makefile.am @@ -23,10 +23,11 @@ noinst_PROGRAMS = decode decode_SOURCES = decode_x11.cpp TCPSocketServer.cpp -decode_CFLAGS = -I$(top_srcdir) +decode_CFLAGS = -I$(top_srcdir) $(X11_CFLAGS) decode_LDADD = \ $(top_builddir)/va/libva.la \ - $(top_builddir)/va/libva-x11.la + $(top_builddir)/va/libva-x11.la \ + $(X11_LIBS) valgrind: $(bin_PROGRAMS) for a in $(bin_PROGRAMS); do \ diff --git a/test/v4l_h264/encode/Makefile.am b/test/v4l_h264/encode/Makefile.am index 00e4ad3..7d3a9d4 100644 --- a/test/v4l_h264/encode/Makefile.am +++ b/test/v4l_h264/encode/Makefile.am @@ -23,10 +23,11 @@ noinst_PROGRAMS = encode encode_SOURCES = capture.cpp avcenc.cpp TCPSocketClient.cpp -encode_CFLAGS = -I$(top_srcdir) +encode_CFLAGS = -I$(top_srcdir) $(X11_CFLAGS) encode_LDADD = \ $(top_builddir)/va/libva.la \ - $(top_builddir)/va/libva-x11.la + $(top_builddir)/va/libva-x11.la \ + $(X11_LIBS) valgrind: $(bin_PROGRAMS) for a in $(bin_PROGRAMS); do \ |