Move back dri --> src/X11

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

19 files changed, 11 insertions, 10 deletions

diff --git a/Makefile.am b/Makefile.am
index 055aa94..3515b69 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
diff --git a/configure.ac b/configure.ac
index 54b271b..b19361a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/i965_drv_video/Makefile.am b/i965_drv_video/Makefile.am
index 594b165..8c4be97 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)/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
diff --git a/src/Makefile.am b/src/Makefile.am
index d098ed2..186d24b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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
 
diff --git a/dri/Makefile.am b/src/X11/Makefile.am
index c75f5e7..c4d6d19 100644
--- a/dri/Makefile.am
+++ b/src/X11/Makefile.am
@@ -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 
diff --git a/dri/dri1_util.c b/src/X11/dri1_util.c
index b3db5b4..b3db5b4 100644
--- a/dri/dri1_util.c
+++ b/src/X11/dri1_util.c
diff --git a/dri/dri2_util.c b/src/X11/dri2_util.c
index 1d3c141..1d3c141 100644
--- a/dri/dri2_util.c
+++ b/src/X11/dri2_util.c
diff --git a/dri/va_dri.c b/src/X11/va_dri.c
index ce3b7cd..ce3b7cd 100644
--- a/dri/va_dri.c
+++ b/src/X11/va_dri.c
diff --git a/dri/va_dri.h b/src/X11/va_dri.h
index 91f87a2..91f87a2 100644
--- a/dri/va_dri.h
+++ b/src/X11/va_dri.h
diff --git a/dri/va_dri2.c b/src/X11/va_dri2.c
index c602bba..c602bba 100644
--- a/dri/va_dri2.c
+++ b/src/X11/va_dri2.c
diff --git a/dri/va_dri2.h b/src/X11/va_dri2.h
index a26a839..a26a839 100644
--- a/dri/va_dri2.h
+++ b/src/X11/va_dri2.h
diff --git a/dri/va_dri2str.h b/src/X11/va_dri2str.h
index dc3f2d1..dc3f2d1 100644
--- a/dri/va_dri2str.h
+++ b/src/X11/va_dri2str.h
diff --git a/dri/va_dri2tokens.h b/src/X11/va_dri2tokens.h
index 087159f..087159f 100644
--- a/dri/va_dri2tokens.h
+++ b/src/X11/va_dri2tokens.h
diff --git a/dri/va_dricommon.c b/src/X11/va_dricommon.c
index f9c3dfd..f9c3dfd 100644
--- a/dri/va_dricommon.c
+++ b/src/X11/va_dricommon.c
diff --git a/dri/va_dricommon.h b/src/X11/va_dricommon.h
index a2a51a6..a2a51a6 100644
--- a/dri/va_dricommon.h
+++ b/src/X11/va_dricommon.h
diff --git a/dri/va_dristr.h b/src/X11/va_dristr.h
index 3e391de..3e391de 100644
--- a/dri/va_dristr.h
+++ b/src/X11/va_dristr.h
diff --git a/dri/va_x11.c b/src/X11/va_x11.c
index 4cb8fcd..4cb8fcd 100644
--- a/dri/va_x11.c
+++ b/src/X11/va_x11.c
diff --git a/dri/va_x11.h b/src/X11/va_x11.h
index 2171ac6..2171ac6 100644
--- a/dri/va_x11.h
+++ b/src/X11/va_x11.h
diff --git a/src/va_backend.h b/src/va_backend.h
index 017eafd..64304b8 100644
--- a/src/va_backend.h
+++ b/src/va_backend.h
@@ -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>