diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-04-05 20:58:58 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-04-05 20:58:58 +0200 |
| commit | bb23f7a3d8e1ebdcf59d12d2e51bcaca849818b4 (patch) | |
| tree | 50f18d3c2e4f192322c106bb73fa07869d949091 /nx-X11/programs/Xserver/hw | |
| parent | 8ed8a43d2cad421561d0082949d2bfa9f29c7675 (diff) | |
| parent | d280fa15e571f568125786c216f168bcbfc1d15a (diff) | |
| download | nx-libs-bb23f7a3d8e1ebdcf59d12d2e51bcaca849818b4.tar.gz nx-libs-bb23f7a3d8e1ebdcf59d12d2e51bcaca849818b4.tar.bz2 nx-libs-bb23f7a3d8e1ebdcf59d12d2e51bcaca849818b4.zip | |
Merge branch 'feature/other-Xserver-cleanup' into arctica-3.6.x
Attributes GH PR #8: https://github.com/ArcticaProject/nx-libs/pull/8
Diffstat (limited to 'nx-X11/programs/Xserver/hw')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/Imakefile | 26 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Imakefile | 3 |
2 files changed, 3 insertions, 26 deletions
diff --git a/nx-X11/programs/Xserver/hw/Imakefile b/nx-X11/programs/Xserver/hw/Imakefile deleted file mode 100644 index 6ea7f00a1..000000000 --- a/nx-X11/programs/Xserver/hw/Imakefile +++ /dev/null @@ -1,26 +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 XnestServer -XNESTDIR = xnest -#endif - -#if XVirtualFramebufferServer -XVFBDIR = vfb -#endif - -#if XdmxServer -XDMXDIR = dmx -#endif - -SUBDIRS= $(XNESTDIR) $(XVFBDIR) $(XDMXDIR) - -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) - -#endif 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_)) |