aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/xkb/Imakefile
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-29 11:18:41 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-11-02 17:54:04 +0100
commit8dab7c21dde79298274fe73b7a4bbe9c71f006de (patch)
tree749c8ef4a8c2040306b17f8db7ae45ddbf6f2404 /nx-X11/programs/Xserver/xkb/Imakefile
parent6eb8d3ec60549e54ea2b4df3e4a53a84045ea1cd (diff)
downloadnx-libs-8dab7c21dde79298274fe73b7a4bbe9c71f006de.tar.gz
nx-libs-8dab7c21dde79298274fe73b7a4bbe9c71f006de.tar.bz2
nx-libs-8dab7c21dde79298274fe73b7a4bbe9c71f006de.zip
Remove extmod from nx-X11/programs/Xserver/Xext/.
This backports (in their essence) these X.org Xserver commits: commit a7a2f9f66ddc27df96557093f3dd266e24eb653b Author: Daniel Stone <daniel@fooishbar.org> 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 <daniel@fooishbar.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> commit 7a11b817e770cd2196814f1ac6264c6d87b76c6a Author: Tomas Carnecky <tom@dbservice.com> 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 <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> commit 7d859bd87834dd79c7fa3792075496ece698c082 Author: Tomas Carnecky <tom@dbservice.com> 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 <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> commit ba21fc29587e4f11320b88a70433beb1fe22cdf3 Author: Tomas Carnecky <tom@dbservice.com> 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 <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> commit 3ed2c6e11298c4299042cfe4578f6cc02e441d58 Author: Tomas Carnecky <tom@dbservice.com> 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 <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> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Conflicts: nx-X11/programs/Xserver/Xext/extmod/Imakefile
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/Imakefile')
-rw-r--r--nx-X11/programs/Xserver/xkb/Imakefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/xkb/Imakefile b/nx-X11/programs/Xserver/xkb/Imakefile
index 1417cbc3f..07d715301 100644
--- a/nx-X11/programs/Xserver/xkb/Imakefile
+++ b/nx-X11/programs/Xserver/xkb/Imakefile
@@ -65,8 +65,6 @@ AllTarget($(XF86_OBJS))
SpecialCObjectRule(xkbInit,$(ICONFIGFILES),$(XKB_DEFINES))
-LinkSourceFile(modinit.h,../Xext/extmod)
-
#if BuildLibraries
#if UseConfDirForXkb
LinkConfDirectory(xkb,.,xkb,.)