Advertisement
alanwww1

LIBVA Buildpatch makefiles for Ubuntu

Mar 9th, 2011
66
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.76 KB | None | 0 0
  1. diff --git a/test/basic/Makefile.am b/test/basic/Makefile.am
  2. index a2519a2..4ea97e7 100644
  3. --- a/test/basic/Makefile.am
  4. +++ b/test/basic/Makefile.am
  5. @@ -23,9 +23,11 @@
  6.  bin_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \
  7.         test_07 test_08 test_09 test_10 test_11
  8.  
  9. +AM_LDFLAGS = -lX11
  10. +
  11.  AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
  12.  
  13. -TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
  14. +TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) $(top_builddir)/va/libva.la
  15.  
  16.  test_01_LDADD = $(TEST_LIBS)
  17.  test_01_SOURCES = test_01.c
  18. diff --git a/test/decode/Makefile.am b/test/decode/Makefile.am
  19. index ea30643..059c189 100644
  20. --- a/test/decode/Makefile.am
  21. +++ b/test/decode/Makefile.am
  22. @@ -24,7 +24,9 @@ bin_PROGRAMS = mpeg2vldemo
  23.  
  24.  AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
  25.  
  26. -TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
  27. +AM_LDFLAGS = -lX11
  28. +
  29. +TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) $(top_builddir)/va/libva.la
  30.  
  31.  mpeg2vldemo_LDADD = $(TEST_LIBS)
  32.  mpeg2vldemo_SOURCES = mpeg2vldemo.c
  33. diff --git a/test/encode/Makefile.am b/test/encode/Makefile.am
  34. index b353ca1..bf717e2 100644
  35. --- a/test/encode/Makefile.am
  36. +++ b/test/encode/Makefile.am
  37. @@ -24,7 +24,9 @@ bin_PROGRAMS = h264encode
  38.  
  39.  AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
  40.  
  41. -TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
  42. +AM_LDFLAGS = -lX11
  43. +
  44. +TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) $(top_builddir)/va/libva.la
  45.  
  46.  h264encode_LDADD = $(TEST_LIBS)
  47.  h264encode_SOURCES = h264encode.c
  48. diff --git a/test/putsurface/Makefile.am b/test/putsurface/Makefile.am
  49. index fe18388..b00c628 100644
  50. --- a/test/putsurface/Makefile.am
  51. +++ b/test/putsurface/Makefile.am
  52. @@ -24,7 +24,9 @@ bin_PROGRAMS = putsurface
  53.  
  54.  AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
  55.  
  56. -TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) -lpthread
  57. +AM_LDFLAGS = -lX11
  58. +
  59. +TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) -lpthread $(top_builddir)/va/libva.la
  60.  
  61.  putsurface_LDADD = $(TEST_LIBS)
  62.  putsurface_SOURCES = putsurface.c
  63. diff --git a/test/vainfo/Makefile.am b/test/vainfo/Makefile.am
  64. index 5fd0070..97dc25d 100644
  65. --- a/test/vainfo/Makefile.am
  66. +++ b/test/vainfo/Makefile.am
  67. @@ -23,10 +23,12 @@
  68.  
  69.  bin_PROGRAMS = vainfo
  70.  
  71. -AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11
  72. +AM_LDFLAGS = -lX11
  73. +
  74. +AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/test/basic
  75.  
  76.  vainfo_LDADD = $(top_builddir)/va/$(libvacorelib) $(top_builddir)/va/$(libvabackendlib)
  77. -vainfo_DEPENDENCIES =  $(top_builddir)/va/$(libvacorelib) $(top_builddir)/va/$(libvabackendlib)
  78. +vainfo_DEPENDENCIES =  $(top_builddir)/va/$(libvacorelib) $(top_builddir)/va/$(libvabackendlib) $(top_builddir)/va/libva.la
  79.  vainfo_SOURCES = vainfo.c
  80.  
  81.  valgrind:  vainfo
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement