hardware/intel/common/libva
| 修订版 | f4525778d6dbe3d791c23808fe0d1cef56c87023 (tree) |
|---|---|
| 时间 | 2009-07-03 12:04:34 |
| 作者 | Austin Yuan <shengquan.yuan@inte...> |
| Commiter | Austin Yuan |
Move back dri --> src/X11
Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>
Makefile.am (diff) configure.ac (diff) i965_drv_video/Makefile.am (diff) src/Makefile.am (diff)
src/va_backend.h (diff) {dri => src/X11}/Makefile.am
{dri => src/X11}/dri1_util.c {dri => src/X11}/dri2_util.c {dri => src/X11}/va_dri.c {dri => src/X11}/va_dri.h {dri => src/X11}/va_dri2.c {dri => src/X11}/va_dri2.h {dri => src/X11}/va_dri2str.h {dri => src/X11}/va_dri2tokens.h {dri => src/X11}/va_dricommon.c {dri => src/X11}/va_dricommon.h {dri => src/X11}/va_dristr.h {dri => src/X11}/va_x11.c {dri => src/X11}/va_x11.h| @@ -21,7 +21,7 @@ | ||
| 21 | 21 | # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
| 22 | 22 | |
| 23 | 23 | AUTOMAKE_OPTIONS = foreign |
| 24 | -SUBDIRS = dri src dummy_drv_video i965_drv_video test | |
| 24 | +SUBDIRS = src dummy_drv_video i965_drv_video test | |
| 25 | 25 | |
| 26 | 26 | pkgconfigdir = @pkgconfigdir@ |
| 27 | 27 | pkgconfig_DATA = libva.pc |
| @@ -53,7 +53,7 @@ AC_SUBST(pkgconfigdir) | ||
| 53 | 53 | AC_OUTPUT([ |
| 54 | 54 | Makefile |
| 55 | 55 | src/Makefile |
| 56 | - dri/Makefile | |
| 56 | + src/X11/Makefile | |
| 57 | 57 | dummy_drv_video/Makefile |
| 58 | 58 | i965_drv_video/Makefile |
| 59 | 59 | i965_drv_video/shaders/Makefile |
| @@ -22,7 +22,7 @@ | ||
| 22 | 22 | |
| 23 | 23 | SUBDIRS = shaders |
| 24 | 24 | |
| 25 | -AM_CFLAGS = -Wall -I$(top_srcdir)/src -I$(top_srcdir)/dri @DRM_CFLAGS@ -DIN_LIBVA | |
| 25 | +AM_CFLAGS = -Wall -I$(top_srcdir)/src -I$(top_srcdir)/src/X11 @DRM_CFLAGS@ -DIN_LIBVA | |
| 26 | 26 | |
| 27 | 27 | i965_drv_video_la_LTLIBRARIES = i965_drv_video.la |
| 28 | 28 | i965_drv_video_ladir = $(libdir)/dri |
| @@ -21,13 +21,13 @@ | ||
| 21 | 21 | # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
| 22 | 22 | |
| 23 | 23 | INCLUDES = \ |
| 24 | - $(LIBVA_CFLAGS) -I$(top_srcdir)/dri/ \ | |
| 24 | + $(LIBVA_CFLAGS) -I$(top_srcdir)/src/X11 \ | |
| 25 | 25 | -DIN_LIBVA |
| 26 | 26 | |
| 27 | 27 | libva_la_LTLIBRARIES = libva.la |
| 28 | 28 | libva_ladir = $(libdir) |
| 29 | 29 | libva_la_LDFLAGS = -version-number 0:30:4 -no-undefined |
| 30 | -libva_la_LIBADD = $(LIBVA_LIBS) -ldl -lX11 -lXext ../dri/libva_dri.la -ldrm -lXfixes | |
| 30 | +libva_la_LIBADD = $(LIBVA_LIBS) -ldl -lX11 -lXext X11/libva_X11.la -ldrm -lXfixes | |
| 31 | 31 | CFLAGS = -ansi -O2 |
| 32 | 32 | |
| 33 | 33 | nodist_libva_la_SOURCES = va_version.h |
| @@ -39,6 +39,7 @@ va_version.h: Makefile | ||
| 39 | 39 | echo "#define VA_BUILD_DATE \"$(shell date +'%Y%m%d') $(shell date +'1%H%M%S') \"" > va_version.h |
| 40 | 40 | echo "#define VA_BUILD_GIT \"($(shell git log | head -n1 | cut -f2 -d' ')) \" " >> va_version.h |
| 41 | 41 | |
| 42 | +SUBDIRS = X11 | |
| 42 | 43 | |
| 43 | 44 | libva_la_SOURCES = va.c |
| 44 | 45 |
| @@ -20,10 +20,10 @@ | ||
| 20 | 20 | |
| 21 | 21 | AM_CFLAGS = -DLINUX -DIN_LIBVA -I$(top_srcdir)/src $(DRM_CFLAGS) |
| 22 | 22 | |
| 23 | -noinst_LTLIBRARIES = libva_dri.la | |
| 23 | +noinst_LTLIBRARIES = libva_X11.la | |
| 24 | 24 | |
| 25 | -libva_driincludedir = ${includedir}/src | |
| 26 | -libva_driinclude_HEADERS = va_x11.h va_dri.h va_dri2.h va_dricommon.h | |
| 25 | +libva_X11includedir = ${includedir}/va | |
| 26 | +libva_X11include_HEADERS = va_x11.h va_dri.h va_dri2.h va_dricommon.h | |
| 27 | 27 | |
| 28 | -libva_dri_la_SOURCES = va_x11.c va_dri.c va_dri2.c va_dricommon.c dri2_util.c dri1_util.c | |
| 28 | +libva_X11_la_SOURCES = va_x11.c va_dri.c va_dri2.c va_dricommon.c dri2_util.c dri1_util.c | |
| 29 | 29 | CFLAGS = -ansi -O2 |
| @@ -31,7 +31,7 @@ | ||
| 31 | 31 | |
| 32 | 32 | #ifdef IN_LIBVA |
| 33 | 33 | #include "va.h" |
| 34 | -#include "dri/va_x11.h" | |
| 34 | +#include "X11/va_x11.h" | |
| 35 | 35 | #else |
| 36 | 36 | #include <va/va.h> |
| 37 | 37 | #include <va/va_x11.h> |
Fork