diff options
| author | Tomas Carnecky <tom@dbservice.com> | 2012-07-10 02:03:04 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-07-09 23:28:36 -0700 |
| commit | ba21fc29587e4f11320b88a70433beb1fe22cdf3 (patch) | |
| tree | 0993f94f1c871ad98064b65aedfe1b6a4254d8b7 | |
| parent | 3ed2c6e11298c4299042cfe4578f6cc02e441d58 (diff) | |
Move DPMS from extmod to built-in
Always build DPMS support into the core server, rather than letting it
languish in extmod.
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | Xext/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/extmod/modinit.c | 8 | ||||
| -rw-r--r-- | include/extinit.h | 2 | ||||
| -rw-r--r-- | mi/miinitext.c | 3 |
4 files changed, 5 insertions, 10 deletions
diff --git a/Xext/Makefile.am b/Xext/Makefile.am index 4f91254a4..15cbdab61 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 660b1cda3..bb120a2b2 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 61768b08a..4d8aef574 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 0b4a4cf0f..6aee7c177 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 |