diff options
| author | Ren, Zhaohan <zhaohan.ren@intel.com> | 2009-03-26 02:55:43 +0800 |
|---|---|---|
| committer | Ren, Zhaohan <zhaohan.ren@intel.com> | 2009-03-26 02:55:43 +0800 |
| commit | af4671aa8c68c3f2c107d9fddf197e560fccf3e2 (patch) | |
| tree | d7809931d8b9c133edbbe304dda1ca73482450c2 | |
| parent | 66d79252f7e4b7c5894c1fd6272470d8c6c893ba (diff) | |
| download | libva-af4671aa8c68c3f2c107d9fddf197e560fccf3e2.tar.gz | |
patch 106_libva_includedir.patch
| -rw-r--r-- | dummy_drv_video/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/dummy_drv_video/Makefile.am b/dummy_drv_video/Makefile.am index 873ff0e..f782c71 100644 --- a/dummy_drv_video/Makefile.am +++ b/dummy_drv_video/Makefile.am @@ -25,7 +25,7 @@ dummy_drv_video_ladir = /usr/lib/dri dummy_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undefined dummy_drv_video_la_LIBADD = ../src/libva.la -AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/../../include/external/ -I$(top_srcdir)/../../include/kmd +AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/../../include/external/ -I$(top_srcdir)/../../include/kmd -DIN_LIBVA dummy_drv_video_la_SOURCES = dummy_drv_video.c object_heap.c noinst_HEADERS = dummy_drv_video.h object_heap.h diff --git a/src/Makefile.am b/src/Makefile.am index 5c5a1b2..06aeaff 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,7 +21,8 @@ # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. INCLUDES = \ - $(LIBVA_CFLAGS) + $(LIBVA_CFLAGS) \ + -DIN_LIBVA libva_la_LTLIBRARIES = libva.la libva_ladir = $(libdir) @@ -32,5 +33,5 @@ SUBDIRS = X11 libva_la_SOURCES = va.c -libvaincludedir = ${includedir} +libvaincludedir = ${includedir}/va libvainclude_HEADERS = va.h va_backend.h diff --git a/test/Makefile.am b/test/Makefile.am index 9a9c87f..22e2a5d 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -27,7 +27,7 @@ bin_PROGRAMS = vainfo testdir = $(bindir) -AM_CFLAGS = -I$(top_srcdir)/../../include/external/ -I$(top_srcdir)/src -I$(top_srcdir)/src/X11 +AM_CFLAGS = -I$(top_srcdir)/../../include/external/ -I$(top_srcdir)/src -DIN_LIBVA TESTS = $(check_PROGRAMS) |