Commit 585028e1 authored by alanh's avatar alanh
Browse files

Import of XFree86 4.0.1d-pre

parent c0fd23c1
alanh@cvs.dri.sourceforge.net's password:
XCOMM $TOG: Imakefile /main/138 1997/12/29 16:37:30 kaleb $
XCOMM $XFree86: xc/Imakefile,v 3.20 2000/07/07 20:06:55 tsi Exp $
XCOMM $XFree86: xc/Imakefile,v 3.19 2000/05/31 15:02:54 eich Exp $
#define IHaveSubdirs
#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
......
# $TOG: Makefile /main/37 1998/02/17 14:30:04 kaleb $
# $XFree86: xc/Makefile,v 3.16 2000/03/22 21:23:30 dawes Exp $
# $XFree86: xc/Makefile,v 3.15 1999/08/14 10:48:56 dawes Exp $
# Luna users will need to either run make as "make MAKE=make"
# or add "MAKE = make" to this file.
......
XCOMM $XConsortium: Imakefile /main/6 1996/09/28 16:04:42 rws $
XCOMM $XFree86: xc/config/Imakefile,v 1.2 2000/02/13 00:12:18 dawes Exp $
XCOMM $XFree86$
#define IHaveSubdirs
#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
......
XCOMM platform: $XConsortium: Amoeba.cf /main/12 1996/09/28 16:04:48 rws $
XCOMM platform: $XFree86: xc/config/cf/Amoeba.cf,v 3.9 1996/12/23 05:50:00 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/Amoeba.cf,v 3.8 1996/01/26 08:59:07 dawes Exp $
/* The presence of this configuration file in the X distribution
* does not imply full support for the system it describes.
......
XCOMM platform: $XFree86: xc/config/cf/DGUX.cf,v 1.5 2000/07/07 20:06:56 tsi Exp $
XCOMM platform: $XFree86: xc/config/cf/DGUX.cf,v 1.4 1998/12/29 13:00:46 dawes Exp $
/* Copyright Takis Psarogiannakopoulos <takis@pmms.cam.ac.uk>
* This is the DG/ux configuration file of X11R6.3
*/
......
......@@ -132,6 +132,16 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#endif
#endif
/*
* 4.1/i386 and 5.0/i386 have the AGP driver.
*/
#ifndef HasAgpGart
#if defined(i386Architecture) && \
(OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 1))
#define HasAgpGart YES
#endif
#endif
/*
* This doesn't work the way it does on every other system. On FreeBSD it's
* only a "hint, not a demand", whatever that means. Note that this is not
......
......@@ -17,7 +17,7 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
*
* 4. Create a .cf file with the name given by MacroFile.
*/
XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.60 2000/08/11 17:27:10 dawes Exp $
XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.59 2000/08/09 23:40:08 dawes Exp $
#if defined(clipper) || defined(__clipper__)
# undef clipper
......@@ -580,19 +580,100 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.60 2000/08/11 17:27:10 dawes Exp $
# undef linux
# define LinuxArchitecture
# ifdef i386
# define i386Architecture
# ifndef i386Architecture
# define i386Architecture
# endif
# undef i386
XCOMM Keep cpp from replacing path elements containing i486/i586/i686
# undef i486
# undef i586
# undef i686
# endif /* i386 */
# ifdef i486
# ifndef i386Architecture
# define i386Architecture
# endif
# undef i486
# endif
# ifdef i586
# ifndef i386Architecture
# define i386Architecture
# endif
# undef i586
# endif
# ifdef i686
# ifndef i386Architecture
# define i386Architecture
# endif
# undef i686
# endif
# ifdef k6
# ifndef i386Architecture
# define i386Architecture
# endif
# undef k6
# endif
# endif /* k6 */
# ifdef __i386__
# ifndef i386Architecture
# define i386Architecture
# endif
# undef __i386__
# endif /* __i386__ */
# ifdef __i486__
# ifndef i386Architecture
# define i386Architecture
# endif
# undef __i486__
# endif /* __i486__ */
# ifdef __i586__
# ifndef i386Architecture
# define i386Architecture
# endif
# undef __i586__
# endif /* __i586__ */
# ifdef __i686__
# ifndef i386Architecture
# define i386Architecture
# endif
# undef __i686__
# endif /* __i686__ */
# ifdef __k6__
# ifndef i386Architecture
# define i386Architecture
# endif
# undef __k6__
# endif /* __k6__ */
# ifdef __i386
# ifndef i386Architecture
# define i386Architecture
# endif
# undef __i386
# endif /* __i386 */
# ifdef __i486
# ifndef i386Architecture
# define i386Architecture
# endif
# undef __i486
# endif /* __i486 */
# ifdef __i586
# ifndef i386Architecture
# define i386Architecture
# endif
# undef __i586
# endif /* __i586 */
# ifdef __i686
# ifndef i386Architecture
# define i386Architecture
# endif
# undef __i686
# endif /* __i686 */
# ifdef __k6
# ifndef i386Architecture
# define i386Architecture
# endif
# undef __k6
# endif /* __k6 */
# ifdef __s390__
# define s390Architecture
# undef __s390__
# endif /* s390 */
# ifdef __alpha
# define AlphaArchitecture
# undef __alpha
......@@ -648,7 +729,7 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
# undef mips
# undef __mips__
# endif
/* for compatibility with 3.3.x */
XCOMM for compatibility with 3.3.x
# ifdef PpcArchitecture
# define PowerPCArchitecture
# endif
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.76 2000/06/15 20:49:55 dawes Exp $
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.76tsi Exp $
/*
* MACHINE-INDEPENDENT RULES; DO NOT MODIFY
......@@ -3117,6 +3117,7 @@ NormalRelocatableTarget(Concat(module,_drv), objects)
#ifndef LibraryModuleTarget
#if MakeDllModules
#define LibraryModuleTarget(module,objects) @@\
NormalLibraryTarget(module, objects) @@\
DynamicModuleTarget(Concat3(lib,module,.so), objects)
#else
#define LibraryModuleTarget(module, objects) @@\
......@@ -3130,6 +3131,7 @@ NormalLibraryTarget(module, objects)
#ifndef DepLibraryModuleTarget
#if MakeDllModules
#define DepLibraryModuleTarget(module,deplist,objects) @@\
NormalDepLibraryTarget(module, deplist, objects) @@\
DepDynamicModuleTarget(Concat3(lib,module,.so), deplist, objects)
#else
#define DepLibraryModuleTarget(module,deplist,objects) @@\
......@@ -3146,7 +3148,7 @@ AllTarget(module) @@\
@@\
module: modlist @@\
RemoveFile($@) @@\
$(LD) -o $@ $(SHLIBLDFLAGS) modlist @@\
$(CC) -o $@ $(SHLIBLDFLAGS) modlist @@\
@@\
clean:: @@\
RemoveFile(module)
......@@ -3161,7 +3163,7 @@ AllTarget(module) @@\
@@\
module: deplist @@\
RemoveFile($@) @@\
$(LD) -o $@ $(SHLIBLDFLAGS) modlist @@\
$(CC) -o $@ $(SHLIBLDFLAGS) modlist @@\
@@\
clean:: @@\
RemoveFile(module)
......
......@@ -493,6 +493,14 @@ GLIDE2INCDIR = Glide2IncDir
#endif
#endif
GLIDE3INCDIR = Glide3IncDir
#ifndef Glide3LibName
#if HasGlide3
#define Glide3LibName glide3
#else
#define Glide3LibName
#endif
#endif
GLIDE3LIBNAME = Glide3LibName
#ifndef HasTk
#define HasTk NO
#endif
......
XCOMM $XConsortium: Imakefile /main/38 1996/11/07 14:43:46 kaleb $
XCOMM $XFree86: xc/config/cf/Imakefile,v 3.23 2000/08/09 23:40:08 dawes Exp $
XCOMM $XFree86: xc/config/cf/Imakefile,v 3.22 2000/01/21 02:29:34 dawes Exp $
XCOMM Some compilers generate fatal errors if an -L directory does
XCOMM not exist. Since BUILDLIBDIR may not exist yet suppress its use.
......
......@@ -19,7 +19,7 @@ XCOMM $TOG: Library.tmpl /main/44 1997/04/28 11:47:53 kaleb $
XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.12 1999/10/13 04:20:41 dawes Exp $
XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.11 1999/08/28 09:00:17 dawes Exp $
#ifndef LibraryCplusplusOptions
# if DoSharedLib && defined(SharedLibraryCplusplusOptions)
......
......@@ -72,6 +72,18 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define HasVarRun YES
#define HasVarDb YES
/* Defines for using the GNU pth thread library -- experimental */
#ifdef NetBSDPth
#define PthreadHLocation -I/usr/local/include /* where is pthread.h? */
#define LibPthreadLocation -L/usr/local/lib /* where is libpthread? */
#define HasThreadSafeAPI NO
#define HasPosixThreads YES
#define SystemMTDefines -D_REENTRANT PthreadHLocation
#define ThreadsLibraries LibPthreadLocation -Wl,-rpath,/usr/local/lib -lpthread
#define SharedX11Reqs ThreadsLibraries
#endif
/*
* Compiler Features
*/
......@@ -242,7 +254,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define HasBsdMake YES
#define CompressAllFonts YES
#define GzipFontCompression YES
#define DefaultUserPath /bin:/usr/bin:/usr/local/bin:$(BINDIR)
#define DefaultUserPath /bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:$(BINDIR)
#define DefaultSystemPath /sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
#ifdef InstallCmd
......
XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.39 2000/08/01 23:38:45 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.38 2000/07/07 20:06:56 tsi Exp $
XCOMM
#ifndef OSName
......
XCOMM platform: $XFree86: xc/config/cf/QNX4.cf,v 1.3 2000/07/07 20:06:56 tsi Exp $
XCOMM platform: $XFree86: xc/config/cf/QNX4.cf,v 1.2 2000/01/21 02:29:34 dawes Exp $
#define StripInstalledPrograms NO
#define BuildServer YES
......
XCOMM platform: $XFree86: xc/config/cf/QNX4.rules,v 1.1 1999/12/27 00:45:43 robin Exp $
XCOMM platform: $XFree86: xc/config/cf/QNX.rules,v 1.1.2.2 1999/07/23 13:42:29 hohndel Exp $
XCOMM Rules to work around wlib for QNX...
......
......@@ -3,7 +3,7 @@ $TOG: README /main/76 1998/05/11 14:35:10 barstow $
$XFree86: xc/config/cf/README,v 1.11 2000/06/14 00:16:02 dawes Exp $
$XFree86: xc/config/cf/README,v 1.10 1998/10/02 06:15:01 dawes Exp $
The easiest way to write an Imakefile is to find another one that does
something similar and copy/modify it!
......
XCOMM $XFree86: xc/config/cf/Server.tmpl,v 3.16 2000/02/18 16:23:07 dawes Exp $
XCOMM $XFree86: xc/config/cf/Server.tmpl,v 3.15 1999/10/13 04:20:41 dawes Exp $
/*
* Server imakefile info - this contains any special redefinitions, etc.
* that Imakefiles in the server subtree will need.
......
XCOMM $XFree86: xc/config/cf/ServerLib.tmpl,v 3.0 1996/10/03 08:28:07 dawes Exp $
XCOMM $XFree86$
/*
* Server Library imakefile info - this contains any special
* redefinitions, etc. that Imakefiles in the various server library
......
XCOMM $XConsortium: Threads.tmpl /main/11 1996/09/28 16:07:06 rws $
XCOMM $XFree86: xc/config/cf/Threads.tmpl,v 3.2 1996/12/23 05:50:12 dawes Exp $
XCOMM $XFree86: xc/config/cf/Threads.tmpl,v 3.1 1996/01/05 13:06:32 dawes Exp $
/*
* For a multi-threaded application or library,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment