Fix usage of XFree86LOADER/XFree86Module/IN_MODULE and update loadable

    module builds to reflect this change.

13 files changed, 57 insertions, 14 deletions

diff --git a/GL/glx/Makefile.am b/GL/glx/Makefile.am
index 8769b602c..8964a9f96 100644
--- a/GL/glx/Makefile.am
+++ b/GL/glx/Makefile.am
@@ -1,11 +1,18 @@
 noinst_LTLIBRARIES = libglx.la
 
-AM_CFLAGS = @DIX_CFLAGS@ @GL_CFLAGS@ @XLIB_CFLAGS@ -I@MESA_SOURCE@/include -DXFree86Server
+AM_CFLAGS = \
+	@DIX_CFLAGS@ \
+	@GL_CFLAGS@ \
+	@XLIB_CFLAGS@ \
+	-I@MESA_SOURCE@/include \
+	-DXFree86Server \
+	@MODULE_DEFINES@ \
+	@LOADER_DEFINES@
 
 # none yet
 #sdk_HEADERS =
 
-INCLUDES = -I$(top_srcdir)/GL/include
+INCLUDES = -I$(top_srcdir)/GL/include -I$(top_srcdir)/hw/xfree86/os-support
 
 nodist_libglx_la_SOURCES = indirect_size.c indirect_size.h
 
diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am
index 80fa91530..56b62e765 100644
--- a/GL/mesa/X/Makefile.am
+++ b/GL/mesa/X/Makefile.am
@@ -12,10 +12,11 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I../tnl \
            -I.. \
            -I$(top_srcdir)/GL/glx \
-           -I$(top_srcdir)/GL/include
+           -I$(top_srcdir)/GL/include \
+           -I$(top_srcdir)/hw/xfree86/os-support
 
 # terribly gross hack.  i need a shower now.
-AM_CFLAGS = $(DIX_CFLAGS) -DXFree86Server -include dix-config.h
+AM_CFLAGS = $(DIX_CFLAGS) -DXFree86Server @MODULE_DEFINES@ @LOADER_DEFINES@
 
 libX_la_SOURCES = xf86glx.c \
                   xf86glx_util.c \
diff --git a/GL/mesa/array_cache/Makefile.am b/GL/mesa/array_cache/Makefile.am
index 318941c56..045f12fc1 100644
--- a/GL/mesa/array_cache/Makefile.am
+++ b/GL/mesa/array_cache/Makefile.am
@@ -1,5 +1,7 @@
 noinst_LTLIBRARIES = libac.la
 
+AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
+
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
            -I../array_cache \
@@ -10,6 +12,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I../swrast \
            -I../swrast_setup \
            -I../tnl \
-           -I..
+           -I.. \
+           -I$(top_srcdir)/hw/xfree86/os-support
 
 nodist_libac_la_SOURCES = ac_context.c ac_import.c
diff --git a/GL/mesa/glapi/Makefile.am b/GL/mesa/glapi/Makefile.am
index 5deb565a7..9dafab35d 100644
--- a/GL/mesa/glapi/Makefile.am
+++ b/GL/mesa/glapi/Makefile.am
@@ -1,5 +1,7 @@
 noinst_LTLIBRARIES = libglapi.la
 
+AM_CFLAGS = -DXFree86Server @MODULE_DEFINES@ @LOADER_DEFINES@
+
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
            -I../array_cache \
@@ -10,6 +12,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I../swrast \
            -I../swrast_setup \
            -I../tnl \
-           -I..
+           -I.. \
+           -I$(top_srcdir)/hw/xfree86/os-support
 
 nodist_libglapi_la_SOURCES = glapi.c glthread.c
diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am
index fe62ff980..50014b11e 100644
--- a/GL/mesa/main/Makefile.am
+++ b/GL/mesa/main/Makefile.am
@@ -1,5 +1,7 @@
 noinst_LTLIBRARIES = libmain.la
 
+AM_CFLAGS = -DXFree86Server @MODULE_DEFINES@ @LOADER_DEFINES@
+
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
            -I../array_cache \
@@ -10,7 +12,8 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I../swrast \
            -I../swrast_setup \
            -I../tnl \
-           -I..
+           -I.. \
+           -I$(top_srcdir)/hw/xfree86/os-support
 
 if NEED_VSNPRINTF
 VSNPRINTF_SOURCES = vsnprintf.c
@@ -37,6 +40,7 @@ nodist_libmain_la_SOURCES = accum.c \
                     enable.c \
                     enums.c \
                     eval.c \
+                    execmem.c \
                     extensions.c \
                     fbobject.c \
                     feedback.c \
@@ -52,6 +56,7 @@ nodist_libmain_la_SOURCES = accum.c \
                     light.c \
                     lines.c \
                     matrix.c \
+                    mm.c \
                     occlude.c \
                     pixel.c \
                     points.c \
diff --git a/GL/mesa/math/Makefile.am b/GL/mesa/math/Makefile.am
index 0f770032e..1d85fb52e 100644
--- a/GL/mesa/math/Makefile.am
+++ b/GL/mesa/math/Makefile.am
@@ -1,5 +1,7 @@
 noinst_LTLIBRARIES = libmath.la
 
+AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
+
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
            -I../array_cache \
