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 @@ | |||
35 | #define _HAVE_XALLOC_DECLS | 35 | #define _HAVE_XALLOC_DECLS |
36 | #include "ephyrlog.h" | 36 | #include "ephyrlog.h" |
37 | #include <GL/glxproto.h> | 37 | #include <GL/glxproto.h> |
38 | #include "GL/glx/glxserver.h" | 38 | #include "glx/glxserver.h" |
39 | #include "GL/glx/indirect_table.h" | 39 | #include "glx/indirect_table.h" |
40 | #include "GL/glx/indirect_util.h" | 40 | #include "glx/indirect_util.h" |
41 | #include "GL/glx/unpack.h" | 41 | #include "glx/unpack.h" |
42 | #include "hostx.h" | 42 | #include "hostx.h" |
43 | 43 | ||
44 | 44 | ||
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@ \ | |||
46 | -I$(top_srcdir)/dbe \ | 46 | -I$(top_srcdir)/dbe \ |
47 | -I$(top_srcdir)/hw/xfree86/loader \ | 47 | -I$(top_srcdir)/hw/xfree86/loader \ |
48 | -I$(top_srcdir)/miext/shadow \ | 48 | -I$(top_srcdir)/miext/shadow \ |
49 | -I$(top_srcdir)/GL/glx | 49 | -I$(top_srcdir)/glx |
50 | 50 | ||
51 | libafb_la_LDFLAGS = -avoid-version | 51 | libafb_la_LDFLAGS = -avoid-version |
52 | libafb_la_LIBADD = $(top_builddir)/afb/libafb.la | 52 | libafb_la_LIBADD = $(top_builddir)/afb/libafb.la |
@@ -68,10 +68,10 @@ libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER | |||
68 | 68 | ||
69 | libglx_la_LDFLAGS = -avoid-version | 69 | libglx_la_LDFLAGS = -avoid-version |
70 | if AIGLX | 70 | if AIGLX |
71 | GLXDRI_LIBRARY = $(top_builddir)/GL/glx/libglxdri.la | 71 | GLXDRI_LIBRARY = $(top_builddir)/glx/libglxdri.la |
72 | endif | 72 | endif |
73 | libglx_la_LIBADD = \ | 73 | libglx_la_LIBADD = \ |
74 | $(top_builddir)/GL/glx/libglx.la \ | 74 | $(top_builddir)/glx/libglx.la \ |
75 | $(GLXDRI_LIBRARY) | 75 | $(GLXDRI_LIBRARY) |
76 | libglx_la_SOURCES = glxmodule.c | 76 | libglx_la_SOURCES = glxmodule.c |
77 | 77 | ||
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 | |||
2 | libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \ | 2 | libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \ |
3 | -I$(top_srcdir)/hw/xfree86/os-support \ | 3 | -I$(top_srcdir)/hw/xfree86/os-support \ |
4 | -I$(top_srcdir)/hw/xfree86/os-support/bus \ | 4 | -I$(top_srcdir)/hw/xfree86/os-support/bus \ |
5 | -I$(top_srcdir)/GL/glx \ | 5 | -I$(top_srcdir)/glx \ |
6 | -I$(top_srcdir)/GL/include \ | 6 | -I$(top_srcdir)/GL/include \ |
7 | -I$(top_builddir)/GL/include \ | 7 | -I$(top_builddir)/GL/include \ |
8 | -DHAVE_XORG_CONFIG_H \ | 8 | -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 = \ | |||
22 | $(DIX_CFLAGS) \ | 22 | $(DIX_CFLAGS) \ |
23 | -DHAVE_XGL_CONFIG_H \ | 23 | -DHAVE_XGL_CONFIG_H \ |
24 | -DHAVE_DIX_CONFIG_H \ | 24 | -DHAVE_DIX_CONFIG_H \ |
25 | -I$(top_srcdir)/GL/glx \ | 25 | -I$(top_srcdir)/glx \ |
26 | -I$(top_srcdir)/GL/include \ | 26 | -I$(top_srcdir)/GL/include \ |
27 | -I@MESA_SOURCE@/include \ | 27 | -I@MESA_SOURCE@/include \ |
28 | -I@MESA_SOURCE@/src/mesa/glapi \ | 28 | -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 = \ | |||
11 | AM_CFLAGS = \ | 11 | AM_CFLAGS = \ |
12 | -I$(srcdir)/.. \ | 12 | -I$(srcdir)/.. \ |
13 | -I$(srcdir)/../glxext \ | 13 | -I$(srcdir)/../glxext \ |
14 | -I$(top_srcdir)/GL/glx \ | 14 | -I$(top_srcdir)/glx \ |
15 | -I$(top_srcdir)/GL/include \ | 15 | -I$(top_srcdir)/GL/include \ |
16 | -I@MESA_SOURCE@/include \ | 16 | -I@MESA_SOURCE@/include \ |
17 | -I@MESA_SOURCE@/src/mesa/glapi \ | 17 | -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 = \ | |||
5 | -DHAVE_XGL_CONFIG_H \ | 5 | -DHAVE_XGL_CONFIG_H \ |
6 | -DHAVE_DIX_CONFIG_H \ | 6 | -DHAVE_DIX_CONFIG_H \ |
7 | $(XGLMODULES_CFLAGS) \ | 7 | $(XGLMODULES_CFLAGS) \ |
8 | -I$(top_srcdir)/GL/glx \ | 8 | -I$(top_srcdir)/glx \ |
9 | -I$(top_srcdir)/GL/include \ | 9 | -I$(top_srcdir)/GL/include \ |
10 | -I$(top_srcdir)/hw/xgl \ | 10 | -I$(top_srcdir)/hw/xgl \ |
11 | -I@MESA_SOURCE@/include \ | 11 | -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 = \ | |||
7 | 7 | ||
8 | libglx_la_LDFLAGS = -avoid-version | 8 | libglx_la_LDFLAGS = -avoid-version |
9 | libglx_la_SOURCES = glxmodule.c | 9 | libglx_la_SOURCES = glxmodule.c |
10 | libglx_la_LIBADD = $(top_builddir)/GL/glx/libglx.la | 10 | libglx_la_LIBADD = $(top_builddir)/glx/libglx.la |
11 | libglx_modules = libglx.la | 11 | libglx_modules = libglx.la |
12 | 12 | ||
13 | libglcore_la_LDFLAGS = -avoid-version | 13 | 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 | |||
2 | AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) | 2 | AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) |
3 | AM_CPPFLAGS = \ | 3 | AM_CPPFLAGS = \ |
4 | -I$(top_srcdir) \ | 4 | -I$(top_srcdir) \ |
5 | -I$(top_srcdir)/GL/glx \ | 5 | -I$(top_srcdir)/glx \ |
6 | -I$(top_srcdir)/GL/include \ | 6 | -I$(top_srcdir)/GL/include \ |
7 | -I$(top_srcdir)/GL/mesa/glapi \ | 7 | -I$(top_srcdir)/GL/mesa/glapi \ |
8 | -I$(top_srcdir)/hw/xquartz \ | 8 | -I$(top_srcdir)/hw/xquartz \ |