aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nx-X11/programs/Xserver/Imakefile3
-rw-r--r--nx-X11/programs/Xserver/dix/Imakefile4
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Imakefile2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXextension.c26
4 files changed, 2 insertions, 33 deletions
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 8c281c453..bce802ec4 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -242,7 +242,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \
hw/nxagent/NXrender.o \
hw/nxagent/NXglyph.o \
hw/nxagent/NXpicture.o \
- hw/nxagent/NXextension.o \
hw/nxagent/NXglxext.o \
hw/nxagent/NXresource.o \
$(NULL)
@@ -257,7 +256,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \
hw/nxagent/NXrender.o \
hw/nxagent/NXglyph.o \
hw/nxagent/NXpicture.o \
- hw/nxagent/NXextension.o \
hw/nxagent/NXglxext.o \
hw/nxagent/NXxvdisp.o \
hw/nxagent/NXresource.o \
@@ -273,7 +271,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \
hw/nxagent/NXrender.o \
hw/nxagent/NXglyph.o \
hw/nxagent/NXpicture.o \
- hw/nxagent/NXextension.o \
hw/nxagent/NXglxext.o \
hw/nxagent/NXxvdisp.o \
hw/nxagent/NXresource.o \
diff --git a/nx-X11/programs/Xserver/dix/Imakefile b/nx-X11/programs/Xserver/dix/Imakefile
index ccdae3b82..3cdcdd9bf 100644
--- a/nx-X11/programs/Xserver/dix/Imakefile
+++ b/nx-X11/programs/Xserver/dix/Imakefile
@@ -15,7 +15,6 @@ NXAGENT_SKIP_SRCS = \
dispatch.c \
dixfonts.c \
events.c \
- extension.c \
glyphcurs.c \
property.c \
resource.c \
@@ -25,7 +24,6 @@ NXAGENT_SKIP_OBJS = \
dispatch.o \
dixfonts.o \
events.o \
- extension.o \
glyphcurs.o \
property.o \
resource.o \
@@ -40,6 +38,7 @@ SRCS = \
cursor.c \
devices.c \
dixutils.c \
+ extension.c \
gc.c \
globals.c \
grabs.c \
@@ -61,6 +60,7 @@ OBJS = \
cursor.o \
devices.o \
dixutils.o \
+ extension.o \
gc.o \
globals.o \
grabs.o \
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
index 58fb43403..b6a343e68 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
@@ -16,7 +16,6 @@ SRCS = \
NXrender.c \
NXglyph.c \
NXpicture.c \
- NXextension.c \
NXshm.c \
NXglxext.c \
NXxvdisp.c \
@@ -74,7 +73,6 @@ OBJS = \
NXrender.o \
NXglyph.o \
NXpicture.o \
- NXextension.o \
NXshm.o \
NXglxext.o \
NXxvdisp.o \
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXextension.c b/nx-X11/programs/Xserver/hw/nxagent/NXextension.c
deleted file mode 100644
index db5d97cd8..000000000
--- a/nx-X11/programs/Xserver/hw/nxagent/NXextension.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/**************************************************************************/
-/* */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de> */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de> */
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */
-/* */
-/* NXAGENT, NX protocol compression and NX extensions to this software */
-/* are copyright of the aforementioned persons and companies. */
-/* */
-/* Redistribution and use of the present software is allowed according */
-/* to terms specified in the file LICENSE which comes in the source */
-/* distribution. */
-/* */
-/* All rights reserved. */
-/* */
-/* NOTE: This software has received contributions from various other */
-/* contributors, only the core maintainers and supporters are listed as */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well. */
-/* */
-/**************************************************************************/
-
-#include "../../dix/extension.c"