Skip to content

N
nx-libs
You need to sign in or sign up before continuing.
Commit e54d2a39 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

nxagent: drop NXextension.c

instead of including it and creating NXextension.o we can simply use the dix version. There are no NX specials anymore.
parent 9120d1b7
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 33 deletions
nx-X11/programs/Xserver/Imakefile
View file @ e54d2a39
...@@ -242,7 +242,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \ ...@@ -242,7 +242,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \
hw/nxagent/NXrender.o \ hw/nxagent/NXrender.o \
hw/nxagent/NXglyph.o \ hw/nxagent/NXglyph.o \
hw/nxagent/NXpicture.o \ hw/nxagent/NXpicture.o \
hw/nxagent/NXextension.o \
hw/nxagent/NXglxext.o \ hw/nxagent/NXglxext.o \
hw/nxagent/NXresource.o \ hw/nxagent/NXresource.o \
$(NULL) $(NULL)
...@@ -257,7 +256,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \ ...@@ -257,7 +256,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \
hw/nxagent/NXrender.o \ hw/nxagent/NXrender.o \
hw/nxagent/NXglyph.o \ hw/nxagent/NXglyph.o \
hw/nxagent/NXpicture.o \ hw/nxagent/NXpicture.o \
hw/nxagent/NXextension.o \
hw/nxagent/NXglxext.o \ hw/nxagent/NXglxext.o \
hw/nxagent/NXxvdisp.o \ hw/nxagent/NXxvdisp.o \
hw/nxagent/NXresource.o \ hw/nxagent/NXresource.o \
...@@ -273,7 +271,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \ ...@@ -273,7 +271,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o \
hw/nxagent/NXrender.o \ hw/nxagent/NXrender.o \
hw/nxagent/NXglyph.o \ hw/nxagent/NXglyph.o \
hw/nxagent/NXpicture.o \ hw/nxagent/NXpicture.o \
hw/nxagent/NXextension.o \
hw/nxagent/NXglxext.o \ hw/nxagent/NXglxext.o \
hw/nxagent/NXxvdisp.o \ hw/nxagent/NXxvdisp.o \
hw/nxagent/NXresource.o \ hw/nxagent/NXresource.o \
......
nx-X11/programs/Xserver/dix/Imakefile
View file @ e54d2a39
...@@ -15,7 +15,6 @@ NXAGENT_SKIP_SRCS = \ ...@@ -15,7 +15,6 @@ NXAGENT_SKIP_SRCS = \
dispatch.c \ dispatch.c \
dixfonts.c \ dixfonts.c \
events.c \ events.c \
extension.c \
glyphcurs.c \ glyphcurs.c \
property.c \ property.c \
resource.c \ resource.c \
...@@ -25,7 +24,6 @@ NXAGENT_SKIP_OBJS = \ ...@@ -25,7 +24,6 @@ NXAGENT_SKIP_OBJS = \
dispatch.o \ dispatch.o \
dixfonts.o \ dixfonts.o \
events.o \ events.o \
extension.o \
glyphcurs.o \ glyphcurs.o \
property.o \ property.o \
resource.o \ resource.o \
...@@ -40,6 +38,7 @@ SRCS = \ ...@@ -40,6 +38,7 @@ SRCS = \
cursor.c \ cursor.c \
devices.c \ devices.c \
dixutils.c \ dixutils.c \
extension.c \
gc.c \ gc.c \
globals.c \ globals.c \
grabs.c \ grabs.c \
...@@ -61,6 +60,7 @@ OBJS = \ ...@@ -61,6 +60,7 @@ OBJS = \
cursor.o \ cursor.o \
devices.o \ devices.o \
dixutils.o \ dixutils.o \
extension.o \
gc.o \ gc.o \
globals.o \ globals.o \
grabs.o \ grabs.o \
......
nx-X11/programs/Xserver/hw/nxagent/Imakefile
View file @ e54d2a39
...@@ -16,7 +16,6 @@ SRCS = \ ...@@ -16,7 +16,6 @@ SRCS = \
NXrender.c \ NXrender.c \
NXglyph.c \ NXglyph.c \
NXpicture.c \ NXpicture.c \
NXextension.c \
NXshm.c \ NXshm.c \
NXglxext.c \ NXglxext.c \
NXxvdisp.c \ NXxvdisp.c \
...@@ -74,7 +73,6 @@ OBJS = \ ...@@ -74,7 +73,6 @@ OBJS = \
NXrender.o \ NXrender.o \
NXglyph.o \ NXglyph.o \
NXpicture.o \ NXpicture.o \
NXextension.o \
NXshm.o \ NXshm.o \
NXglxext.o \ NXglxext.o \
NXxvdisp.o \ NXxvdisp.o \
......
nx-X11/programs/Xserver/hw/nxagent/NXextension.c deleted 100644 → 0
View file @ 9120d1b7
/**************************************************************************/
/* */
/* 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"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment