diff options
| -rw-r--r-- | nx-X11/programs/Xserver/Imakefile | 287 |
1 files changed, 1 insertions, 286 deletions
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index c25103373..d6e67d864 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -334,161 +334,6 @@ XCOMM * even if multiple servers that share subdirectories are being built. */ -#if defined(XdecServer) && XdecServer -XCOMM -XCOMM Digital MIPS based WS server (ultrix 4.2 and beyond) -XCOMM -MFBSUBDIR = mfb -CFB8SUBDIR = cfb -DECWSDDXDIR = hw/dec/ws -DECDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DECWSDDXDIR) $(DEPDIRS) -DECOBJS = hw/dec/ws/init.o hw/dec/ws/sdepthinit.o -DECLIBS = hw/dec/ws/LibraryTargetName(dec) CFB8Libs -ServerTarget(Xdec,$(DECDIRS),$(DECOBJS), \ - $(DECLIBS),$(FONTLIBS) $(SYSLIBS)) -#ifndef ServerToInstall -#define ServerToInstall Xdec -#endif -#endif /* XdecServer */ - - -#if defined(XdecMultiDepthServer) && XdecMultiDepthServer -XCOMM -XCOMM Digital MIPS based WS server (ultrix 4.2 and beyond) -XCOMM Supports 8, 12, and 24 bit pixmaps -XCOMM -MFBSUBDIR = mfb -CFB8SUBDIR = cfb -CFB16SUBDIR = cfb16 -CFB24SUBDIR = cfb24 -CFB32SUBDIR = cfb32 -DECWSDDXDIR = hw/dec/ws -DECDIRS1 = $(STDDIRS) $(MFBDIR) \ - $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \ - $(DECWSDDXDIR) $(DEPDIRS) -DECOBJS1 = hw/dec/ws/init.o hw/dec/ws/mdepthinit.o -DECLIBS1 = hw/dec/ws/LibraryTargetName(dec) CFBLibs -ServerTarget(Xdec_md,$(DECDIRS1),$(DECOBJS1), \ - $(DECLIBS1),$(FONTLIBS) $(SYSLIBS)) -#ifndef ServerToInstall -#define ServerToInstall Xdec_md -#endif -#endif /* XdecMultiDepthServer */ - - -#if defined(XsunServer) && XsunServer -XCOMM -XCOMM Sun server -XCOMM -MFBSUBDIR = mfb -CFB8SUBDIR = cfb -SUNDDXDIR = hw/sun -#if DoLoadableServer -SUNOBJS = hw/sun/sunInit.o hw/sun/sunInitExt.o hw/sun/stubs.o -#elif (defined(XF86Server) && XF86Server) \ - || (defined(XorgServer) && XorgServer) -SUNOBJS = hw/sun/sunInit.o hw/sun/stubs.o -#else -SUNOBJS = hw/sun/sunInit.o -#endif -SUNDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(SUNDDXDIR) $(DEPDIRS) -SUNLIBS = hw/sun/LibraryTargetName(sun) CFB8Libs -SUNSYSLIBS = $(FONTLIBS) $(WIDECHARSYSLIB) $(SYSLIBS) -SetUIDServerTarget(Xsun,$(SUNDIRS),$(SUNOBJS), \ - $(LIBCWRAPPER) $(SUNLIBS) $(LOADABLEEXTS),$(SUNSYSLIBS)) -#ifndef ServerToInstall -#define ServerToInstall Xsun -#endif -#endif /* XsunServer */ - - -#if defined(Xsun24Server) && Xsun24Server -XCOMM -XCOMM Sun multiple pixmap depth (8, 12, 24) server -XCOMM -MFBSUBDIR = mfb -CFB8SUBDIR = cfb -CFB16SUBDIR = cfb16 -CFB24SUBDIR = cfb24 -CFB32SUBDIR = cfb32 -SUNDDXDIR = hw/sun -SUN24DIRS = $(STDDIRS) $(MFBDIR) \ - $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \ - $(SUNDDXDIR) $(DEPDIRS) -#if DoLoadableServer -SUN24OBJS = hw/sun/sunInitMulti.o hw/sun/sunInitExt.o hw/sun/stubs.o -#elif defined(XF86Server) && XF86Server \ - || (defined(XorgServer) && XorgServer) -SUN24OBJS = hw/sun/sunInitMulti.o hw/sun/stubs.o -#else -SUN24OBJS = hw/sun/sunInitMulti.o -#endif -SUN24LIBS = hw/sun/LibraryTargetName(sun) CFBLibs -SetUIDServerTarget(Xsun24,$(SUN24DIRS),$(SUN24OBJS), \ - $(LIBCWRAPPER) $(SUN24LIBS) $(LOADABLEEXTS),$(FONTLIBS) $(SYSLIBS)) -#ifndef ServerToInstall -#define ServerToInstall Xsun24 -#endif -#endif /* Xsun24Server */ - - -#if defined(XsunMonoServer) && XsunMonoServer -XCOMM -XCOMM Sun monochrome server -XCOMM -MFBSUBDIR = mfb -SUNDDXDIR = hw/sun -SUNMDIRS = $(STDDIRS) $(MFBDIR) $(SUNDDXDIR) $(DEPDIRS) -#if defined(XF86Server) && XF86Server \ - || (defined(XorgServer) && XorgServer) -SUNMOBJS = hw/sun/sunInitMono.o hw/sun/sunInExMono.o hw/sun/stubs.o -#else -SUNMOBJS = hw/sun/sunInitMono.o hw/sun/sunInExMono.o -#endif -SUNMLIBS = hw/sun/LibraryTargetName(sun) MFBBareLibs $(EXTENSIONS) -SetUIDServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS), \ - $(LIBCWRAPPER) $(SUNMLIBS) $(LOADABLEEXTS),$(FONTLIBS) $(SYSLIBS)) -#ifndef ServerToInstall -#define ServerToInstall XsunMono -#endif -#endif /* XsunMonoServer */ - - -#if defined(XsunLynxServer) && XsunLynxServer -XCOMM -XCOMM Sun server for LynxOS microSPARC 2.4.0 -XCOMM -MFBSUBDIR = mfb -CFB8SUBDIR = cfb -LYNXDDXDIR = hw/sunLynx -SUNDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(LYNXDDXDIR) $(DEPDIRS) -SUNOBJS = hw/sunLynx/sunLyInit.o -SUNLIBS = hw/sunLynx/libsun.a CFB8Libs -ServerTarget(Xsun,$(SUNDIRS),$(SUNOBJS), \ - $(SUNLIBS),$(FONTLIBS) $(SYSLIBS)) -#ifndef ServerToInstall -#define ServerToInstall Xsun -#endif -#endif /* XsunLynxServer */ - - -#if defined(XsunLynxMonoServer) && XsunLynxMonoServer -XCOMM -XCOMM Sun monochrome server for LynxOS microSPARC 2.4.0 -XCOMM -MFBSUBDIR = mfb -LYNXDDXDIR = hw/sunLynx -SUNMDIRS = $(STDDIRS) $(MFBDIR) $(LYNXDDXDIR) $(DEPDIRS) -SUNMOBJS = hw/sunLynx/sunInitMono.o hw/sunLynx/sunInExMono.o -SUNMLIBS = hw/sunLynx/libsun.a MFBBareLibs $(OTHEREXTS) -ServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS), \ - $(SUNMLIBS),$(FONTLIBS) $(SYSLIBS)) -#ifndef ServerToInstall -#define ServerToInstall XsunMono -#endif -#endif /* XsunLynxMonoServer */ - - #if HasParallelMake XCOMM XCOMM force non-parallel build of XF86 servers to prevent MUTEX overrides @@ -955,21 +800,6 @@ nxagent_static_nolibs: nxagent $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lNX_Xext -lNX_X11 $(EXTRA_LOAD_FLAGS) #endif /* NXAgentServer */ -#if defined(XnonServer) && XnonServer -XCOMM -XCOMM non server, just compile sources for build test -XCOMM -MFBSUBDIR = mfb -CFB8SUBDIR = cfb -CFB16SUBDIR = cfb16 -CFB32SUBDIR = cfb32 -#if HasParallelMake -MakeMutex($(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DEPDIRS)) -#endif -Xnon: $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DEPDIRS) -#endif /* XnonServer */ - - #if defined(NXWinServer) && NXWinServer XCOMM XCOMM X Server for MS Windows @@ -1124,126 +954,11 @@ ServerTarget(NXWin,$(NXWINDIRS),$(NXWINOBJS), \ #endif /* NXWinServer */ #endif -#ifdef DarwinArchitecture -/* - * To allow building even when building the client-side libraries is turned - * off, libraries in ProjectRoot are listed as dependencies for some targets. - * This causes problems unless we tell make where to find these dependencies. - */ -VPATH = $(BUILDLIBDIR):$(USRLIBDIR) -#endif - -#if defined(XDarwinServer) && XDarwinServer -XCOMM -XCOMM X Darwin server for Mac OS X / Darwin -XCOMM -FBSUBDIR = fb -MIDAMAGEDIR = miext/damage -SHADOWDIR = miext/shadow -ROOTLESSDIR = miext/rootless -DARWINDDXDIR = hw/darwin -DARWINDIRS = $(STDDIRS) $(FBDIR) $(SHADOWDIR) $(DARWINDDXDIR) $(DEPDIRS) -DARWINOBJS = $(DARWINDDXDIR)/miinitext.o -DARWINLIBS = PreFbLibs $(DARWINDDXDIR)/LibraryTargetName(darwin) -DARWINEXTLIBS = MiExtLibs FbPostFbLibs $(DARWINDDXDIR)/LibraryTargetName(darwin) -DARWINSYSLIBS = $(FONTLIBS) $(SYSLIBS) -framework IOKit -IOKITLIB = $(DARWINDDXDIR)/iokit/LibraryTargetName(iokit) - -/* - * IOKit X server - */ -SetUIDServerTarget(XDarwin,$(DARWINDIRS),$(DARWINOBJS), \ - $(DARWINLIBS) $(IOKITLIB) $(DARWINEXTLIBS),$(DARWINSYSLIBS)) - -#if DarwinQuartzSupport - -QUARTZDIR = $(DARWINDDXDIR)/quartz -QUARTZLIB = $(QUARTZDIR)/LibraryTargetName(XQuartz) -QUARTZSYSLIBS = -framework ApplicationServices -framework Cocoa \ - -framework CoreAudio -framework Carbon -ObjC -ROOTLESSLIB = $(ROOTLESSDIR)/LibraryTargetName(rootless) \ - $(ROOTLESSDIR)/safeAlpha/LibraryTargetName(safeAlpha) \ - $(ROOTLESSDIR)/accel/LibraryTargetName(rlAccel) -XPLUGINLIB = XpluginLibrary - -#if NothingOutsideProjectRoot -XDARWINAPPDIR = $(BINDIR)/XDarwin.app/Contents -#else -XDARWINAPPDIR = /Applications/XDarwin.app/Contents -#endif - -/* - * Quartz X server (installed in its application bundle) - */ -SetUIDServerTarget(XDarwinApp,$(DARWINDIRS),$(DARWINOBJS), \ - $(DARWINLIBS) $(QUARTZLIB) $(DARWINEXTLIBS), \ - $(DARWINSYSLIBS) $(QUARTZSYSLIBS) -u _miDCInitialize) - -install:: - $(MKDIRHIER) $(DESTDIR)$(XDARWINAPPDIR)/MacOS - $(MV) $(DESTDIR)$(BINDIR)/XDarwinApp \ - $(DESTDIR)$(XDARWINAPPDIR)/MacOS/XDarwin - -(cd $(DESTDIR)$(BINDIR); $(RM) XDarwinQuartz; \ - $(LN) $(XDARWINAPPDIR)/MacOS/XDarwin XDarwinQuartz) - -/* - * Display mode bundles for Quartz - * (installed in their own bundles inside XDarwin's) - */ -#if HasXplugin -XPRDIRS = $(QUARTZDIR)/xpr $(ROOTLESSDIR) $(ROOTLESSDIR)/safeAlpha -XPRLIBS = $(QUARTZDIR)/xpr/LibraryTargetName(xpr) $(ROOTLESSLIB) - -BundleProgramTarget(xpr,XDarwinApp,$(XPRDIRS),$(QUARTZDIR)/xpr/xprScreen.o, \ - $(XPRLIBS),-framework ApplicationServices \ - $(XPLUGINLIB),$(XDARWINAPPDIR)/Resources) -#endif - -CRDIRS = $(QUARTZDIR)/cr $(ROOTLESSDIR) $(ROOTLESSDIR)/safeAlpha -CRLIBS = $(QUARTZDIR)/cr/LibraryTargetName(cr) $(ROOTLESSLIB) - -BundleProgramTarget(cr,XDarwinApp,$(CRDIRS),$(QUARTZDIR)/cr/crScreen.o, \ - $(CRLIBS),-framework ApplicationServices -framework Cocoa \ - -framework Carbon -ObjC,$(XDARWINAPPDIR)/Resources) - -FSDIRS = $(QUARTZDIR)/fullscreen $(SHADOWDIR) -FSLIBS = $(QUARTZDIR)/fullscreen/LibraryTargetName(fullscreen) $(SHADOW) - -BundleProgramTarget(fullscreen,XDarwinApp,$(FSDIRS), \ - $(QUARTZDIR)/fullscreen/fullscreen.o,$(FSLIBS), \ - -framework ApplicationServices,$(XDARWINAPPDIR)/Resources) - -/* - * GLX bundles for Quartz - * (installed in their own bundles inside XDarwin's) - */ -BundleProgramTarget(glxAGL,XDarwinApp,GL,GL/glx/glxext.o,GL/glx/libglx.a \ - GL/apple/libAGLcore.a, \ - -framework AGL -framework OpenGL,$(XDARWINAPPDIR)/Resources) - -#if BuildAppleDRI -BundleProgramTarget(glxCGL,XDarwinApp,GL,GL/glx/glxext.o,GL/glx/libglx.a \ - GL/apple/libCGLcore.a, \ - -framework OpenGL $(XPLUGINLIB),$(XDARWINAPPDIR)/Resources) -#endif - -BundleProgramTarget(glxMesa,XDarwinApp,GL,GL/glx/glxext.o,GL/glx/libglx.a \ - GL/mesa/GLcore/libGLcore.a,NullParameter,$(XDARWINAPPDIR)/Resources) - -#else /* !DarwinQuartzSupport */ - -#define ServerToInstall XDarwin - -#endif /* DarwinQuartzSupport */ - -#endif /* XDarwinServer */ - - CFBSUBDIRS = $(CFB8SUBDIR) $(CFB16SUBDIR) $(CFB24SUBDIR) $(CFB32SUBDIR) MIEXTDIRS = $(SHADOWDIR) $(LAYERDIR) $(ROOTLESSDIR) $(MIDAMAGEDIR) IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR) DDXDIRS = $(DECWSDDXDIR) $(SUNDDXDIR) $(LYNXDDXDIR) \ - $(HPDDXDIR) $(XFREE86DDXDIR) $(DARWINDDXDIR) \ + $(HPDDXDIR) $(XFREE86DDXDIR) \ $(NXAGENTDDXDIR) $(NXWINDDXDIR) SUBDIRS = $(STDDIRS) $(MFBSUBDIR) $(CFBSUBDIRS) \ $(IPLANDIRS) $(ILBMDIR) $(AFBSUBDIR) \ |