From 8dab7c21dde79298274fe73b7a4bbe9c71f006de Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 29 Oct 2016 11:18:41 +0200 Subject: Remove extmod from nx-X11/programs/Xserver/Xext/. This backports (in their essence) these X.org Xserver commits: commit a7a2f9f66ddc27df96557093f3dd266e24eb653b Author: Daniel Stone Date: Tue Jul 10 02:03:13 2012 +0100 Remove the last remnants of extmod extmod was originally a big pointless module. Now it's an empty, pointless module. This commit makes it unexist. Signed-off-by: Daniel Stone Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer Signed-off-by: Keith Packard commit 7a11b817e770cd2196814f1ac6264c6d87b76c6a Author: Tomas Carnecky Date: Tue Jul 10 02:03:06 2012 +0100 Move Xv and XvMC from extmod to built-in Always build these extensions into the core server, rather than letting them languish in extmod. Signed-off-by: Tomas Carnecky Reviewed-by: Daniel Stone Reviewed-by: Jamey Sharp Signed-off-by: Peter Hutterer Signed-off-by: Keith Packard commit 7d859bd87834dd79c7fa3792075496ece698c082 Author: Tomas Carnecky Date: Tue Jul 10 02:03:05 2012 +0100 Move XRes from extmod to built-in Always build XRes support into the core server, rather than letting it languish in extmod. Signed-off-by: Tomas Carnecky Reviewed-by: Daniel Stone Reviewed-by: Jamey Sharp Signed-off-by: Peter Hutterer Signed-off-by: Keith Packard commit ba21fc29587e4f11320b88a70433beb1fe22cdf3 Author: Tomas Carnecky Date: Tue Jul 10 02:03:04 2012 +0100 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 Reviewed-by: Daniel Stone Reviewed-by: Jamey Sharp Signed-off-by: Peter Hutterer Signed-off-by: Keith Packard commit 3ed2c6e11298c4299042cfe4578f6cc02e441d58 Author: Tomas Carnecky Date: Tue Jul 10 02:03:03 2012 +0100 Move MIT-SCREEN-SAVER from extmod to built-in If we've built MIT-SCREEN-SAVER support, then just build it into the main binary, rather than leaving it in extmod. Signed-off-by: Tomas Carnecky Reviewed-by: Daniel Stone Reviewed-by: Jamey Sharp Signed-off-by: Peter Hutterer Signed-off-by: Keith Packard Backported-to-NX-by: Mike Gabriel Conflicts: nx-X11/programs/Xserver/Xext/extmod/Imakefile --- nx-X11/programs/Xserver/Xext/extmod/Imakefile | 66 --------------------------- 1 file changed, 66 deletions(-) delete mode 100644 nx-X11/programs/Xserver/Xext/extmod/Imakefile (limited to 'nx-X11/programs/Xserver/Xext/extmod/Imakefile') diff --git a/nx-X11/programs/Xserver/Xext/extmod/Imakefile b/nx-X11/programs/Xserver/Xext/extmod/Imakefile deleted file mode 100644 index 0105cf775..000000000 --- a/nx-X11/programs/Xserver/Xext/extmod/Imakefile +++ /dev/null @@ -1,66 +0,0 @@ -#define IHaveModules -#include - -#if BuildScreenSaverExt - SCRNSAVSRC = saver.c - SCRNSAVOBJ = saver.o -LinkSourceFile(saver.c,..) -#endif - -#if BuildDPMS - DPMSSRCS = dpms.c - DPMSOBJS = dpms.o -LinkSourceFile(dpms.c,..) -#endif - -#if BuildXvExt - XVSRCS = xvmain.c xvdisp.c xvmod.c xvmc.c - XVOBJS = xvmain.o xvdisp.o xvmod.o xvmc.o -LinkSourceFile(xvmain.c,..) -LinkSourceFile(xvdisp.c,..) -LinkSourceFile(xvmod.c,..) -LinkSourceFile(xvmc.c,..) -#endif - -#if BuildXResExt - XRESSRCS = xres.c - XRESOBJS = xres.o -LinkSourceFile(xres.c,..) -#endif - - MODINITSRCS = modinit.c - MODINITOBJS = modinit.o - - SRCS = shape.c \ - bigreq.c sync.c $(SCRNSAVSRC) xcmisc.c \ - $(DPMSSRCS) \ - $(XVSRCS) $(MODINITSRCS) $(XRESSRCS) - - MOBJS = $(MODINITOBJS) shape.o \ - bigreq.o sync.o $(SCRNSAVOBJ) xcmisc.o \ - $(DPMSOBJS) \ - $(XVOBJS) $(XRESOBJS) - - DEFINES = -DEXTMODULE $(EXT_DEFINES) - -XF86INCLUDES = -I$(XF86COMSRC) - INCLUDES = -I.. -I../../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - $(XF86INCLUDES) - LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln - -LinkSourceFile(shape.c,..) -LinkSourceFile(bigreq.c,..) -LinkSourceFile(sync.c,..) -LinkSourceFile(xcmisc.c,..) - -ModuleObjectRule() - -SpecialCObjectRule(modinit,$(ICONFIGFILES),$(EXT_DEFINES)) -LibraryModuleTarget(extmod,$(MOBJS)) -NormalLintTarget($(SRCS)) - -InstallLibraryModule(extmod,$(MODULEDIR),extensions) - -DependTarget() - -InstallDriverSDKLibraryModule(extmod,$(DRIVERSDKMODULEDIR),extensions) -- cgit v1.2.3