summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Yuan <shengquan.yuan@intel.com>2009-01-21 06:29:34 -0500
committerAustin Yuan <shengquan.yuan@intel.com>2009-01-21 06:29:34 -0500
commit16a51b8c6c289211c3e991f06fbfb6c68d7ca19c (patch)
treea693b094818780a795606b29cd405751a8ea1e5a
parentb1a802f06a3c9883d7267e804ebf66cdbcf4a0fa (diff)
downloadlibva-16a51b8c6c289211c3e991f06fbfb6c68d7ca19c.tar.gz
Fix path issue of "va_x11.h"
Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>
-rw-r--r--configure.ac2
-rw-r--r--src/Makefile.am4
-rw-r--r--src/X11/Makefile.am (renamed from src/x11/Makefile.am)8
-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_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
-rwxr-xr-xsrc/X11/va_x11.h (renamed from src/x11/va_x11.h)0
-rwxr-xr-xsrc/va_backend.h2
9 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index 249fd6b..48125fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,4 +44,4 @@ PKG_CHECK_MODULES([DRM], [libdrm])
pkgconfigdir=${libdir}/pkgconfig
AC_SUBST(pkgconfigdir)
-AC_OUTPUT([Makefile src/Makefile src/x11/Makefile dummy_drv_video/Makefile test/Makefile libva.pc])
+AC_OUTPUT([Makefile src/Makefile src/X11/Makefile dummy_drv_video/Makefile test/Makefile libva.pc])
diff --git a/src/Makefile.am b/src/Makefile.am
index 6297e12..47c0b7d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,9 +23,9 @@
libva_la_LTLIBRARIES = libva.la
libva_ladir = $(libdir)
libva_la_LDFLAGS = -version-number 0:30:0 -no-undefined
-libva_la_LIBADD = -ldl -lX11 -lXext -lXfixes -lXdamage x11/libva_x11.la
+libva_la_LIBADD = -ldl -lX11 -lXext -lXfixes -lXdamage X11/libva_X11.la
-SUBDIRS = x11
+SUBDIRS = X11
libva_la_SOURCES = va.c
diff --git a/src/x11/Makefile.am b/src/X11/Makefile.am
index 72bfebd..fed2777 100644
--- a/src/x11/Makefile.am
+++ b/src/X11/Makefile.am
@@ -20,9 +20,9 @@
AM_CFLAGS = -DLINUX -I$(top_srcdir)/src $(DRM_CFLAGS)
-noinst_LTLIBRARIES = libva_x11.la
+noinst_LTLIBRARIES = libva_X11.la
-libva_x11includedir = ${includedir}
-libva_x11include_HEADERS = va_x11.h va_dri.h
+libva_X11includedir = ${includedir}/X11
+libva_X11include_HEADERS = va_x11.h va_dri.h
-libva_x11_la_SOURCES = va_x11.c va_dri.c
+libva_X11_la_SOURCES = va_x11.c va_dri.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_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 2d129a9..2d129a9 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 9ef73cd..9ef73cd 100755
--- a/src/x11/va_x11.h
+++ b/src/X11/va_x11.h
diff --git a/src/va_backend.h b/src/va_backend.h
index 3512fd5..5792141 100755
--- a/src/va_backend.h
+++ b/src/va_backend.h
@@ -30,7 +30,7 @@
#define _VA_BACKEND_H_
#include "va.h"
-#include "x11/va_x11.h"
+#include "X11/va_x11.h"
#include <stdlib.h>