From dbf565e9ded5ad9c7d1ce8c2344d027263f62364 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Fri, 10 May 2024 01:09:17 +0200
Subject: main server Imakefile: drop rules for unused or non-existing stuff

---
 nx-X11/programs/Xserver/Imakefile | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

(limited to 'nx-X11')

diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 856661660..36966f3ba 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -58,8 +58,6 @@ INSTPGMFLAGS =
 
 #define FBLibs PreFbLibs FbPostFbLibs
 
-#define MiExtLibs $(SHADOW)
-
 #define AllFBLibs PreFbLibs $(FB) PostFbLibs
 
 #if BuildGlxExt
@@ -76,9 +74,6 @@ INSTPGMFLAGS =
 #if BuildXKB
          XKBEXT = xkb/LibraryTargetName(xkb) dependLib($(OS))
          XKBDIR = xkb
-#if defined(XorgVersion)
-    XF86XKBOBJS = xkb/xf86KillSrv.o xkb/xf86VT.o xkb/xf86Private.o
-#endif
 #endif
 #if BuildDBE
          DBEEXT = dbe/LibraryTargetName(dbe)
@@ -135,8 +130,6 @@ INSTPGMFLAGS =
         BSDEMUL = $(DEPXBSDLIB)
              FB = fb/LibraryTargetName(fb)
          DAMAGE = miext/damage/LibraryTargetName(damage)
-         SHADOW = miext/shadow/LibraryTargetName(shadow)
-          LAYER = miext/layer/LibraryTargetName(layer)
 #if !HasFfs && (defined(mingwArchitecture) || defined(cygwinArchitecture))
              /* Order of libraries is important when linking in mingw or
               * cygwin. libmi.a requires ffs from libdix.a. So it is added
@@ -147,21 +140,11 @@ INSTPGMFLAGS =
 #endif
    MIINITEXTOBJ = mi/miinitext.o
             DIX = dix/LibraryTargetName(dix)
-#if UsbMouseSupport
-#if !HasLibUsb
-            USB = $(XF86OSSRC)/bsd/libusb/LibraryTargetName(usb)
-#else
-            USB = UsbHidLib
-#endif
-#endif
 #ifdef ServerExtraSysLibs
    EXTRASYSLIBS = ServerExtraSysLibs
-#endif
-#if HasPam && HasPamMisc
-        PAMLIBS = PamLibraries PamMiscLibraries
 #endif
         SYSLIBS = $(ZLIB) MathLibrary $(USB) \
-		  $(PAMLIBS)  $(EXTRASYSLIBS)
+		  $(EXTRASYSLIBS)
 #if !HasCbrt
            CBRT = mi/LibraryTargetName(cbrt)
 #endif
@@ -195,11 +178,7 @@ XCOMM
 FBSUBDIR = fb
 MIDAMAGEDIR = miext/damage
 FBDIR  = fb
-#ifndef Win32Architecture
 NXAGENTDDXDIR = hw/nxagent
-#else
-NXAGENTDDXDIR = hw
-#endif
 
 NXAGENTDIRS = $(STDDIRS) $(FBDIR) $(MIDAMAGEDIR) $(NXAGENTDDXDIR) $(DEPDIRS)
 
@@ -407,7 +386,7 @@ nxagent_static_nolibs:  nxagent
 #endif /* NXAgentServer */
 
 
-MIEXTDIRS = $(SHADOWDIR) $(LAYERDIR) $(ROOTLESSDIR) $(MIDAMAGEDIR)
+MIEXTDIRS = $(MIDAMAGEDIR)
 IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR)
 DDXDIRS = $(DECWSDDXDIR) $(SUNDDXDIR) \
 	  $(HPDDXDIR) $(XFREE86DDXDIR) \
-- 
cgit v1.2.3