[PATCH 15/42] Move XRes from extmod to built-in

[Daniel Stone]

From: Tomas Carnecky <tom at dbservice.com>

Always build XRes support into the core server, rather than letting it
languish in extmod.

Signed-off-by: Tomas Carnecky <tom at dbservice.com>
Reviewed-by: Daniel Stone <daniel at fooishbar.org>
Reviewed-by: Jamey Sharp <jamey at minilop.net>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 Xext/Makefile.am                    |    2 +-
 Xext/xres.c                         |    2 ++
 hw/xfree86/dixmods/extmod/modinit.c |    9 ---------
 mi/miinitext.c                      |    3 +++
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index adea06e..04e1b36 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -52,7 +52,7 @@ endif
 # XResource extension: lets clients get data about per-client resource usage
 RES_SRCS = xres.c
 if RES
-MODULE_SRCS  += $(RES_SRCS)
+BUILTIN_SRCS  += $(RES_SRCS)
 endif
 
 # MIT ScreenSaver extension
diff --git a/Xext/xres.c b/Xext/xres.c
index 707e02d..ea46925 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -23,6 +23,8 @@
 #include "extinit.h"
 #include "protocol-versions.h"
 
+extern void ResExtensionInit(void);
+
 static int
 ProcXResQueryVersion (ClientPtr client)
 {
diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c
index 69a70dd..ca3eca3 100644
--- a/hw/xfree86/dixmods/extmod/modinit.c
+++ b/hw/xfree86/dixmods/extmod/modinit.c
@@ -82,15 +82,6 @@ static ExtensionModule extensionModules[] = {
         NULL
     },
 #endif
-#ifdef RES
-    {
-        ResExtensionInit,
-        XRES_NAME, 
-        &noResExtension,
-        NULL,
-        NULL
-    },
-#endif
     {				/* DON'T delete this entry ! */
 	NULL,
 	NULL,
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 9b0fa60..f5f23c6 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -363,6 +363,9 @@ static ExtensionModule staticExtensions[] = {
 #ifdef DPMSExtension
     { DPMSExtensionInit, DPMSExtensionName, &noDPMSExtension, NULL },
 #endif
+#ifdef RES
+    { ResExtensionInit, XRES_NAME, &noResExtension, NULL },
+#endif
     { NULL, NULL, NULL, NULL, NULL }
 };
     
-- 
1.7.7.3