From: Austin Yuan Date: Fri, 3 Jul 2009 03:04:34 +0000 (+0800) Subject: Move back dri --> src/X11 X-Git-Tag: 20091130_Alpha4~60 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f4525778d6dbe3d791c23808fe0d1cef56c87023;p=profile%2Fivi%2Flibva.git Move back dri --> src/X11 Signed-off-by: Austin Yuan --- 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 similarity index 85% rename from dri/Makefile.am rename to 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 similarity index 100% rename from dri/dri1_util.c rename to src/X11/dri1_util.c diff --git a/dri/dri2_util.c b/src/X11/dri2_util.c similarity index 100% rename from dri/dri2_util.c rename to src/X11/dri2_util.c diff --git a/dri/va_dri.c b/src/X11/va_dri.c similarity index 100% rename from dri/va_dri.c rename to src/X11/va_dri.c diff --git a/dri/va_dri.h b/src/X11/va_dri.h similarity index 100% rename from dri/va_dri.h rename to src/X11/va_dri.h diff --git a/dri/va_dri2.c b/src/X11/va_dri2.c similarity index 100% rename from dri/va_dri2.c rename to src/X11/va_dri2.c diff --git a/dri/va_dri2.h b/src/X11/va_dri2.h similarity index 100% rename from dri/va_dri2.h rename to src/X11/va_dri2.h diff --git a/dri/va_dri2str.h b/src/X11/va_dri2str.h similarity index 100% rename from dri/va_dri2str.h rename to src/X11/va_dri2str.h diff --git a/dri/va_dri2tokens.h b/src/X11/va_dri2tokens.h similarity index 100% rename from dri/va_dri2tokens.h rename to src/X11/va_dri2tokens.h diff --git a/dri/va_dricommon.c b/src/X11/va_dricommon.c similarity index 100% rename from dri/va_dricommon.c rename to src/X11/va_dricommon.c diff --git a/dri/va_dricommon.h b/src/X11/va_dricommon.h similarity index 100% rename from dri/va_dricommon.h rename to src/X11/va_dricommon.h diff --git a/dri/va_dristr.h b/src/X11/va_dristr.h similarity index 100% rename from dri/va_dristr.h rename to src/X11/va_dristr.h diff --git a/dri/va_x11.c b/src/X11/va_x11.c similarity index 100% rename from dri/va_x11.c rename to src/X11/va_x11.c diff --git a/dri/va_x11.h b/src/X11/va_x11.h similarity index 100% rename from dri/va_x11.h rename to 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 #include