Move GL/glx on level up now that it's the only thing left under GL.

61 files changed, 5 insertions, 15 deletions

diff --git a/GL/Makefile.am b/GL/Makefile.am
deleted file mode 100644
index c3ac15564..000000000
--- a/GL/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-SUBDIRS = glx
-
-WINDOWS_EXTRAS = \
-	windows/ChangeLog \
-	windows/glwindows.h \
-	windows/glwrap.c \
-	windows/indirect.c
-
-EXTRA_DIST = symlink-mesa.sh $(WINDOWS_EXTRAS)
diff --git a/Makefile.am b/Makefile.am
index d2e10acaf..86ee9e8e3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@ MFB_DIR=mfb
 endif
 
 if GLX
-GLX_DIR=GL
+GLX_DIR=glx
 endif
 
 if DBE
@@ -94,7 +94,7 @@ DIST_SUBDIRS = \
 	damageext \
 	XTrap \
 	composite \
-	GL \
+	glx \
 	exa \
 	config \
 	hw
diff --git a/configure.ac b/configure.ac
index 855e3f152..7c749f52e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -856,7 +856,7 @@ if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then
 	PKG_CHECK_MODULES([GL], [glproto >= 1.4.9 gl >= 7.1.0])
 	AC_SUBST(XLIB_CFLAGS)
 	AC_DEFINE(GLXEXT, 1, [Build GLX extension])
-	GLX_LIBS='$(top_builddir)/GL/glx/libglx.la'
+	GLX_LIBS='$(top_builddir)/glx/libglx.la'
 	GLX_SYS_LIBS="$GLX_SYS_LIBS $DLOPEN_LIBS"
 else
         GLX=no
@@ -1664,7 +1664,7 @@ if test "x$XQUARTZ" = xyes; then
 	AC_DEFINE(XQUARTZ,1,[Have Quartz])
 	AC_DEFINE(ROOTLESS,1,[Build Rootless code])
 
-	DARWIN_GLX_LIBS='$(top_builddir)/hw/xquartz/GL/libCGLCore.la $(top_builddir)/GL/glx/libglx.la'
+	DARWIN_GLX_LIBS='$(top_builddir)/hw/xquartz/GL/libCGLCore.la $(top_builddir)/glx/libglx.la'
 	DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $DARWIN_GLX_LIBS"
 	AC_SUBST([DARWIN_LIBS])
 
