Drop NXdamage.c

With the previous commits this file finally becomes obsolete.

4 files changed, 0 insertions, 64 deletions

diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index cd81c650b..8c281c453 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -134,9 +134,7 @@ INSTPGMFLAGS =
              OS = os/LibraryTargetName(os)
         BSDEMUL = $(DEPXBSDLIB)
              FB = fb/LibraryTargetName(fb)
-#if (!(defined(NXAgentServer) && NXAgentServer))
          DAMAGE = miext/damage/LibraryTargetName(damage)
-#endif
          SHADOW = miext/shadow/LibraryTargetName(shadow)
           LAYER = miext/layer/LibraryTargetName(layer) 
 #if !HasFfs && (defined(mingwArchitecture) || defined(cygwinArchitecture))
@@ -247,7 +245,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o     \
               hw/nxagent/NXextension.o   \
               hw/nxagent/NXglxext.o      \
               hw/nxagent/NXresource.o    \
-              hw/nxagent/NXdamage.o      \
               $(NULL)
 #elif !defined(Win32Architecture)
 NXAGENTOBJS = hw/nxagent/miinitext.o     \
@@ -264,7 +261,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o     \
               hw/nxagent/NXglxext.o      \
               hw/nxagent/NXxvdisp.o      \
               hw/nxagent/NXresource.o    \
-              hw/nxagent/NXdamage.o      \
               $(NULL)
 #else
 NXAGENTOBJS = hw/nxagent/miinitext.o     \
@@ -281,7 +277,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o     \
               hw/nxagent/NXglxext.o      \
               hw/nxagent/NXxvdisp.o      \
               hw/nxagent/NXresource.o    \
-              hw/nxagent/NXdamage.o      \
               dix/main.o                 \
               $(NULL)
 #endif
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
index ff9538f3e..c300e41db 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
@@ -21,7 +21,6 @@ SRCS =  \
         NXglxext.c \
         NXxvdisp.c \
         NXresource.c \
-	NXdamage.c \
 	NXmitrap.c \
 	Args.c \
 	Binder.c \
@@ -81,7 +80,6 @@ OBJS =  \
         NXglxext.o \
         NXxvdisp.o \
         NXresource.o \
-	NXdamage.o \
 	NXmitrap.o \
 	Args.o \
 	Binder.o \
@@ -139,7 +137,6 @@ INCLUDES = \
 	-I../../mi \
 	-I../../include \
 	-I../../os \
-	-I../../miext/damage \
 	-I../../miext/cw \
 	-I../../GL/glx \
 	-I../../GL/include \
@@ -164,7 +161,6 @@ INCLUDES = \
 	-I../../GL/include \
 	-I../../../../lib/GL/include \
 	-I../../Xext \
-	-I../../miext/damage \
 	-I../../miext/cw \
 	-I../../../../lib/include/X11 \
 	-I$(EXTINCSRC) -I$(XINCLUDESRC) \
@@ -185,7 +181,6 @@ INCLUDES = \
 	-I../../GL/include \
 	-I../../../../lib/GL/include \
 	-I../../Xext \
-	-I../../miext/damage \
 	-I../../miext/cw \
 	-I../../../../../nxcomp \
 	-I../../../../../nxcompshad \
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c b/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c
deleted file mode 100644
index 90aae6a31..000000000
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c
+++ /dev/null
@@ -1,52 +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.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-/*
- * $Id: damage.c,v 1.19 2005/10/06 21:55:41 anholt Exp $
- *
- * Copyright © 2003 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "../../miext/damage/damage.c"
-
-
diff --git a/nx-X11/programs/Xserver/miext/damage/Imakefile b/nx-X11/programs/Xserver/miext/damage/Imakefile
index 900f52add..25d15984c 100644
--- a/nx-X11/programs/Xserver/miext/damage/Imakefile
+++ b/nx-X11/programs/Xserver/miext/damage/Imakefile
@@ -5,7 +5,6 @@
 DEFINES = -DROOTLESS_WORKAROUND
 #endif
 
-#if (!(defined(NXAgentServer) && NXAgentServer))
 SRCS = damage.c
 
 OBJS = damage.o
@@ -22,7 +21,6 @@ NormalLibraryTarget(damage,$(OBJS))
 LintLibraryTarget(damage,$(SRCS))
 
 NormalLintTarget($(SRCS))
-#endif
 
 DependTarget()