Hi,
This patch fixes building outside of the source directory.
e.g. fixes the following build scenario
$ autoreconf -v --install
$ mkdir objs
$ cd objs
$ ../configure --enable-i965-driver
$ make
Regards,
Gwenole.
commit 520f3406a88bfeda3dce353ad2a2524f45feb1fc
Author: Gwenole Beauchesne <[email protected]>
Date: Tue May 18 17:16:57 2010 +0200
Fix out-of-source builds.
diff --git a/dummy_drv_video/Makefile.am b/dummy_drv_video/Makefile.am
index 8c1f40a..f458dd5 100644
--- a/dummy_drv_video/Makefile.am
+++ b/dummy_drv_video/Makefile.am
@@ -23,8 +23,8 @@
dummy_drv_video_la_LTLIBRARIES = dummy_drv_video.la
dummy_drv_video_ladir = @LIBVA_DRIVERS_PATH@
dummy_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undefined
-dummy_drv_video_la_LIBADD = $(top_srcdir)/va/$(libvabackendlib)
-dummy_drv_video_la_DEPENDENCIES = $(top_srcdir)/va/$(libvabackendlib)
+dummy_drv_video_la_LIBADD = $(top_builddir)/va/$(libvabackendlib)
+dummy_drv_video_la_DEPENDENCIES = $(top_builddir)/va/$(libvabackendlib)
AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/../../include/external/ -I$(top_srcdir)/../../include/kmd
dummy_drv_video_la_SOURCES = dummy_drv_video.c object_heap.c
diff --git a/i965_drv_video/Makefile.am b/i965_drv_video/Makefile.am
index 6421107..ac84cc3 100644
--- a/i965_drv_video/Makefile.am
+++ b/i965_drv_video/Makefile.am
@@ -22,7 +22,7 @@
SUBDIRS = shaders
-AM_CFLAGS = -Wall -I$(top_srcdir)/va -I$(top_srcdir)/va/x11 @DRM_CFLAGS@ -fvisibility=hidden
+AM_CFLAGS = -Wall -I$(top_srcdir) -I$(top_srcdir)/va -I$(top_srcdir)/va/x11 @DRM_CFLAGS@ -fvisibility=hidden
i965_drv_video_la_LTLIBRARIES = i965_drv_video.la
i965_drv_video_ladir = @LIBVA_DRIVERS_PATH@
diff --git a/test/Makefile.am b/test/Makefile.am
index 8785259..ad42142 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -25,8 +25,8 @@ bin_PROGRAMS = vainfo
AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11
-vainfo_LDADD = $(top_srcdir)/va/libva.la $(top_srcdir)/va/$(libvabackendlib)
-vainfo_DEPENDENCIES = $(top_srcdir)/va/libva.la $(top_srcdir)/va/$(libvabackendlib)
+vainfo_LDADD = $(top_builddir)/va/libva.la $(top_builddir)/va/$(libvabackendlib)
+vainfo_DEPENDENCIES = $(top_builddir)/va/libva.la $(top_builddir)/va/$(libvabackendlib)
vainfo_SOURCES = vainfo.c
SUBDIRS = basic decode encode putsurface
diff --git a/test/basic/Makefile.am b/test/basic/Makefile.am
index 49a54a0..a2519a2 100644
--- a/test/basic/Makefile.am
+++ b/test/basic/Makefile.am
@@ -25,7 +25,7 @@ bin_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \
AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
-TEST_LIBS = $(top_srcdir)/va/$(libvabackendlib)
+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
test_01_LDADD = $(TEST_LIBS)
test_01_SOURCES = test_01.c
diff --git a/test/decode/Makefile.am b/test/decode/Makefile.am
index b100421..ea30643 100644
--- a/test/decode/Makefile.am
+++ b/test/decode/Makefile.am
@@ -24,7 +24,7 @@ bin_PROGRAMS = mpeg2vldemo
AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
-TEST_LIBS = $(top_srcdir)/va/$(libvabackendlib)
+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
mpeg2vldemo_LDADD = $(TEST_LIBS)
mpeg2vldemo_SOURCES = mpeg2vldemo.c
diff --git a/test/encode/Makefile.am b/test/encode/Makefile.am
index f349af2..80c882a 100644
--- a/test/encode/Makefile.am
+++ b/test/encode/Makefile.am
@@ -24,7 +24,7 @@ bin_PROGRAMS = h264encode
AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
-TEST_LIBS = $(top_srcdir)/va/$(libvabackendlib)
+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
h264encode_LDADD = $(TEST_LIBS)
h264encode_SOURCES = h264encode.c
diff --git a/test/putsurface/Makefile.am b/test/putsurface/Makefile.am
index 51edb25..fe18388 100644
--- a/test/putsurface/Makefile.am
+++ b/test/putsurface/Makefile.am
@@ -24,7 +24,7 @@ bin_PROGRAMS = putsurface
AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
-TEST_LIBS = $(top_srcdir)/va/$(libvabackendlib) -lpthread
+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) -lpthread
putsurface_LDADD = $(TEST_LIBS)
putsurface_SOURCES = putsurface.c
_______________________________________________
Libva mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libva
