aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2024-05-10 01:09:17 +0200
committerUlrich Sibiller <uli42@gmx.de>2024-05-20 01:27:00 +0200
commitdbf565e9ded5ad9c7d1ce8c2344d027263f62364 (patch)
tree2139d73a1efb86c7563bd31e186bae27144327ea
parent9684da35a45054f94c2b54822f592ece2160ec33 (diff)
downloadnx-libs-dbf565e9ded5ad9c7d1ce8c2344d027263f62364.tar.gz
nx-libs-dbf565e9ded5ad9c7d1ce8c2344d027263f62364.tar.bz2
nx-libs-dbf565e9ded5ad9c7d1ce8c2344d027263f62364.zip
main server Imakefile: drop rules for unused or non-existing stuff
-rw-r--r--nx-X11/programs/Xserver/Imakefile25
1 files changed, 2 insertions, 23 deletions
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) \