@@ -1990,8 +1990,7 @@ XORG_MANPAGE_SECTIONS
 
 AC_OUTPUT([
 Makefile
-GL/Makefile
-GL/glx/Makefile
+glx/Makefile
 include/Makefile
 afb/Makefile
 composite/Makefile
diff --git a/GL/glx/Makefile.am b/glx/Makefile.am
index f62d2ed86..f62d2ed86 100644
--- a/GL/glx/Makefile.am
+++ b/glx/Makefile.am
diff --git a/GL/glx/dispatch.h b/glx/dispatch.h
index 712315608..712315608 100644
--- a/GL/glx/dispatch.h
+++ b/glx/dispatch.h
diff --git a/GL/glx/extension_string.c b/glx/extension_string.c
index a4b202af3..a4b202af3 100644
--- a/GL/glx/extension_string.c
+++ b/glx/extension_string.c
diff --git a/GL/glx/extension_string.h b/glx/extension_string.h
index 98e91bc18..98e91bc18 100644
--- a/GL/glx/extension_string.h
+++ b/glx/extension_string.h
diff --git a/GL/glx/g_disptab.h b/glx/g_disptab.h
index 946e86ba6..946e86ba6 100644
--- a/GL/glx/g_disptab.h
+++ b/glx/g_disptab.h
diff --git a/GL/glx/glapi.c b/glx/glapi.c
index c4d101aee..c4d101aee 100644
--- a/GL/glx/glapi.c
+++ b/glx/glapi.c
diff --git a/GL/glx/glapi.h b/glx/glapi.h
index ddfb1cffb..ddfb1cffb 100644
--- a/GL/glx/glapi.h
+++ b/glx/glapi.h
diff --git a/GL/glx/glapioffsets.h b/glx/glapioffsets.h
index 43c265924..43c265924 100644
--- a/GL/glx/glapioffsets.h
+++ b/glx/glapioffsets.h
diff --git a/GL/glx/glapitable.h b/glx/glapitable.h
index 48941f559..48941f559 100644
--- a/GL/glx/glapitable.h
+++ b/glx/glapitable.h
diff --git a/GL/glx/glapitemp.h b/glx/glapitemp.h
index 09259f470..09259f470 100644
--- a/GL/glx/glapitemp.h
+++ b/glx/glapitemp.h
diff --git a/GL/glx/glprocs.h b/glx/glprocs.h
index 5a99d505e..5a99d505e 100644
--- a/GL/glx/glprocs.h
+++ b/glx/glprocs.h
diff --git a/GL/glx/glthread.c b/glx/glthread.c
index 813d6f9db..813d6f9db 100644
--- a/GL/glx/glthread.c
+++ b/glx/glthread.c
diff --git a/GL/glx/glthread.h b/glx/glthread.h
index e2765cebb..e2765cebb 100644
--- a/GL/glx/glthread.h
+++ b/glx/glthread.h
diff --git a/GL/glx/glxbyteorder.h b/glx/glxbyteorder.h
index cdf6b15f0..cdf6b15f0 100644
--- a/GL/glx/glxbyteorder.h
+++ b/glx/glxbyteorder.h
diff --git a/GL/glx/glxcmds.c b/glx/glxcmds.c
index dcd83525f..dcd83525f 100644
--- a/GL/glx/glxcmds.c
+++ b/glx/glxcmds.c
diff --git a/GL/glx/glxcmdsswap.c b/glx/glxcmdsswap.c
index 7f17c263b..7f17c263b 100644
--- a/GL/glx/glxcmdsswap.c
+++ b/glx/glxcmdsswap.c
diff --git a/GL/glx/glxcontext.h b/glx/glxcontext.h
index 18d3c6fe5..18d3c6fe5 100644
--- a/GL/glx/glxcontext.h
+++ b/glx/glxcontext.h
diff --git a/GL/glx/glxdrawable.h b/glx/glxdrawable.h
index 98e301b88..98e301b88 100644
--- a/GL/glx/glxdrawable.h
+++ b/glx/glxdrawable.h
diff --git a/GL/glx/glxdri.c b/glx/glxdri.c
index 43b0523f3..43b0523f3 100644
--- a/GL/glx/glxdri.c
+++ b/glx/glxdri.c
diff --git a/GL/glx/glxdri2.c b/glx/glxdri2.c
index 9a3bc1fdb..9a3bc1fdb 100644
--- a/GL/glx/glxdri2.c
+++ b/glx/glxdri2.c
diff --git a/GL/glx/glxdricommon.c b/glx/glxdricommon.c
index 13725ae73..13725ae73 100644
--- a/GL/glx/glxdricommon.c
+++ b/glx/glxdricommon.c
diff --git a/GL/glx/glxdricommon.h b/glx/glxdricommon.h
index f88964b36..f88964b36 100644
--- a/GL/glx/glxdricommon.h
+++ b/glx/glxdricommon.h
diff --git a/GL/glx/glxdriswrast.c b/glx/glxdriswrast.c
index 50dee5111..50dee5111 100644
--- a/GL/glx/glxdriswrast.c
+++ b/glx/glxdriswrast.c
diff --git a/GL/glx/glxext.c b/glx/glxext.c
index 85d8debd4..85d8debd4 100644
--- a/GL/glx/glxext.c
+++ b/glx/glxext.c
diff --git a/GL/glx/glxext.h b/glx/glxext.h
index a81850cef..a81850cef 100644
--- a/GL/glx/glxext.h
+++ b/glx/glxext.h
diff --git a/GL/glx/glxscreens.c b/glx/glxscreens.c
index 5859de0b1..5859de0b1 100644
--- a/GL/glx/glxscreens.c
+++ b/glx/glxscreens.c
diff --git a/GL/glx/glxscreens.h b/glx/glxscreens.h
index 39d162d76..39d162d76 100644
--- a/GL/glx/glxscreens.h
+++ b/glx/glxscreens.h
diff --git a/GL/glx/glxserver.h b/glx/glxserver.h
index 518868981..518868981 100644
--- a/GL/glx/glxserver.h
+++ b/glx/glxserver.h
diff --git a/GL/glx/glxutil.c b/glx/glxutil.c
index aa23a95fd..aa23a95fd 100644
--- a/GL/glx/glxutil.c
+++ b/glx/glxutil.c
diff --git a/GL/glx/glxutil.h b/glx/glxutil.h
index 00c7b2084..00c7b2084 100644
--- a/GL/glx/glxutil.h
+++ b/glx/glxutil.h
diff --git a/GL/glx/indirect_dispatch.c b/glx/indirect_dispatch.c
index 2afd3eb22..2afd3eb22 100644
--- a/GL/glx/indirect_dispatch.c
+++ b/glx/indirect_dispatch.c
diff --git a/GL/glx/indirect_dispatch.h b/glx/indirect_dispatch.h
index e81c382f0..e81c382f0 100644
--- a/GL/glx/indirect_dispatch.h
+++ b/glx/indirect_dispatch.h
diff --git a/GL/glx/indirect_dispatch_swap.c b/glx/indirect_dispatch_swap.c
index f137cbe98..f137cbe98 100644
--- a/GL/glx/indirect_dispatch_swap.c
+++ b/glx/indirect_dispatch_swap.c
diff --git a/GL/glx/indirect_program.c b/glx/indirect_program.c
index d23a0a9e6..d23a0a9e6 100644
--- a/GL/glx/indirect_program.c
+++ b/glx/indirect_program.c
diff --git a/GL/glx/indirect_reqsize.c b/glx/indirect_reqsize.c
index 954eecd97..954eecd97 100644
--- a/GL/glx/indirect_reqsize.c
+++ b/glx/indirect_reqsize.c
diff --git a/GL/glx/indirect_reqsize.h b/glx/indirect_reqsize.h
index 26211ee5c..26211ee5c 100644
--- a/GL/glx/indirect_reqsize.h
+++ b/glx/indirect_reqsize.h
diff --git a/GL/glx/indirect_size.h b/glx/indirect_size.h
index 9ba0bd690..9ba0bd690 100644
--- a/GL/glx/indirect_size.h
+++ b/glx/indirect_size.h
diff --git a/GL/glx/indirect_size_get.c b/glx/indirect_size_get.c
index 8f726904f..8f726904f 100644
--- a/GL/glx/indirect_size_get.c
+++ b/glx/indirect_size_get.c
diff --git a/GL/glx/indirect_size_get.h b/glx/indirect_size_get.h
index 4fcb55b4e..4fcb55b4e 100644
--- a/GL/glx/indirect_size_get.h
+++ b/glx/indirect_size_get.h
diff --git a/GL/glx/indirect_table.c b/glx/indirect_table.c
index cb3202605..cb3202605 100644
--- a/GL/glx/indirect_table.c
+++ b/glx/indirect_table.c
diff --git a/GL/glx/indirect_table.h b/glx/indirect_table.h
index 4af1ccbea..4af1ccbea 100644
--- a/GL/glx/indirect_table.h
+++ b/glx/indirect_table.h
diff --git a/GL/glx/indirect_texture_compression.c b/glx/indirect_texture_compression.c
index 3c09663fc..3c09663fc 100644
--- a/GL/glx/indirect_texture_compression.c
+++ b/glx/indirect_texture_compression.c
diff --git a/GL/glx/indirect_util.c b/glx/indirect_util.c
index 58c194c99..58c194c99 100644
--- a/GL/glx/indirect_util.c
+++ b/glx/indirect_util.c
diff --git a/GL/glx/indirect_util.h b/glx/indirect_util.h
index b00727a4d..b00727a4d 100644
--- a/GL/glx/indirect_util.h
+++ b/glx/indirect_util.h
diff --git a/GL/glx/render2.c b/glx/render2.c
index 5b3d3e6d0..5b3d3e6d0 100644
--- a/GL/glx/render2.c
+++ b/glx/render2.c
diff --git a/GL/glx/render2swap.c b/glx/render2swap.c
index 23b7ebd37..23b7ebd37 100644
--- a/GL/glx/render2swap.c
+++ b/glx/render2swap.c
diff --git a/GL/glx/renderpix.c b/glx/renderpix.c
index 2fe630193..2fe630193 100644
--- a/GL/glx/renderpix.c
+++ b/glx/renderpix.c
diff --git a/GL/glx/renderpixswap.c b/glx/renderpixswap.c
index 8455807e6..8455807e6 100644
--- a/GL/glx/renderpixswap.c
+++ b/glx/renderpixswap.c
diff --git a/GL/glx/rensize.c b/glx/rensize.c
index c69619a61..c69619a61 100644
--- a/GL/glx/rensize.c
+++ b/glx/rensize.c
diff --git a/GL/glx/single2.c b/glx/single2.c
index 3387af2a2..3387af2a2 100644
--- a/GL/glx/single2.c
+++ b/glx/single2.c
diff --git a/GL/glx/single2swap.c b/glx/single2swap.c
index 41a42bb0f..41a42bb0f 100644
--- a/GL/glx/single2swap.c
+++ b/glx/single2swap.c
diff --git a/GL/glx/singlepix.c b/glx/singlepix.c
index d6b96defc..d6b96defc 100644
--- a/GL/glx/singlepix.c
+++ b/glx/singlepix.c
diff --git a/GL/glx/singlepixswap.c b/glx/singlepixswap.c
index 032b42765..032b42765 100644
--- a/GL/glx/singlepixswap.c
+++ b/glx/singlepixswap.c
diff --git a/GL/glx/singlesize.c b/glx/singlesize.c
index b5a74f30d..b5a74f30d 100644
--- a/GL/glx/singlesize.c
+++ b/glx/singlesize.c
diff --git a/GL/glx/singlesize.h b/glx/singlesize.h
index 1cce1bcbc..1cce1bcbc 100644
--- a/GL/glx/singlesize.h
+++ b/glx/singlesize.h
diff --git a/GL/glx/swap_interval.c b/glx/swap_interval.c
index 24abd69fa..24abd69fa 100644
--- a/GL/glx/swap_interval.c
+++ b/glx/swap_interval.c
diff --git a/GL/glx/unpack.h b/glx/unpack.h
index 70ba1a893..70ba1a893 100644
--- a/GL/glx/unpack.h
+++ b/glx/unpack.h
diff --git a/GL/glx/xfont.c b/glx/xfont.c
index 9629cf147..9629cf147 100644
--- a/GL/glx/xfont.c
+++ b/glx/xfont.c