Commit f4525778 authored by Austin Yuan's avatar Austin Yuan

Move back dri --> src/X11

Signed-off-by: default avatarAustin Yuan <shengquan.yuan@intel.com>
parent ec8b1882
......@@ -21,7 +21,7 @@
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AUTOMAKE_OPTIONS = foreign
SUBDIRS = dri src dummy_drv_video i965_drv_video test
SUBDIRS = src dummy_drv_video i965_drv_video test
pkgconfigdir = @pkgconfigdir@
pkgconfig_DATA = libva.pc
......
......@@ -53,7 +53,7 @@ AC_SUBST(pkgconfigdir)
AC_OUTPUT([
Makefile
src/Makefile
dri/Makefile
src/X11/Makefile
dummy_drv_video/Makefile
i965_drv_video/Makefile
i965_drv_video/shaders/Makefile
......
......@@ -22,7 +22,7 @@
SUBDIRS = shaders
AM_CFLAGS = -Wall -I$(top_srcdir)/src -I$(top_srcdir)/dri @DRM_CFLAGS@ -DIN_LIBVA
AM_CFLAGS = -Wall -I$(top_srcdir)/src -I$(top_srcdir)/src/X11 @DRM_CFLAGS@ -DIN_LIBVA
i965_drv_video_la_LTLIBRARIES = i965_drv_video.la
i965_drv_video_ladir = $(libdir)/dri
......
......@@ -21,13 +21,13 @@
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
INCLUDES = \
$(LIBVA_CFLAGS) -I$(top_srcdir)/dri/ \
$(LIBVA_CFLAGS) -I$(top_srcdir)/src/X11 \
-DIN_LIBVA
libva_la_LTLIBRARIES = libva.la
libva_ladir = $(libdir)
libva_la_LDFLAGS = -version-number 0:30:4 -no-undefined
libva_la_LIBADD = $(LIBVA_LIBS) -ldl -lX11 -lXext ../dri/libva_dri.la -ldrm -lXfixes
libva_la_LIBADD = $(LIBVA_LIBS) -ldl -lX11 -lXext X11/libva_X11.la -ldrm -lXfixes
CFLAGS = -ansi -O2
nodist_libva_la_SOURCES = va_version.h
......@@ -39,6 +39,7 @@ va_version.h: Makefile
echo "#define VA_BUILD_DATE \"$(shell date +'%Y%m%d') $(shell date +'1%H%M%S') \"" > va_version.h
echo "#define VA_BUILD_GIT \"($(shell git log | head -n1 | cut -f2 -d' ')) \" " >> va_version.h
SUBDIRS = X11
libva_la_SOURCES = va.c
......
......@@ -20,10 +20,10 @@
AM_CFLAGS = -DLINUX -DIN_LIBVA -I$(top_srcdir)/src $(DRM_CFLAGS)
noinst_LTLIBRARIES = libva_dri.la
noinst_LTLIBRARIES = libva_X11.la
libva_driincludedir = ${includedir}/src
libva_driinclude_HEADERS = va_x11.h va_dri.h va_dri2.h va_dricommon.h
libva_X11includedir = ${includedir}/va
libva_X11include_HEADERS = va_x11.h va_dri.h va_dri2.h va_dricommon.h
libva_dri_la_SOURCES = va_x11.c va_dri.c va_dri2.c va_dricommon.c dri2_util.c dri1_util.c
libva_X11_la_SOURCES = va_x11.c va_dri.c va_dri2.c va_dricommon.c dri2_util.c dri1_util.c
CFLAGS = -ansi -O2
......@@ -31,7 +31,7 @@
#ifdef IN_LIBVA
#include "va.h"
#include "dri/va_x11.h"
#include "X11/va_x11.h"
#else
#include <va/va.h>
#include <va/va_x11.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment