[PATCH 20/54] Move DPMS from extmod to built-in
Daniel Stone
daniel at fooishbar.org
Mon Jul 9 18:03:04 PDT 2012
From: Tomas Carnecky <tom at dbservice.com>
Always build DPMS 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 +-
hw/xfree86/dixmods/extmod/modinit.c | 8 --------
include/extinit.h | 2 +-
mi/miinitext.c | 3 +++
4 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index 4f91254..15cbdab 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -103,7 +103,7 @@ endif
# DPMS extension
DPMS_SRCS = dpms.c dpmsproc.h
if DPMSExtension
-MODULE_SRCS += $(DPMS_SRCS)
+BUILTIN_SRCS += $(DPMS_SRCS)
endif
# Now take all of the above, mix well, bake for 10 minutes and get libXext*.la
diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c
index 660b1cd..bb120a2 100644
--- a/hw/xfree86/dixmods/extmod/modinit.c
+++ b/hw/xfree86/dixmods/extmod/modinit.c
@@ -63,14 +63,6 @@ static ExtensionModule extensionModules[] = {
XFree86DGARegister,
NULL},
#endif
-#ifdef DPMSExtension
- {
- DPMSExtensionInit,
- DPMSExtensionName,
- &noDPMSExtension,
- NULL,
- NULL},
-#endif
#ifdef XV
{
XvExtensionInit,
diff --git a/include/extinit.h b/include/extinit.h
index 61768b0..4d8aef5 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -72,7 +72,7 @@ extern void DbeExtensionInit(void);
extern void DMXExtensionInit(void);
#endif
-#if defined(DPMSExtension) && !defined(XorgLoader)
+#if defined(DPMSExtension)
#include <X11/extensions/dpmsconst.h>
extern Bool noDPMSExtension;
extern void DPMSExtensionInit(void);
diff --git a/mi/miinitext.c b/mi/miinitext.c
index abd9e94..7464cab 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -406,6 +406,9 @@ static ExtensionModule staticExtensions[] = {
#ifdef XRECORD
{RecordExtensionInit, "RECORD", &noTestExtensions, NULL},
#endif
+#ifdef DPMSExtension
+ {DPMSExtensionInit, DPMSExtensionName, &noDPMSExtension, NULL},
+#endif
};
/*ARGSUSED*/ void
--
1.7.10.4
More information about the xorg-devel
mailing list