GLX fix for loadable servers: indirect_size.c goes in libglx, not libGLcore

3 files changed, 12 insertions, 7 deletions

diff --git a/GL/glx/Makefile.am b/GL/glx/Makefile.am
index 4ad2826f2..095a70657 100644
--- a/GL/glx/Makefile.am
+++ b/GL/glx/Makefile.am
@@ -42,6 +42,8 @@ libglx_la_SOURCES = \
         glxutil.c \
         glxutil.h \
         impsize.h \
+        indirect_size.c \
+        indirect_size.h \
         render2.c \
         render2swap.c \
         renderpix.c \
diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am
index fb514e50f..1a237f728 100644
--- a/GL/mesa/X/Makefile.am
+++ b/GL/mesa/X/Makefile.am
@@ -25,5 +25,4 @@ nodist_libX_la_SOURCES = xf86glx.c \
                   xm_line.c \
                   xm_span.c \
                   xm_tri.c \
-		  indirect_size.c \
 		  drivers/common/driverfuncs.c
diff --git a/GL/symlink-mesa.sh b/GL/symlink-mesa.sh
index 833ec607a..ef176a2c5 100755
--- a/GL/symlink-mesa.sh
+++ b/GL/symlink-mesa.sh
@@ -472,12 +472,6 @@ symlink_mesa_x() {
     dst_dir mesa/X/drivers/common
     action driverfuncs.c
     action driverfuncs.h
-
-    # and another
-    src_dir src/glx/x11
-    dst_dir mesa/X
-    action indirect_size.c
-    action indirect_size.h
 }
 
 symlink_mesa_ppc() {
@@ -519,6 +513,15 @@ symlink_mesa() {
     symlink_mesa_x8664
 }
 
+symlink_glx() {
+    # this is... unpleasant
+    src_dir src/glx/x11
+    dst_dir glx
+
+    action indirect_size.c
+    action indirect_size.h
+}
+
 #########
 #
 #    Helper functions
@@ -545,6 +548,7 @@ run() {
     # $2 explanation
 
     ACTION=$1 EXPLANATION=$2 run_module mesa
+    ACTION=$1 EXPLANATION=$2 run_module glx
 }
 
 src_dir() {