diff options
author | Dan Nicholson <dbn.lists@gmail.com> | 2008-05-21 10:51:15 -0700 |
---|---|---|
committer | Dan Nicholson <dbn.lists@gmail.com> | 2008-05-21 10:51:15 -0700 |
commit | c76fddeea28b4f88db97a2a3487d7a57cd9d578c (patch) | |
tree | afb5fb67fa06901b9f32e27a2b35ed6d6c33d512 | |
parent | c3eb5b80d8cc7ca6a425ccf359718d1ef3d5af55 (diff) |
Fix up paths for GL/glx -> glx renaming
-rw-r--r-- | hw/kdrive/ephyr/ephyrglxext.c | 8 | ||||
-rw-r--r-- | hw/xfree86/dixmods/Makefile.am | 6 | ||||
-rw-r--r-- | hw/xfree86/dri/Makefile.am | 2 | ||||
-rw-r--r-- | hw/xgl/Makefile.am | 2 | ||||
-rw-r--r-- | hw/xgl/glx/Makefile.am | 2 | ||||
-rw-r--r-- | hw/xgl/glxext/Makefile.am | 2 | ||||
-rw-r--r-- | hw/xgl/glxext/module/Makefile.am | 2 | ||||
-rw-r--r-- | hw/xquartz/GL/Makefile.am | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/hw/kdrive/ephyr/ephyrglxext.c b/hw/kdrive/ephyr/ephyrglxext.c index 2e08e392c..63c4ceda4 100644 --- a/hw/kdrive/ephyr/ephyrglxext.c +++ b/hw/kdrive/ephyr/ephyrglxext.c @@ -35,10 +35,10 @@ #define _HAVE_XALLOC_DECLS #include "ephyrlog.h" #include <GL/glxproto.h> -#include "GL/glx/glxserver.h" -#include "GL/glx/indirect_table.h" -#include "GL/glx/indirect_util.h" -#include "GL/glx/unpack.h" +#include "glx/glxserver.h" +#include "glx/indirect_table.h" +#include "glx/indirect_util.h" +#include "glx/unpack.h" #include "hostx.h" diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am index beff9b175..904507971 100644 --- a/hw/xfree86/dixmods/Makefile.am +++ b/hw/xfree86/dixmods/Makefile.am @@ -46,7 +46,7 @@ INCLUDES = @XORG_INCS@ \ -I$(top_srcdir)/dbe \ -I$(top_srcdir)/hw/xfree86/loader \ -I$(top_srcdir)/miext/shadow \ - -I$(top_srcdir)/GL/glx + -I$(top_srcdir)/glx libafb_la_LDFLAGS = -avoid-version libafb_la_LIBADD = $(top_builddir)/afb/libafb.la @@ -68,10 +68,10 @@ libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER libglx_la_LDFLAGS = -avoid-version if AIGLX -GLXDRI_LIBRARY = $(top_builddir)/GL/glx/libglxdri.la +GLXDRI_LIBRARY = $(top_builddir)/glx/libglxdri.la endif libglx_la_LIBADD = \ - $(top_builddir)/GL/glx/libglx.la \ + $(top_builddir)/glx/libglx.la \ $(GLXDRI_LIBRARY) libglx_la_SOURCES = glxmodule.c diff --git a/hw/xfree86/dri/Makefile.am b/hw/xfree86/dri/Makefile.am index ff71731b8..e17cea7fd 100644 --- a/hw/xfree86/dri/Makefile.am +++ b/hw/xfree86/dri/Makefile.am @@ -2,7 +2,7 @@ libdri_la_LTLIBRARIES = libdri.la libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \ -I$(top_srcdir)/hw/xfree86/os-support \ -I$(top_srcdir)/hw/xfree86/os-support/bus \ - -I$(top_srcdir)/GL/glx \ + -I$(top_srcdir)/glx \ -I$(top_srcdir)/GL/include \ -I$(top_builddir)/GL/include \ -DHAVE_XORG_CONFIG_H \ diff --git a/hw/xgl/Makefile.am b/hw/xgl/Makefile.am index ef9fc0ea9..8df8ae9af 100644 --- a/hw/xgl/Makefile.am +++ b/hw/xgl/Makefile.am @@ -22,7 +22,7 @@ AM_CFLAGS = \ $(DIX_CFLAGS) \ -DHAVE_XGL_CONFIG_H \ -DHAVE_DIX_CONFIG_H \ - -I$(top_srcdir)/GL/glx \ + -I$(top_srcdir)/glx \ -I$(top_srcdir)/GL/include \ -I@MESA_SOURCE@/include \ -I@MESA_SOURCE@/src/mesa/glapi \ diff --git a/hw/xgl/glx/Makefile.am b/hw/xgl/glx/Makefile.am index 314c02e96..ea34ea460 100644 --- a/hw/xgl/glx/Makefile.am +++ b/hw/xgl/glx/Makefile.am @@ -11,7 +11,7 @@ SUBDIRS = \ AM_CFLAGS = \ -I$(srcdir)/.. \ -I$(srcdir)/../glxext \ - -I$(top_srcdir)/GL/glx \ + -I$(top_srcdir)/glx \ -I$(top_srcdir)/GL/include \ -I@MESA_SOURCE@/include \ -I@MESA_SOURCE@/src/mesa/glapi \ diff --git a/hw/xgl/glxext/Makefile.am b/hw/xgl/glxext/Makefile.am index 98a9b13c4..f79b855e7 100644 --- a/hw/xgl/glxext/Makefile.am +++ b/hw/xgl/glxext/Makefile.am @@ -5,7 +5,7 @@ AM_CFLAGS = \ -DHAVE_XGL_CONFIG_H \ -DHAVE_DIX_CONFIG_H \ $(XGLMODULES_CFLAGS) \ - -I$(top_srcdir)/GL/glx \ + -I$(top_srcdir)/glx \ -I$(top_srcdir)/GL/include \ -I$(top_srcdir)/hw/xgl \ -I@MESA_SOURCE@/include \ diff --git a/hw/xgl/glxext/module/Makefile.am b/hw/xgl/glxext/module/Makefile.am index 4633f7ffa..67653cde4 100644 --- a/hw/xgl/glxext/module/Makefile.am +++ b/hw/xgl/glxext/module/Makefile.am @@ -7,7 +7,7 @@ AM_CFLAGS = \ libglx_la_LDFLAGS = -avoid-version libglx_la_SOURCES = glxmodule.c -libglx_la_LIBADD = $(top_builddir)/GL/glx/libglx.la +libglx_la_LIBADD = $(top_builddir)/glx/libglx.la libglx_modules = libglx.la libglcore_la_LDFLAGS = -avoid-version diff --git a/hw/xquartz/GL/Makefile.am b/hw/xquartz/GL/Makefile.am index 41d4566dc..450ee5c5b 100644 --- a/hw/xquartz/GL/Makefile.am +++ b/hw/xquartz/GL/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libCGLCore.la AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) AM_CPPFLAGS = \ -I$(top_srcdir) \ - -I$(top_srcdir)/GL/glx \ + -I$(top_srcdir)/glx \ -I$(top_srcdir)/GL/include \ -I$(top_srcdir)/GL/mesa/glapi \ -I$(top_srcdir)/hw/xquartz \ |