summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Yuan <shengquan.yuan@intel.com>2009-07-06 17:18:37 +0800
committerAustin Yuan <shengquan.yuan@intel.com>2009-07-06 17:18:37 +0800
commitf217294c47d7cf416f49c21974891b3d4db6501b (patch)
tree5378d9466a07ebf4eca389e46463d46db5af764c
parentf4525778d6dbe3d791c23808fe0d1cef56c87023 (diff)
downloadlibva-f217294c47d7cf416f49c21974891b3d4db6501b.tar.gz
X11->x11 per the suggestion from Gwenole
Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>
-rw-r--r--configure.ac2
-rw-r--r--i965_drv_video/Makefile.am2
-rw-r--r--src/Makefile.am6
-rw-r--r--src/x11/Makefile.am (renamed from src/X11/Makefile.am)8
-rw-r--r--src/x11/dri1_util.c (renamed from src/X11/dri1_util.c)0
-rw-r--r--src/x11/dri2_util.c (renamed from src/X11/dri2_util.c)0
-rw-r--r--src/x11/va_dri.c (renamed from src/X11/va_dri.c)0
-rw-r--r--src/x11/va_dri.h (renamed from src/X11/va_dri.h)0
-rw-r--r--src/x11/va_dri2.c (renamed from src/X11/va_dri2.c)0
-rw-r--r--src/x11/va_dri2.h (renamed from src/X11/va_dri2.h)0
-rw-r--r--src/x11/va_dri2str.h (renamed from src/X11/va_dri2str.h)0
-rw-r--r--src/x11/va_dri2tokens.h (renamed from src/X11/va_dri2tokens.h)0
-rw-r--r--src/x11/va_dricommon.c (renamed from src/X11/va_dricommon.c)0
-rw-r--r--src/x11/va_dricommon.h (renamed from src/X11/va_dricommon.h)0
-rw-r--r--src/x11/va_dristr.h (renamed from src/X11/va_dristr.h)0
-rw-r--r--src/x11/va_x11.c (renamed from src/X11/va_x11.c)0
-rw-r--r--src/x11/va_x11.h (renamed from src/X11/va_x11.h)0
17 files changed, 9 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index b19361a..a3a32e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,7 @@ AC_SUBST(pkgconfigdir)
AC_OUTPUT([
Makefile
src/Makefile
- src/X11/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 8c4be97..32f48ac 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)/src/X11 @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 186d24b..f2f77b2 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)/src/X11 \
+ $(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 X11/libva_X11.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,7 +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
+SUBDIRS = x11
libva_la_SOURCES = va.c
diff --git a/src/X11/Makefile.am b/src/x11/Makefile.am
index c4d6d19..a3642ec 100644
--- a/src/X11/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_X11.la
+noinst_LTLIBRARIES = libva_x11.la
-libva_X11includedir = ${includedir}/va
-libva_X11include_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_X11_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/src/X11/dri1_util.c b/src/x11/dri1_util.c
index b3db5b4..b3db5b4 100644
--- a/src/X11/dri1_util.c
+++ b/src/x11/dri1_util.c
diff --git a/src/X11/dri2_util.c b/src/x11/dri2_util.c
index 1d3c141..1d3c141 100644
--- a/src/X11/dri2_util.c
+++ b/src/x11/dri2_util.c
diff --git a/src/X11/va_dri.c b/src/x11/va_dri.c
index ce3b7cd..ce3b7cd 100644
--- a/src/X11/va_dri.c
+++ b/src/x11/va_dri.c
diff --git a/src/X11/va_dri.h b/src/x11/va_dri.h
index 91f87a2..91f87a2 100644
--- a/src/X11/va_dri.h
+++ b/src/x11/va_dri.h
diff --git a/src/X11/va_dri2.c b/src/x11/va_dri2.c
index c602bba..c602bba 100644
--- a/src/X11/va_dri2.c
+++ b/src/x11/va_dri2.c
diff --git a/src/X11/va_dri2.h b/src/x11/va_dri2.h
index a26a839..a26a839 100644
--- a/src/X11/va_dri2.h
+++ b/src/x11/va_dri2.h
diff --git a/src/X11/va_dri2str.h b/src/x11/va_dri2str.h
index dc3f2d1..dc3f2d1 100644
--- a/src/X11/va_dri2str.h
+++ b/src/x11/va_dri2str.h
diff --git a/src/X11/va_dri2tokens.h b/src/x11/va_dri2tokens.h
index 087159f..087159f 100644
--- a/src/X11/va_dri2tokens.h
+++ b/src/x11/va_dri2tokens.h
diff --git a/src/X11/va_dricommon.c b/src/x11/va_dricommon.c
index f9c3dfd..f9c3dfd 100644
--- a/src/X11/va_dricommon.c
+++ b/src/x11/va_dricommon.c
diff --git a/src/X11/va_dricommon.h b/src/x11/va_dricommon.h
index a2a51a6..a2a51a6 100644
--- a/src/X11/va_dricommon.h
+++ b/src/x11/va_dricommon.h
diff --git a/src/X11/va_dristr.h b/src/x11/va_dristr.h
index 3e391de..3e391de 100644
--- a/src/X11/va_dristr.h
+++ b/src/x11/va_dristr.h
diff --git a/src/X11/va_x11.c b/src/x11/va_x11.c
index 4cb8fcd..4cb8fcd 100644
--- a/src/X11/va_x11.c
+++ b/src/x11/va_x11.c
diff --git a/src/X11/va_x11.h b/src/x11/va_x11.h
index 2171ac6..2171ac6 100644
--- a/src/X11/va_x11.h
+++ b/src/x11/va_x11.h