From 6471f66c99864dd95a7c4f866825fcb9f8fd3a33 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 3 Mar 2015 12:13:59 +0100 Subject: imake cleanup: Drop all references to XNestServer. --- nx-X11/programs/Xserver/hw/Imakefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'nx-X11/programs/Xserver/hw') 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)) -- cgit v1.2.3 From b1fc73ad4d6042b1213aa9e28c9fca05e7b0409e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 3 Mar 2015 12:30:51 +0100 Subject: imake cleanup: Drop all references to XVirtualFramebufferServer. --- nx-X11/programs/Xserver/hw/Imakefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'nx-X11/programs/Xserver/hw') diff --git a/nx-X11/programs/Xserver/hw/Imakefile b/nx-X11/programs/Xserver/hw/Imakefile index 465b2d241..e01dca4d9 100644 --- a/nx-X11/programs/Xserver/hw/Imakefile +++ b/nx-X11/programs/Xserver/hw/Imakefile @@ -6,15 +6,11 @@ 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 XVirtualFramebufferServer -XVFBDIR = vfb -#endif - #if XdmxServer XDMXDIR = dmx #endif -SUBDIRS= $(XVFBDIR) $(XDMXDIR) +SUBDIRS= $(XDMXDIR) MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) -- cgit v1.2.3 From ebe00df38f264ef71dac3c73d416a74685c8cbd2 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 4 Mar 2015 08:35:50 +0100 Subject: imake cleanup: Drop all references to XdmxServer and BuildXdmx*. --- nx-X11/programs/Xserver/hw/Imakefile | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 nx-X11/programs/Xserver/hw/Imakefile (limited to 'nx-X11/programs/Xserver/hw') diff --git a/nx-X11/programs/Xserver/hw/Imakefile b/nx-X11/programs/Xserver/hw/Imakefile deleted file mode 100644 index e01dca4d9..000000000 --- a/nx-X11/programs/Xserver/hw/Imakefile +++ /dev/null @@ -1,18 +0,0 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:48:20 cpqbld Exp $ -XCOMM This is only used on NT where we do not know how to jump over this dir - -#ifdef Win32Architecture - -#define IHaveSubdirs -#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" - -#if XdmxServer -XDMXDIR = dmx -#endif - -SUBDIRS= $(XDMXDIR) - -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) - -#endif -- cgit v1.2.3 From f5f280417cb0af489406c8c3234e4ad69b008c74 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 4 Mar 2015 13:29:02 +0100 Subject: imake cleanup: Drop all references to XprtServer and BuildXprint*. --- nx-X11/programs/Xserver/hw/nxagent/Imakefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'nx-X11/programs/Xserver/hw') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile index 6c075fa9f..874e82565 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile +++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile @@ -66,6 +66,7 @@ SRCS = NXwindow.c \ Composite.c \ Pixels.c \ stubs.c \ + xpstubs.c \ miinitext.c \ $(SRCS1) @@ -128,6 +129,7 @@ OBJS = NXwindow.o \ Composite.o \ Pixels.o \ stubs.o \ + xpstubs.o \ miinitext.o \ $(OBJS1) @@ -220,6 +222,7 @@ DEFINES = -g $(OS_DEFINES) $(EXT_DEFINES) $(UPG_DEFINES) $(NX_DEFINES) \ all:: $(OBJS) LinkSourceFile(stubs.c,$(SERVERSRC)/Xi) +LinkSourceFile(xpstubs.c,$(SERVERSRC)/dix) SpecialCObjectRule(Init,$(ICONFIGFILES),$(_NOOP_)) LinkSourceFile(miinitext.c,$(SERVERSRC)/mi) SpecialCObjectRule(miinitext,$(ICONFIGFILES), $(_NOOP_)) -- cgit v1.2.3