diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-03-03 12:13:59 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-04-04 10:53:05 +0200 |
| commit | 6471f66c99864dd95a7c4f866825fcb9f8fd3a33 (patch) | |
| tree | ad929a096538c0708641e1b5dc37930f857b4548 /nx-X11/programs | |
| parent | 9c46d3ddb4394126408a557af98ea9766c554059 (diff) | |
| download | nx-libs-6471f66c99864dd95a7c4f866825fcb9f8fd3a33.tar.gz nx-libs-6471f66c99864dd95a7c4f866825fcb9f8fd3a33.tar.bz2 nx-libs-6471f66c99864dd95a7c4f866825fcb9f8fd3a33.zip | |
imake cleanup: Drop all references to XNestServer.
Diffstat (limited to 'nx-X11/programs')
| -rw-r--r-- | nx-X11/programs/Xserver/Imakefile | 42 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/Imakefile | 6 |
2 files changed, 3 insertions, 45 deletions
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 3e9f00127..7cf43861a 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -542,9 +542,6 @@ XF86SERVER = XFree86 #if defined(XorgServer) && XorgServer XF86SERVER = Xorg #endif -#if defined(XnestServer) && XnestServer -XNEST = Xnext -#endif #if defined(XVirtualFramebufferServer) && XVirtualFramebufferServer XVFB = Xvfb #endif @@ -559,12 +556,11 @@ NXWIN = NXWin #endif #if (defined(XF86Server) && XF86Server) || \ (defined(XorgServer) && XorgServer) || \ - (defined(XnestServer) && XnestServer) || \ (defined(NXAgentServer) && NXAgentServer) || \ (defined(XVirtualFramebufferServer) && XVirtualFramebufferServer) || \ (defined(XdmxServer) && XdmxServer) || \ (!MakeDllModules && defined(NXWinServer) && NXWinServer) -MakeMutex($(XF86SERVER) $(XNEST) $(XVFB) $(NXAGENT) $(NXWIN)) +MakeMutex($(XF86SERVER) $(XVFB) $(NXAGENT) $(NXWIN)) #endif MakeMutex($(STDDIRS) mfb fb cfb cfb16 cfb24 cfb32) #endif @@ -879,40 +875,6 @@ ServerTarget(Xprt,$(XPSUBDIRS),$(XPOBJS), \ $(LIBCWRAPPER) $(XPLIBS) $(LOADABLEEXTS),$(XPSYSLIBS)) #endif /* XprtServer */ -#if defined(XnestServer) && XnestServer -XCOMM -XCOMM Server with Xlib-based ddx -XCOMM -#ifndef Win32Architecture -XNESTDDXDIR = hw/xnest -#else -XNESTDDXDIR = hw -#endif -#if BuildDPMS -XNESTDPMSSTUBOBJS = $(XNESTDDXDIR)/dpmsstubs.o -#endif -XNESTDIRS = $(STDDIRS) $(XNESTDDXDIR) $(DEPDIRS) -#if !defined(LynxOSArchitecture) && \ - !defined(Win32Architecture) && \ - !defined(QNX4Architecture) -XNESTOBJS = hw/xnest/miinitext.o $(XNESTDPMSSTUBOBJS) -#else -XNESTOBJS = hw/xnest/miinitext.o dix/main.o $(XNESTDPMSSTUBOBJS) -#endif -XNEST = hw/xnest/LibraryTargetName(xnest) -XNESTLIBS = PreFbLibs $(XNEST) NoMfbPostFbLibs $(XNEST) -XNESTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) -#if HasParallelMake -MakeMutex($(XNESTDIRS) $(XNESTOBJS) $(XNESTLIBS) $(XNESTSYSLIBS)) -#endif -#if ForceServerRemake -$(XNESTOBJS) $(XNESTLIBS) $(XNESTSYSLIBS):: $(XNESTDIRS) - @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi -#endif -ServerTarget(Xnest,$(XNESTDIRS),$(XNESTOBJS) $(XNESTDEFFILE), \ - $(LIBCWRAPPER) $(XNESTLIBS) $(LOADABLEEXTS),$(XNESTSYSLIBS)) -#endif /* XnestServer */ - #if defined(NXAgentServer) && NXAgentServer XCOMM XCOMM Nested server with NXlib-based ddx and compressed transport. @@ -1448,7 +1410,7 @@ MIEXTDIRS = $(SHADOWDIR) $(LAYERDIR) $(ROOTLESSDIR) $(MIDAMAGEDIR) IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR) DDXDIRS = $(DECWSDDXDIR) $(SUNDDXDIR) $(LYNXDDXDIR) \ $(HPDDXDIR) $(XFREE86DDXDIR) $(DARWINDDXDIR) \ - $(XVFBDDXDIR) $(XNESTDDXDIR) $(XDMXDDXDIR) $(NXAGENTDDXDIR) $(NXWINDDXDIR) + $(XVFBDDXDIR) $(XDMXDDXDIR) $(NXAGENTDDXDIR) $(NXWINDDXDIR) SUBDIRS = $(STDDIRS) $(MFBSUBDIR) $(CFBSUBDIRS) \ $(IPLANDIRS) $(ILBMDIR) $(AFBSUBDIR) \ $(DDXDIRS) $(FBSUBDIR) $(KDRIVEDIRS) $(MIEXTDIRS) diff --git a/nx-X11/programs/Xserver/hw/Imakefile b/nx-X11/programs/Xserver/hw/Imakefile index 6ea7f00a1..465b2d241 100644 --- a/nx-X11/programs/Xserver/hw/Imakefile +++ b/nx-X11/programs/Xserver/hw/Imakefile @@ -6,10 +6,6 @@ XCOMM This is only used on NT where we do not know how to jump over this dir #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" -#if XnestServer -XNESTDIR = xnest -#endif - #if XVirtualFramebufferServer XVFBDIR = vfb #endif @@ -18,7 +14,7 @@ XVFBDIR = vfb XDMXDIR = dmx #endif -SUBDIRS= $(XNESTDIR) $(XVFBDIR) $(XDMXDIR) +SUBDIRS= $(XVFBDIR) $(XDMXDIR) MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) |