Commit 43b79bb0 authored by dawes's avatar dawes
Browse files

Import of XFree86 4.1.99.1

parent 9d8ac1f4
......@@ -86,9 +86,15 @@ This quick summary is no substitute for reading the full build instruc-
tions later in this document.
Edit xc/config/cf/site.def for local preferences. If you want to
install somewhere other than /usr/X11R6.5.1, change ProjectRoot. (Do not
use DESTDIR.) If you want to build with gcc uncomment the HasGcc2 line.
If you have gcc, but not cc, please read the full build instructions.
install and use the installation from somewhere other than
/usr/X11R6.5.1, change ProjectRoot. (Do not use DESTDIR.)
If you are cross compiling you will want to use DESTDIR to specify where
the installation should take place. Failure to do so will corrupt your
native installation of X.
If you want to build with gcc uncomment the HasGcc2 line. If you have
gcc, but not cc, please read the full build instructions.
If some time has elapsed since the initial release of R6.5.1, check to
see if any public patches have been released. The source tar files may
......
This diff is collapsed.
XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:45 cpqbld Exp $
XCOMM $XFree86: xc/config/Imakefile,v 1.3.2.1 2001/05/31 22:20:18 dawes Exp $
XCOMM $XFree86: xc/config/Imakefile,v 1.4 2001/05/31 18:47:04 dawes Exp $
#define IHaveSubdirs
#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
......
......@@ -2,7 +2,7 @@ XCOMM platform: $Xorg: FreeBSD.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $
XCOMM
XCOMM
XCOMM
XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.109 2001/05/03 20:12:35 alanh Exp $
XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.110 2001/08/16 14:33:44 dawes Exp $
#ifndef UseElfFormat
#define UseElfFormat DefaultToElfFormat
......@@ -507,6 +507,25 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define PamLibraries -lpam DlLibrary
#endif
/*
* On FreeBSD, the run-time loader will use the built-in "rpath" before
* LD_LIBRARY_PATH. This means that utilities like mkfontdir will load
* installed libraries (if they exist) in preference to the ones in the
* build tree, even though LD_LIBRARY_PATH points to the build tree.
* This can result in the build failing. One way to avoid this is to
* pre-load the libraries from the build tree.
*
* There should be a better way than this hack...
*/
#if UseElfFormat
#ifndef PreloadFontSetup
#define PreloadFontSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo libXfont*.so.?)`"
#endif
#ifndef PreloadSetup
#define PreloadSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo lib[A-f]*.so.? | grep -v Xfont)`"
#endif
#endif
#ifndef HasCookieMaker
/* Which versions have /dev/urandom? */
#if OSMajorVersion >= 4
......
......@@ -17,7 +17,7 @@ XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
*
* 4. Create a .cf file with the name given by MacroFile.
*/
XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.67 2001/04/18 17:13:58 dawes Exp $
XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.70 2001/08/14 21:53:53 tsi Exp $
#if defined(__APPLE__)
# undef __APPLE__
......@@ -760,10 +760,45 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
# undef MIPSEL
# undef _MIPSEL
# endif
# ifdef __sh__
# ifndef SuperHArchitecture
# define SuperHArchitecture
# endif
# ifdef __BIG_ENDIAN__
# ifndef SuperHebArchitecture
# define SuperHebArchitecture
# endif
# endif
# undef __sh__
# endif /* __sh__ */
# if defined(__SH3__) || defined(__sh3__)
# ifndef SuperH3Architecture
# define SuperH3Architecture
# endif
# undef __SH3__
# undef __sh3__
# endif /* __SH3__ or __sh3__ */
# ifdef __SH4__
# ifdef __SH4_NOFPU__
# ifndef SuperH4NOFPUArchitecture
# define SuperH4NOFPUArchitecture
# endif
# undef __SH4_NOFPU__
# else
# ifndef SuperH4Architecture
# define SuperH4Architecture
# endif
# endif
# undef __SH4__
# endif /* __SH4__ */
XCOMM for compatibility with 3.3.x
# ifdef PpcArchitecture
# define PowerPCArchitecture
# endif
# if defined(__s390x__)
# define s390xArchitecture
# undef __s390x__
# endif
#endif /* linux */
#if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.94 2001/04/26 21:27:48 dawes Exp $
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.100 2001/08/09 20:34:05 dawes Exp $
/*
* MACHINE-INDEPENDENT RULES; DO NOT MODIFY
......@@ -25,6 +25,7 @@ XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.94 2001/04/26 21:27:48 dawe
* _MUse (a,b)
* _MUseCat (a,b,c)
* ProgramTargetName (target)
* HostProgramTargetName (target)
* RunProgram (progvar,options)
* RunProgramWithSetup (setup,progvar,options)
* RemoveFile (file)
......@@ -311,6 +312,10 @@ XCOMM special target for clearmake @@\
#define ProgramTargetName(target)target
#endif
#ifndef HostProgramTargetName
#define HostProgramTargetName(target)target
#endif
#ifndef RunProgram
#define RunProgram(progvar,options) $(progvar) options
#endif
......@@ -510,8 +515,14 @@ clean cleantc:: @@\
#endif /* RemoveTargetProgram */
#ifndef MakeDir
#define MakeDir(dir) DirFailPrefix@if [ -d dir ]; then set +x; \ @@\
else (set -x; $(MKDIRHIER) dir); fi
#define MakeDir(dir) DirFailPrefix@if [ -d dir ]; then \ @@\
set +x; \ @@\
else \ @@\
if [ -h dir ]; then \ @@\
(set -x; rm -f dir); \ @@\
fi; \ @@\
(set -x; $(MKDIRHIER) dir); \ @@\
fi
#endif /* MakeDir */
#ifndef BuildIncludesTop
......@@ -1615,6 +1626,15 @@ step:: list @@\
*
* Since the link is used in the installation process, we need to
* make the link relative in order to honor $(DESTDIR) if it is set.
*
* Note: The sed script used here is not completely general. It assumes
* that no elements of the path are '..', and that none start with '.'
* that aren't just '.'.
*
* For a more general solution $(REVPATH) could be used. Even though
* it was intended for something a little different, it does do what is
* required here.
*
*/
#ifndef LinkConfDirectoryLong
#if UseSeparateConfDir && HasSymLinks
......@@ -1625,7 +1645,7 @@ install:: @@\
@MakeFlagsToShellFlags(i,set +e); \ @@\
if [ -d Concat($(DESTDIR),opath/cdir) ]; then \ @@\
RELPATH=`echo opath/cdir | \ @@\
sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\
sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ @@\
cd Concat($(DESTDIR),opath/cdir); \ @@\
if [ -d rdir -a ! -h rdir ]; then \ @@\
(cd rdir; tar cf - . | \ @@\
......@@ -3167,7 +3187,8 @@ AllTarget(name.$(MANNEWSUFFIX)) @@\
@@\
name.$(MANNEWSUFFIX): name.$(MANSRCSUFFIX) @@\
RemoveFile($@) @@\
$(LN) name.$(MANSRCSUFFIX) $@ @@\
cd `dirname name` && \ @@\
$(LN) `basename name.$(MANSRCSUFFIX)` `basename $@` @@\
@@\
clean:: @@\
RemoveFile(name.$(MANNEWSUFFIX))
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.102 2001/04/26 21:09:38 dawes Exp $
XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.105 2001/08/06 20:51:00 dawes Exp $
XCOMM ----------------------------------------------------------------------
/*
......@@ -400,10 +400,18 @@ XCOMM the platform-specific parameters - edit site.def to change
#define ByteOrder X_BIG_ENDIAN
#elif defined(Mc88000Architecture)
#define ByteOrder X_BIG_ENDIAN
#elif defined(s390Architecture)
#define ByteOrder X_BIG_ENDIAN
#elif defined(s390xArchitecture)
#define ByteOrder X_BIG_ENDIAN
#elif defined(Arm32Architecture)
#define ByteOrder X_LITTLE_ENDIAN
#elif defined(PpcArchitecture)
#define ByteOrder X_BIG_ENDIAN
#elif defined(SuperHArchitecture)
#define ByteOrder X_LITTLE_ENDIAN
#elif defined(SuperHebArchitecture)
#define ByteOrder X_BIG_ENDIAN
#endif
#endif /* ByteOrder */
#ifndef HasFortran
......@@ -1118,7 +1126,7 @@ TCLIBDIR = TclLibDir
#define NeedModuleRanlib NO
#endif
#ifndef ModuleRanlibCmd
#define ModuleRanlibCmd /*won't be used unless NeedModuleRanlib is YES*/
#define ModuleRanlibCmd RanlibCmd
#endif
#ifndef StandardIncludes /* for platform-specifics */
......
......@@ -19,7 +19,7 @@ XCOMM $Xorg: Library.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.13 2001/01/17 16:22:30 dawes Exp $
XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.14 2001/07/25 14:30:03 alanh Exp $
#ifndef LibraryCplusplusOptions
# if DoSharedLib && defined(SharedLibraryCplusplusOptions)
......@@ -302,13 +302,14 @@ CenterLoadTarget(debug_src,basename.SRCsuf,NullParameter,$(ALLDEFINES) options)
#ifndef MakeStringsDependency
# define MakeStringsDependency @@\
MAKESTRS = $(CONFIGSRC)/util/makestrs @@\
NoCmpScript(ProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf) @@\
NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf) @@\
@@\
ProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf: @@\
cd $(CONFIGSRC)/util && $(MAKE) ProgramTargetName(makestrs) @@\
HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf: @@\
cd $(CONFIGSRC)/util && $(MAKE) HostProgramTargetName(makestrs) @@\
@@\
includes:: ProgramTargetName($(MAKESTRS))
includes:: HostProgramTargetName($(MAKESTRS))
#endif
#ifndef ToolkitMakeStrings
# if defined(LibTookitMakeStringsDependency) && LibTookitMakeStringsDependency
# define ToolkitMakeStrings(files,source,options,depends,dest) @@\
......
XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.54 2001/04/22 16:28:18 herrb Exp $
XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.55 2001/08/15 19:01:03 herrb Exp $
XCOMM
#ifndef OSName
......@@ -581,33 +581,35 @@ install:: fonts.alias @@\
# endif
# ifndef XF86Server
# define XF86Server NO
# define XF86Server YES
# endif
/* Definitions for building the XFree86 server */
# if XF86Server
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT
# define ServerExtraDefines GccGasOption XFree86ServerDefines
# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 8)
# ifndef DoLoadableServer
# define DoLoadableServer YES
# endif
# define DevelDrivers cirrus ati
/* Support for USB Mices */
# define UsbMouseSupport YES
# include <xfree86.cf>
# else /* 2.7 and earlier */
# include <xf86.rules>
# ifndef BuildServer
# define BuildServer NO
# endif
# ifndef DoLoadableServer
# define DoLoadableServer YES
# endif
# ifndef XF86CardDrivers
# define XF86CardDrivers ati mga glint s3virge sis savage\
trident chips tdfx \
DevelDrivers vga \
XF86OSCardDrivers XF86ExtraCardDrivers
# endif
# ifndef DevelDrivers
# define DevelDrivers nv
# endif
# define HasSharedLibraries NO
# define BuildDynamicLoading NO
/* Support for USB Mices */
# ifndef UsbMouseSupport
# define UsbMouseSupport YES
# endif
# endif /* XF86Server */
# include <xfree86.cf>
#endif /* PpcArchitecture */
/*
......
......@@ -3,7 +3,7 @@ $Xorg: README,v 1.4 2000/08/18 04:03:58 coskrey Exp $
$XFree86: xc/config/cf/README,v 1.13 2001/01/17 16:22:30 dawes Exp $
$XFree86: xc/config/cf/README,v 1.14 2001/05/24 16:34:49 dawes Exp $
The easiest way to write an Imakefile is to find another one that does
something similar and copy/modify it!
......@@ -446,6 +446,16 @@ An <os>Lib.tmpl file provides defaults for the following variables:
SharedDtMrmReqs required libs for libDtMrm.so
SharedDtMrmRev version number for libDtMrm.so
Vendor.cf files and/or site/host specific .def files may define the
following variables:
ProjectRoot The directory under which the installation
will operate. This value will be hard coded
into some programs. As a result do not use it
to specify the installation directory for a
cross compiled system, use DESTDIR to
accomplish that task.
The following variables are used by some part of the tree:
AckToolset programs/Xserver/hw/xfree86
......@@ -546,7 +556,9 @@ Variables that can be set on the make command line:
DESTDIR directory under which "make install" should
install instead of "/"; used only for testing
"make install" rules.
"make install" rules, binary package building,
and specifying alternative installation directories
for cross compiles.
FILE file for "lint1" target to run lint on.
CDEBUGFLAGS -g and/or -O flag to control C compiler optimization.
CXXDEBUGFLAGS -g and/or -O flag to control C++ optimization.
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.115.2.3 2001/06/01 02:24:14 dawes Exp $
XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.125 2001/08/17 22:08:09 tsi Exp $
/***************************************************************************
* *
......@@ -286,6 +286,22 @@ VENDORMANVERSION = XVendorManVersionString
#ifndef BuildFontCacheLib
#define BuildFontCacheLib (BuildFontCache && !BuildServersOnly)
#endif
#ifndef BuildFontEncLib
#define BuildFontEncLib BuildLibraries
#endif
/*
* This enables binary compatibility with the older (XFree86 <= 4.1) fontenc
* entry points in the Xfont library (and X server). If this is turned off,
* then SharedFontRev should have it's major revision bumped, and the
* XFree86 font module ABI (in xfree86/common/xf86Module.h) should have it's
* major revision bumped.
*
* Note: this does not enable those older functions in the separate libfontenc
* library (which didn't exist previously).
*/
#ifndef FontencCompatibility
#define FontencCompatibility YES
#endif
#ifndef BuildLowMem
#define BuildLowMem NO
#endif
......@@ -415,6 +431,9 @@ VENDORMANVERSION = XVendorManVersionString
#ifndef BuildGLULibrary
#define BuildGLULibrary (BuildGLXLibrary && HasCplusplus)
#endif
#ifndef BuildGLwLibrary
#define BuildGLwLibrary (BuildGlxExt || BuildGLXLibrary)
#endif
#ifndef BuildXF86RushExt
#define BuildXF86RushExt NO
#endif
......@@ -452,6 +471,13 @@ VENDORMANVERSION = XVendorManVersionString
#define BuildFreetype2Library (UseFreetype2 && !HasFreetype2)
#endif
#ifndef BuildRandR
#define BuildRandR NO
#endif
#ifndef BuildRandRLibrary
#define BuildRandRLibrary !BuildServersOnly
#endif
#ifndef BuildMiscDocs
#define BuildMiscDocs NO
#endif
......@@ -899,6 +925,14 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#endif
#ifndef RandRDefines
#if BuildRandR
#define RandRDefines -DRANDR
#else
#define RandRDefines /**/
#endif
#endif
#ifndef FontCacheExtentionDefines
#if BuildFontCache
#define FontCacheExtensionDefines -DFONTCACHE
......@@ -916,7 +950,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
XCSecurityDefines CupDefines PervasiveDBEDefines \
XF86BigfontExtensionDefines DPMSDefines \
LowMemDefines XprintDefines XineramaDefines \
SitePervasiveExtensionDefines RenderDefines
SitePervasiveExtensionDefines RenderDefines RandRDefines
#endif
#ifndef SiteExtensionDefines
#define SiteExtensionDefines /**/
......@@ -1355,9 +1389,9 @@ XCOMM X Window System make variables; these need to be coordinated with rules
UCSMAPPREFIX = $(FONTDIR)/util/map-
#else
RGB = $(CLIENTENVSETUP) $(XBUILDBINDIR)/rgb
FONTC = $(CLIENTENVSETUP) $(XBUILDBINDIR)/bdftopcf
MKFONTDIR = $(CLIENTENVSETUP) $(XBUILDBINDIR)/mkfontdir
XFTCACHE = $(CLIENTENVSETUP) XFT_CONFIG=$(XFTLIBSRC)/XftConfig $(XBUILDBINDIR)/xftcache
FONTC = $(CLIENTENVSETUP) $(PRELOADFONTSETUP) $(XBUILDBINDIR)/bdftopcf
MKFONTDIR = $(CLIENTENVSETUP) $(PRELOADFONTSETUP) $(XBUILDBINDIR)/mkfontdir
XFTCACHE = $(CLIENTENVSETUP) $(PRELOADSETUP) XFT_CONFIG=$(XFTLIBSRC)/XftConfig $(XBUILDBINDIR)/xftcache
#if HasPerl
MKHTMLINDEX = RunPerlScript($(CONFIGSRC)/util/mkhtmlindex.pl,)
#else
......@@ -1423,6 +1457,13 @@ XCOMM X Window System make variables; these need to be coordinated with rules
CLIENTENVSETUP =
#endif
#ifdef PreloadSetup
PRELOADSETUP = PreloadSetup
#endif
#ifdef PreloadFontSetup
PRELOADFONTSETUP = PreloadFontSetup
#endif
#ifndef ShLibIncludeFile
/* need this to make ANSI-style preprocessors happy */
#define ShLibIncludeFile <noop.rules>
......@@ -1647,6 +1688,21 @@ ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir)
#endif
#endif
#if BuildRandRLibrary
#ifndef SharedLibXrandr
#define SharedLibXrandr HasSharedLibraries
#endif
#ifndef NormalLibXrandr
#define NormalLibXrandr YES
#endif
#ifndef DebugLibXrandr
#define DebugLibXrandr NO
#endif
#ifndef ProfileLibXrandr
#define ProfileLibXrandr NO
#endif
#endif
#if BuildGLULibrary
#ifndef SharedLibGlu
#define SharedLibGlu HasSharedLibraries
......@@ -1908,6 +1964,18 @@ ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir)
#endif
#endif
#if BuildRandRLibrary
XRANDRRLIBSRC = $(LIBSRC)/Xrandr
#if SharedLibXrandr
#ifndef SharedXrandrRev
#define SharedXrandrRev 1.0
#endif
SharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev)
#else
ProjectUnsharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),XBuildLibDir)
#endif
#endif
#if BuildFontCacheLib
# ifndef SharedLibXfontcache
# define SharedLibXfontcache NO
......@@ -2371,7 +2439,7 @@ ProjectUnsharedLibReferences(FS,FS,$(FSLIBSRC),XBuildLibDir)
FONTLIBSRC = $(LIBSRC)/font
#if SharedLibFont
#ifndef SharedFontRev
#define SharedFontRev 1.3
#define SharedFontRev 1.4
#endif
SharedFontLibReferences()
XCOMM SharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),SOFONTREV,SharedFontRev)
......@@ -2385,6 +2453,29 @@ ProjectUnsharedLibReferences(FONTSTUB,fntstubs,$(FONTSUBLIBSRC),XBuildLibDir)
DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB)
FONTLIB = $(XFONTLIB) $(FONTSTUBLIB)
#ifndef SharedLibFontEnc
#define SharedLibFontEnc NO
#endif
#ifndef NormalLibFontEnc
#define NormalLibFontEnc (!SharedLibFont | ForceNormalLib)
#endif
#ifndef DebugLibFontEnc
#define DebugLibFontEnc NO /* debugged fontenc library */
#endif
#ifndef ProfileLibFontEnc
#define ProfileLibFontEnc NO /* profiled fontenc library */
#endif
FONTENCLIBSRC = $(LIBSRC)/fontenc
#if SharedLibFontEnc
#ifndef SharedFontEncRev
#define SharedFontEncRev 1.0
#endif
SharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),SOFONTENCREV,SharedFontEncRev)
#else
ProjectUnsharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),XBuildLibDir)
#endif
#ifndef SharedLibXpm
#define SharedLibXpm HasSharedLibraries
#endif
......@@ -2476,7 +2567,7 @@ FREETYPE2DEFINES = -DFREETYPE2
XFTLIBSRC = $(LIBSRC)/Xft
#if SharedLibXft
#ifndef SharedXftRev
#define SharedXftRev 1.0
#define SharedXftRev 1.1
#endif
SharedLibReferences(XFT,Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev)
#else
......@@ -2530,7 +2621,7 @@ ProjectUnsharedLibReferences(XKBFILE,xkbfile,$(XKBFILELIBSRC),XBuildLibDir)
XKBCOMPCMD = $(BINDIR)/XkbComp
#else
XKBCOMPSRC = $(PROGRAMSRC)/XkbComp
XKBCOMPCMD = $(CLIENTENVSETUP) $(XBUILDBINDIR)/XkbComp
XKBCOMPCMD = $(CLIENTENVSETUP) $(PRELOADSETUP) $(XBUILDBINDIR)/XkbComp
#endif
#else /* !BuildXKBlib */
#ifndef XkbClientDepLibs
......@@ -2830,7 +2921,7 @@ encodings.dir: deplist @@\
@(E=; for i in dirlist; do \ @@\
E="$$E -e $$i"; done; \ @@\
set -x; \ @@\
RunProgram(MKFONTDIR, -r -p inst/ $$E .)) @@\
RunProgram(MKFONTDIR, -n -r -p inst/ $$E .)) @@\
@@\
clean:: @@\
RemoveFiles(fonts.dir encodings.dir)
......
......@@ -4,7 +4,7 @@ XCOMM $Xorg: bsdLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
XCOMM $XFree86: xc/config/cf/bsdLib.rules,v 3.15.2.1 2001/05/24 16:35:38 dawes Exp $
XCOMM $XFree86: xc/config/cf/bsdLib.rules,v 3.16 2001/05/24 16:34:49 dawes Exp $
/*
* NetBSD/FreeBSD shared library rules
*/
......
XCOMM $Xorg: bsdLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.8.2.1 2001/05/24 16:35:38 dawes Exp $
XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.9 2001/05/24 16:34:49 dawes Exp $
/*
* NetBSD/FreeBSD/OpenBSD shared library template
......
XCOMM $XFree86: xc/config/cf/cross.rules,v 1.2 2000/12/09 03:33:18 dawes Exp $
XCOMM $XFree86: xc/config/cf/cross.rules,v 1.3 2001/06/25 08:12:30 alanh Exp $
#define HostLinkRule(target, flags, src, libs) cc -I$(BUILDINCDIR) -o target src
......@@ -13,9 +13,9 @@ XCOMM $XFree86: xc/config/cf/cross.rules,v 1.2 2000/12/09 03:33:18 dawes Exp $
EXTRA_LOAD_FLAGS= @@\
PROGRAM = program @@\
@@\
AllTarget(program) @@\
AllTarget(HostProgramTargetName(program)) @@\
@@\
program: $(OBJS) $(DEPLIBS) @@\
HostProgramTargetName(program): $(OBJS) $(DEPLIBS) @@\
RemoveTargetProgram($@) @@\
HostLinkRule($@,$(_NOOP_),$(OBJS),$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\
@@\
......@@ -24,7 +24,7 @@ DependTarget() @@\
LintTarget() @@\
@@\
clean:: @@\
RemoveFile(ProgramTargetName(program))
RemoveFile(HostProgramTargetName(program))
#endif /* ComplexHostProgramTarget */
#ifndef SimpleHostProgramTarget
......@@ -37,9 +37,9 @@ clean:: @@\
EXTRA_LOAD_FLAGS= @@\
PROGRAM = program @@\
@@\
AllTarget(program) @@\
AllTarget(HostProgramTargetName(program)) @@\
@@\
program: program.o $(DEPLIBS) @@\
HostProgramTargetName(program): program.o $(DEPLIBS) @@\
RemoveTargetProgram($@) @@\
HostLinkRule($@,$(_NOOP_),program.o,$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\
@@\
......@@ -48,5 +48,5 @@ DependTarget() @@\
LintTarget() @@\
@@\
clean:: @@\
RemoveFile(ProgramTargetName(program))
RemoveFile(HostProgramTargetName(program))
#endif /* SimpleHostProgramTarget */
XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.16.2.1 2001/05/30 14:29:27 alanh Exp $
XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.26 2001/08/03 23:43:37 alanh Exp $
#ifndef OSName
#define OSName Cygwin
......@@ -13,10 +13,10 @@ XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.16.2.1 2001/05/30 14:29:27
#define OSMinorVersion 3
#endif
#ifndef OSTeenyVersion
#define OSTeenyVersion 1
#define OSTeenyVersion 2
#endif
#define ProjectRoot /usr/X11R6
#define ProjectRoot /usr/X11R6
#define BuildServer YES
......@@ -28,7 +28,10 @@ XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.16.2.1 2001/05/30 14:29:27
#define GccUsesGas YES
#define UseGas YES
#define GnuCpp YES
#if !CrossCompiling
#define BootstrapCFlags -L/lib/automode.o
#endif
#define HasShadowPasswd NO
#define HasLibCrypt YES
......@@ -56,8 +59,17 @@ XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.16.2.1 2001/05/30 14:29:27
#define HasSockets YES
#define GzipFontCompression YES
#define HasZlib YES
#define GzipLibrary -lz.dll
/* We don't need -lm */
#define MathLibrary /**/
/*