Fix path issue of "va_x11.h"

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

diff --git a/configure.ac b/configure.ac
index 249fd6b..48125fe 100644 (file)
--- 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 (file)
--- 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
similarity index 87%
rename from src/x11/Makefile.am
rename to src/X11/Makefile.am
index 72bfebd..fed2777 100644 (file)
--- 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
similarity index 100%
rename from src/x11/va_dri.c
rename to src/X11/va_dri.c

diff --git a/src/x11/va_dri.h b/src/X11/va_dri.h
similarity index 100%
rename from src/x11/va_dri.h
rename to src/X11/va_dri.h

diff --git a/src/x11/va_dristr.h b/src/X11/va_dristr.h
similarity index 100%
rename from src/x11/va_dristr.h
rename to src/X11/va_dristr.h

diff --git a/src/x11/va_x11.c b/src/X11/va_x11.c
similarity index 100%
rename from src/x11/va_x11.c
rename to src/X11/va_x11.c

diff --git a/src/x11/va_x11.h b/src/X11/va_x11.h
similarity index 100%
rename from src/x11/va_x11.h
rename to src/X11/va_x11.h

diff --git a/src/va_backend.h b/src/va_backend.h
index 3512fd5..5792141 100755 (executable)
--- 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>