@@ -10,7 +12,8 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I../swrast \
            -I../swrast_setup \
            -I../tnl \
-           -I..
+           -I.. \
+           -I$(top_srcdir)/hw/xfree86/os-support
 
 nodist_libmath_la_SOURCES = m_debug_clip.c \
                        m_debug_norm.c \
diff --git a/GL/mesa/shader/Makefile.am b/GL/mesa/shader/Makefile.am
index 7827416ae..4d92c783a 100644
--- a/GL/mesa/shader/Makefile.am
+++ b/GL/mesa/shader/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = grammar slang
 
 noinst_LTLIBRARIES = libshader.la
 
+AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
+
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
            -I../array_cache \
@@ -14,7 +16,8 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I../swrast \
            -I../swrast_setup \
            -I../tnl \
-           -I..
+           -I.. \
+           -I$(top_srcdir)/hw/xfree86/os-support
 
 nodist_libshader_la_SOURCES = arbfragparse.c \
                       arbprogparse.c \
diff --git a/GL/mesa/shader/grammar/Makefile.am b/GL/mesa/shader/grammar/Makefile.am
index 2c97d0bc2..d56a60d51 100644
--- a/GL/mesa/shader/grammar/Makefile.am
+++ b/GL/mesa/shader/grammar/Makefile.am
@@ -1,5 +1,7 @@
 noinst_LTLIBRARIES = libgrammar.la
 
+AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
+
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../../X \
            -I../../array_cache \
@@ -10,6 +12,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I../../swrast \
            -I../../swrast_setup \
            -I../../tnl \
-           -I../..
+           -I../.. \
+           -I$(top_srcdir)/hw/xfree86/os-support
 
 nodist_libgrammar_la_SOURCES = grammar_mesa.c
diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am
index 8d0430399..6b072b88b 100644
--- a/GL/mesa/shader/slang/Makefile.am
+++ b/GL/mesa/shader/slang/Makefile.am
@@ -1,5 +1,7 @@
 noinst_LTLIBRARIES = libslang.la
 
+AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
+
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../grammar \
            -I../../X \
@@ -11,7 +13,8 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I../../swrast \
            -I../../swrast_setup \
            -I../../tnl \
-           -I../..
+           -I../.. \
+           -I$(top_srcdir)/hw/xfree86/os-support
 
 nodist_libslang_la_SOURCES = slang_assemble_assignment.c \
 		      slang_assemble.c \
diff --git a/GL/mesa/swrast/Makefile.am b/GL/mesa/swrast/Makefile.am
index b92786d2d..d8d86652f 100644
--- a/GL/mesa/swrast/Makefile.am
+++ b/GL/mesa/swrast/Makefile.am
@@ -1,5 +1,7 @@
 noinst_LTLIBRARIES = libswrast.la
 
+AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
+
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
            -I../array_cache \
@@ -10,7 +12,8 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I../swrast \
            -I../swrast_setup \
            -I../tnl \
-           -I..
+           -I.. \
+           -I$(top_srcdir)/hw/xfree86/os-support
 
 nodist_libswrast_la_SOURCES = s_aaline.c \
                       s_aatriangle.c \
diff --git a/GL/mesa/swrast_setup/Makefile.am b/GL/mesa/swrast_setup/Makefile.am
index b40dfdcdf..ba09aeed7 100644
--- a/GL/mesa/swrast_setup/Makefile.am
+++ b/GL/mesa/swrast_setup/Makefile.am
@@ -1,5 +1,7 @@
 noinst_LTLIBRARIES = libss.la
 
+AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
+
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
            -I../array_cache \
@@ -10,6 +12,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I../swrast \
            -I../swrast_setup \
            -I../tnl \
-           -I..
+           -I.. \
+           -I$(top_srcdir)/hw/xfree86/os-support
 
 nodist_libss_la_SOURCES = ss_context.c ss_triangle.c
diff --git a/GL/mesa/tnl/Makefile.am b/GL/mesa/tnl/Makefile.am
index caf02c4b1..1bbc4c4cb 100644
--- a/GL/mesa/tnl/Makefile.am
+++ b/GL/mesa/tnl/Makefile.am
@@ -1,5 +1,7 @@
 noinst_LTLIBRARIES = libtnl.la
 
+AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
+
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
            -I../array_cache \
@@ -10,7 +12,8 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I../swrast \
            -I../swrast_setup \
            -I../tnl \
-           -I..
+           -I.. \
+           -I$(top_srcdir)/hw/xfree86/os-support
 
 nodist_libtnl_la_SOURCES = t_array_api.c \
                       t_array_import.c \
diff --git a/GL/symlink-mesa.sh b/GL/symlink-mesa.sh
index 1a2439f29..3acff15c5 100755
--- a/GL/symlink-mesa.sh
+++ b/GL/symlink-mesa.sh
@@ -122,6 +122,7 @@ symlink_mesa_main() {
     action enums.h
     action eval.c
     action eval.h
+    action execmem.c
     action extensions.c
     action extensions.h
     action fbobject.c
@@ -153,6 +154,8 @@ symlink_mesa_main() {
     action macros.h
     action matrix.c
     action matrix.h
+    action mm.c
+    action mm.h
     action mtypes.h
     action occlude.c
     action occlude.h