From ca1e857108d412f618f35ed4a665732c809b3f60 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 6 Apr 2016 23:31:52 +0200
Subject: hw/nxagent/NXextension.c: Shrink file, drop duplicate code that is
 indentically found in dix/extension.c.

---
 nx-X11/programs/Xserver/dix/Imakefile | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'nx-X11/programs/Xserver/dix/Imakefile')

diff --git a/nx-X11/programs/Xserver/dix/Imakefile b/nx-X11/programs/Xserver/dix/Imakefile
index 011641279..cc5712126 100644
--- a/nx-X11/programs/Xserver/dix/Imakefile
+++ b/nx-X11/programs/Xserver/dix/Imakefile
@@ -13,6 +13,16 @@ FFS_SRC = ffs.c
 FFS_OBJ = ffs.o
 #endif
 
+#if (!(defined(NXAgentServer) && NXAgentServer))
+NXAGENT_SKIP_SRCS =                  \
+                    extension.c      \
+                    $(NULL)
+NXAGENT_SKIP_OBJS =                  \
+                    extension.o      \
+                    $(NULL)
+#endif
+
+
 SRCS =                          \
        atom.c                   \
        colormap.c               \
@@ -21,7 +31,6 @@ SRCS =                          \
        dispatch.c               \
        dixutils.c               \
        events.c                 \
-       extension.c              \
        gc.c                     \
        globals.c                \
        glyphcurs.c              \
@@ -38,6 +47,7 @@ SRCS =                          \
        dixfonts.c               \
        privates.c               \
        pixmap.c                 \
+       $(NXAGENT_SKIP_SRCS)     \
        $(FFS_SRC)               \
        $(NULL)
 
@@ -49,7 +59,6 @@ OBJS =                          \
        dispatch.o               \
        dixutils.o               \
        events.o                 \
-       extension.o              \
        gc.o                     \
        globals.o                \
        glyphcurs.o              \
@@ -66,6 +75,7 @@ OBJS =                          \
        dixfonts.o               \
        privates.o               \
        pixmap.o                 \
+       $(NXAGENT_SKIP_OBJS)     \
        $(FFS_OBJ)               \
        $(NULL)
 
-- 
cgit v1.2.3