summaryrefslogtreecommitdiff
path: root/xc/programs/Xserver/Imakefile
diff options
context:
space:
mode:
Diffstat (limited to 'xc/programs/Xserver/Imakefile')
-rw-r--r--xc/programs/Xserver/Imakefile235
1 files changed, 227 insertions, 8 deletions
diff --git a/xc/programs/Xserver/Imakefile b/xc/programs/Xserver/Imakefile
index 4b96fedd0..ab6d833e0 100644
--- a/xc/programs/Xserver/Imakefile
+++ b/xc/programs/Xserver/Imakefile
@@ -2,7 +2,7 @@ XCOMM $TOG: Imakefile /main/249 1997/12/11 11:18:14 kaleb $
/*
* Server Master Makefile
*/
-XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.168 1999/08/14 10:49:21 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.172 1999/12/30 03:56:17 robin Exp $
#ifndef InstallXserverSetUID
#define InstallXserverSetUID NO
@@ -43,6 +43,8 @@ INSTPGMFLAGS =
#define NoMFBCFBLibs PreFbLibs $(CFB) NoMfbPostFbLibs
#define NoMFBCFB8Libs PreFbLibs $(CFB8) NoMfbPostFbLibs
+#define FbPostFbLibs $(FB) NoMfbPostFbLibs
+#define FBLibs PreFbLibs FbPostFbLibs
#if BuildPexExt
PEXLIBS = PEX5/dipex/dispatch/ModuleLibraryTargetName(didipex) \
@@ -82,8 +84,8 @@ INSTPGMFLAGS =
GL/mesa/src/ModuleLibraryTargetName(GLcore)
#else
GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \
- GL/mesa/src/ModuleLibraryTargetName(GLcore) \
GL/mesa/src/X/ModuleLibraryTargetName(GLcoreX) \
+ GL/mesa/src/ModuleLibraryTargetName(GLcore) \
$(DRILIB)
#endif
#endif
@@ -202,6 +204,7 @@ XPFBLIBS = dix/LibraryTargetName(xpstubs)
BSDEMUL = $(DEPXBSDLIB)
#if DoLoadableServer
MFB = mfb/ModuleLibraryTargetName(mfb)
+ FB = fb/ModuleLibraryTargetName(fb)
CFB = cfb/ModuleLibraryTargetName(cfb) \
cfb16/ModuleLibraryTargetName(cfb16) \
cfb24/ModuleLibraryTargetName(cfb24) \
@@ -217,6 +220,7 @@ XPFBLIBS = dix/LibraryTargetName(xpstubs)
cfb32/ModuleLibraryTargetName(cfb32)
#else
MFB = mfb/LibraryTargetName(mfb)
+ FB = fb/LibraryTargetName(fb)
CFB = cfb/LibraryTargetName(cfb) cfb16/LibraryTargetName(cfb16) \
cfb24/LibraryTargetName(cfb24) cfb32/LibraryTargetName(cfb32)
CFB8 = cfb/LibraryTargetName(cfb)
@@ -519,8 +523,7 @@ XNEST = Xnest
#if XVirtualFramebufferServer && !MakeDllModules
XVFB = Xvfb
#endif
-#if defined(XF86Server) || (!MakeDllModules &&
- (defined(XnestServer) || defined(XVirtualFramebufferServer)))
+#if defined(XF86Server) || (!MakeDllModules && (defined(XnestServer) || defined(XVirtualFramebufferServer)))
MakeMutex($(XF86SERVER) $(XNEST) $(XVFB))
#endif
MakeMutex($(STDDIRS) mfb cfb cfb16 cfb32)
@@ -589,11 +592,16 @@ XF86DDCLIB = $(XF86SRC)/ddc/LibraryTargetName(ddc)
#if XF86RAC
XF86RACLIB = $(XF86SRC)/rac/LibraryTargetName(rac)
#endif
+#if XF86INT10
+XF86INT10LIB = $(XF86OSSRC)/LibraryTargetName(int10)
+#else
+XF86INT10LIB = $(XF86OSSRC)/int10/stub.o
+#endif
XF86IDRIVERLIB = $(XF86SRC)/input/LibraryTargetName(idriver)
#if !DoLoadableServer
XF86DRVOBJS = $(XF86SRC)/drivers/drvConf.o
XF86DRVLIBS = $(XF86DRIVERLIB) $(XF86RAMDACLIB) $(XF86DDCLIB) $(XF86I2CLIB) \
- $(XF86XAALIB) $(XF86VGAHWLIB) $(XF86FBDEVHWLIB) \
+ $(XF86INT10LIB) $(XF86XAALIB) $(XF86VGAHWLIB) $(XF86FBDEVHWLIB) \
$(XF8_32BPPLIB) $(XF8_16BPPLIB) $(XF24_32BPPLIB) \
$(XF4BPPLIB) $(XF1BPPLIB) $(XFSHADOWFBLIB) $(AFBLIB)
XF86IDRVOBJS = $(XF86SRC)/input/drvConf.o
@@ -633,6 +641,217 @@ ServerDriverSDKTarget(XFree86)
#endif
#endif /* XF86Server */
+XCOMM
+XCOMM Tiny X server section
+XCOMM
+
+ KDRIVE = hw/kdrive
+#ifdef LinuxArchitecture
+ KDOSDIR = $(KDRIVE)/linux
+ KDOS = $(KDOSDIR)/LibraryTargetName(linux)
+#endif
+
+#ifdef VXWORKS
+ KDOSDIR = $(KDRIVE)/vxworks
+ KDOS = $(KDOSDIR)/LibraryTargetName(vxworks)
+#endif
+
+#if BuildPseudo8
+ PSEUDO8 = $(KDRIVE)/pseudo8/LibraryTargetName(pseudo8)
+ PSEUDO8DIR = $(KDRIVE)/pseudo8
+#endif
+ KD = $(KDRIVE)/LibraryTargetName(kdrive)
+ KDFBDEV = $(KDRIVE)/fbdev/LibraryTargetName(fbdev)
+
+
+#define StdKdDirs $(KDRIVE) $(KDOSDIR) $(PSEUDO8DIR) fb $(DEPDIRS)
+#define StdKdSysLibs $(FONTLIBS) $(SYSLIBS)
+#define KdLibs $(KD) $(KDOS) $(PSEUDO8)
+
+#if XfbdevServer
+XCOMM
+XCOMM server with Keith's fbdev driver only
+XCOMM
+
+ FBDEVDIR = $(KDRIVE)/fbdev
+ FBDEV = $(FBDEVDIR)/LibraryTargetName(fbdev)
+
+ KDDIRS = StdKdDirs
+
+ FBDEVDIRS = $(STDDIRS) $(KDDIRS) $(FBDEVDIR)
+
+ FBDEVLIBS = PreFbLibs $(FBDEV) KdLibs FbPostFbLibs
+FBDEVSYSLIBS = StdKdSysLibs
+
+#if HasParallelMake
+MakeMutex($(FBDEVDIRS) $(FBDEVOBJS) $(FBDEVLIBS) $(FBDEVSYSLIBS))
+#endif
+#if HasGnuMake
+$(FBDEVOBJS) $(XFBDEV) $(FBDEVLIBS) $(FBDEVSYSLIBS):: $(FBDEVDIRS)
+ @if [ -f $@ ]; then touch $@; fi
+#endif
+ServerTarget(Xfbdev,$(FBDEVDIRS),$(FBDEVOBJS),$(FBDEVLIBS),$(FBDEVSYSLIBS))
+#endif /* XFBDEVServer */
+
+#if XSavageServer
+XCOMM
+XCOMM server with Keith's S3 Savage driver
+XCOMM
+
+ SAVAGEDIR = $(KDRIVE)/savage
+ SAVAGE = $(SAVAGEDIR)/LibraryTargetName(savage)
+
+ KDDIRS = StdKdDirs
+
+ SAVAGEDIRS = $(STDDIRS) $(KDDIRS) $(SAVAGEDIR)
+
+ SAVAGELIBS = PreFbLibs $(SAVAGE) KdLibs FbPostFbLibs
+SAVAGESYSLIBS = StdKdSysLibs
+
+#if HasParallelMake
+MakeMutex($(SAVAGEDIRS) $(SAVAGEOBJS) $(SAVAGELIBS) $(SAVAGESYSLIBS))
+#endif
+#if HasGnuMake
+$(SAVAGEOBJS) $(XSAVAGE) $(SAVAGELIBS) $(SAVAGESYSLIBS):: $(SAVAGEDIRS)
+ @if [ -f $@ ]; then touch $@; fi
+#endif
+ServerTarget(Xsavage,$(SAVAGEDIRS),$(SAVAGEOBJS),$(SAVAGELIBS),$(SAVAGESYSLIBS))
+#endif /* XSAVAGEServer */
+
+#if XTridentServer
+XCOMM
+XCOMM server with Keith's TRIDENT Cyber9525 driver
+XCOMM
+
+ FBDEVDIR = $(KDRIVE)/fbdev
+ FBDEV = $(FBDEVDIR)/LibraryTargetName(fbdev)
+ TRIDENTDIR = $(KDRIVE)/trident
+ TRIDENT = $(TRIDENTDIR)/LibraryTargetName(trident)
+
+ KDDIRS = StdKdDirs
+
+ TRIDENTDIRS = $(STDDIRS) $(KDDIRS) $(FBDEVDIR) $(TRIDENTDIR)
+
+ TRIDENTLIBS = PreFbLibs $(TRIDENT) $(FBDEV) KdLibs FbPostFbLibs
+TRIDENTSYSLIBS = StdKdSysLibs
+
+#if HasParallelMake
+MakeMutex($(TRIDENTDIRS) $(TRIDENTLIBS) $(TRIDENTSYSLIBS))
+#endif
+#if HasGnuMake
+$(TRIDENTOBJS) $(TRIDENTLIBS) $(TRIDENTSYSLIBS):: $(TRIDENTDIRS)
+ @if [ -f $@ ]; then touch $@; fi
+#endif
+ServerTarget(Xtrident,$(TRIDENTDIRS),$(TRIDENTOBJS),$(TRIDENTLIBS),$(TRIDENTSYSLIBS))
+#endif /* XTRIDENTServer */
+
+#if XSis530Server
+XCOMM
+XCOMM server with Keith's SiS 530 driver
+XCOMM
+
+ SIS530DIR = $(KDRIVE)/sis530
+ SIS530 = $(SIS530DIR)/LibraryTargetName(sis530)
+
+ KDDIRS = StdKdDirs
+
+ SIS530DIRS = $(STDDIRS) $(KDDIRS) $(SIS530DIR)
+
+ SIS530LIBS = PreFbLibs $(SIS530) KdLibs FbPostFbLibs
+SIS530SYSLIBS = StdKdSysLibs
+
+#if HasParallelMake
+MakeMutex($(SIS530DIRS) $(SIS530OBJS) $(SIS530LIBS) $(SIS530SYSLIBS))
+#endif
+#if HasGnuMake
+$(SIS530OBJS) $(SIS530LIBS) $(SIS530SYSLIBS):: $(SIS530DIRS)
+ @if [ -f $@ ]; then touch $@; fi
+#endif
+ServerTarget(Xsis530,$(SIS530DIRS),$(SIS530OBJS),$(SIS530LIBS),$(SIS530SYSLIBS))
+#endif /* XSIS530Server */
+
+#if XTrioServer
+XCOMM
+XCOMM server with Keith's S3 Trio driver
+XCOMM
+
+ TRIODIR = $(KDRIVE)/trio
+ TRIO = $(TRIODIR)/LibraryTargetName(trio)
+
+ KDDIRS = StdKdDirs
+
+ TRIODIRS = $(STDDIRS) $(KDDIRS) $(TRIODIR)
+
+ TRIOLIBS = PreFbLibs $(TRIO) KdLibs FbPostFbLibs
+TRIOSYSLIBS = StdKdSysLibs
+
+#if HasParallelMake
+MakeMutex($(TRIODIRS) $(TRIOOBJS) $(TRIOLIBS) $(TRIOSYSLIBS))
+#endif
+#if HasGnuMake
+$(TRIOOBJS) $(TRIOLIBS) $(TRIOSYSLIBS):: $(TRIODIRS)
+ @if [ -f $@ ]; then touch $@; fi
+#endif
+ServerTarget(Xtrio,$(TRIODIRS),$(TRIOOBJS),$(TRIOLIBS),$(TRIOSYSLIBS))
+#endif /* XTRIOServer */
+
+#if XTS300Server
+XCOMM
+XCOMM server with Keith's S3 Trio and SiS530 driver for the TS300/TS400
+XCOMM
+
+ TRIODIR = $(KDRIVE)/trio
+ TRIO = $(TRIODIR)/LibraryTargetName(trio)
+
+ SIS530DIR = $(KDRIVE)/sis530
+ SIS530 = $(SIS530DIR)/LibraryTargetName(sis530)
+
+ TS300DIR = $(KDRIVE)/ts300
+ TS300 = $(TS300DIR)/LibraryTargetName(ts300)
+
+ KDDIRS = StdKdDirs
+
+ TS300DIRS = $(STDDIRS) $(KDDIRS) $(TRIODIR) $(SIS530DIR) $(TS300DIR)
+
+ TS300LIBS = PreFbLibs $(TS300) $(TRIO) $(SIS530) KdLibs FbPostFbLibs
+ TS300SYSLIBS = StdKdSysLibs
+
+#if HasParallelMake
+MakeMutex($(TS300DIRS) $(TS300OBJS) $(TS300LIBS) $(TS300SYSLIBS))
+#endif
+#if HasGnuMake
+$(TS300OBJS) $(TS300LIBS) $(TS300SYSLIBS):: $(TS300DIRS)
+ @if [ -f $@ ]; then touch $@; fi
+#endif
+ServerTarget(Xts300,$(TS300DIRS),$(TS300OBJS),$(TS300LIBS),$(TS300SYSLIBS))
+#endif /* XTS300Server */
+
+#if XItsyServer
+XCOMM
+XCOMM server with Keith's FB driver only
+XCOMM
+ ITSYDIR = $(KDRIVE)/itsy
+ ITSY = $(ITSYDIR)/LibraryTargetName(itsy)
+
+ KDDIRS = StdKdDirs
+
+ ITSYDIRS = $(STDDIRS) $(KDDIRS) $(ITSYDIR)
+
+ ITSYLIBS = PreFbLibs $(ITSY) KdLibs FbPostFbLibs
+ITSYSYSLIBS = StdKdSysLibs
+
+#if HasParallelMake
+MakeMutex($(ITSYDIRS) $(ITSYOBJS) $(ITSYLIBS) $(ITSYSYSLIBS))
+#endif
+#if HasGnuMake
+$(ITSYOBJS) $(ITSYLIBS) $(ITSYSYSLIBS):: $(ITSYDIRS)
+ @if [ -f $@ ]; then touch $@; fi
+#endif
+ServerTarget(Xitsy,$(ITSYDIRS),$(ITSYOBJS),$(ITSYLIBS),$(ITSYSYSLIBS))
+#endif /* XItsyServer */
+
+KDRIVEDIRS=$(KDDIRS) $(FBDEVDIR) $(SAVAGEDIR) $(TRIDENTDIR) $(SIS530DIR) \
+ $(TRIODIR) $(TS300DIR) $(ITSYDIR)
#if XprtServer && !MakeDllModules
XCOMM
@@ -680,7 +899,7 @@ XNESTDDXDIR = hw/xnest
XNESTDDXDIR = hw
#endif
XNESTDIRS = $(STDDIRS) $(XNESTDDXDIR) $(DEPDIRS)
-#if !defined(LynxOSArchitecture) && !defined(Win32Architecture)
+#if !defined(LynxOSArchitecture) && !defined(Win32Architecture) && !defined(QNX4Architecture)
XNESTOBJS = hw/xnest/miinitext.o
#else
XNESTOBJS = hw/xnest/miinitext.o dix/main.o
@@ -768,9 +987,9 @@ CFBDIRS = $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR)
IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR)
DDXDIRS = $(DDXDIR1) $(DDXDIR2) $(DDXDIR3) $(XVFBDDXDIR) $(XNESTDDXDIR)
SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFBDIRS) $(IPLANDIRS) $(ILBMDIR) $(AFBDIR) \
- $(LMFCFBDIR) $(DDXDIRS)
+ $(LMFCFBDIR) $(DDXDIRS) $(FBDIR) $(KDRIVEDIRS)
-#if defined(ServerToInstall) && !defined(OS2Architecture)
+#if defined(ServerToInstall) && !defined(OS2Architecture) && !defined(QNX4Architecture)
install::
-(cd $(DESTDIR)$(BINDIR); $(RM) X; $(LN) ServerToInstall X)
#endif