Commit f93d27aa authored by dawes's avatar dawes
Browse files

Import of XFree86 4.0.1d

parent 0aaf69d4
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.77 2000/08/24 22:20:05 tsi Exp $
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.79 2000/10/24 22:45:00 dawes Exp $
/*
* MACHINE-INDEPENDENT RULES; DO NOT MODIFY
......@@ -1292,8 +1292,8 @@ ProgramTargetName($(RMAN)): @@\
#ifndef BuildInstallHtmlManPage
#if BuildHtmlManPages
XCOMM Don't do: 'AllTarget(dest.suffix.html)'. It breaks external packages
#define BuildInstallHtmlManPage(file,dest,suffix) @@\
AllTarget(dest.suffix.html) @@\
@@\
dest.suffix.html: file.man RmanCmdDependency @@\
RemoveFiles(dest.suffix.html dest.suffix-html) @@\
......@@ -1302,7 +1302,7 @@ dest.suffix.html: file.man RmanCmdDependency @@\
@@\
install.man:: dest.suffix.html @@\
MakeDir($(DESTDIR)$(DOCHTMLDIR)) @@\
@(SUF=`expr dest.suffix.html \: '.*\.\(.\).*\.'`; \ @@\
@(SUF=`expr suffix \: '\(.\)'`; \ @@\
set -x; \ @@\
$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) dest.suffix.html $(DESTDIR)$(DOCHTMLDIR)/dest.$$SUF.html) @@\
@@\
......@@ -1317,10 +1317,11 @@ clean:: @@\
#if BuildHtmlManPages
#define InstallHtmlManPageAliases(file,aliases,suffix) @@\
install.man:: file.suffix.html @@\
@for i in aliases; do (set -x; \ @@\
@SUF=`expr suffix \: '\(.\)'`; \ @@\
for i in aliases; do (set -x; \ @@\
RemoveFile($(DESTDIR)$(DOCHTMLDIR)/$$i.suffix.html); \ @@\
(cd $(DESTDIR)$(DOCHTMLDIR); \ @@\
$(LN) file.suffix.html $$i.suffix.html)); \ @@\
$(LN) file.$$SUF.html $$i.$$SUF.html)); \ @@\
done
#else
#define InstallHtmlManPageAliases(file,aliases,suffix) /**/
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.75 2000/08/26 16:37:55 keithp Exp $
XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.78 2000/10/24 18:07:33 dawes Exp $
/***************************************************************************
* *
......@@ -52,6 +52,9 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.75 2000/08/26 16:37:55 keithp Exp $
#ifndef BuildFontServer
#define BuildFontServer YES
#endif
#ifndef XserverStaticFontLib
#define XserverStaticFontLib YES
#endif
#ifndef BuildSpeedo
#define BuildSpeedo YES
#endif
......@@ -304,6 +307,9 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.75 2000/08/26 16:37:55 keithp Exp $
#ifndef BuildRenderLibrary
#define BuildRenderLibrary BuildRender
#endif
#ifndef BuildXftLibrary
#define BuildXftLibrary BuildRenderLibrary && defined(Freetype2Dir)
#endif
#ifndef BuildMiscDocs
#define BuildMiscDocs NO
......@@ -1464,7 +1470,25 @@ ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir)
#undef LinkGLToUsrInclude
#define LinkGLToUsrInclude NO
#endif
/*
* Don't make a shared GLw library because is would depend on Motif.
*/
#ifndef SharedLibGLw
#define SharedLibGLw NO /* HasSharedLibraries */
#endif
#ifndef NormalLibGLw
#define NormalLibGLw YES /* (!SharedLibGLw | ForceNormalLib) */
#endif
#ifndef DebugLibGLw
#define DebugLibGLw NO /* debugged widget library */
#endif
#ifndef ProfileLibGLw
#define ProfileLibGLw NO /* profiled widget library */
#endif
#ifndef GLwUseXmStubs
#define GLwUseXmStubs NO /* create stub (weak) Motif symbols */
#endif
#endif /* BuildGLXLibrary */
#ifndef SharedLibXext
#define SharedLibXext HasSharedLibraries
......@@ -1636,7 +1660,16 @@ SharedLibReferences(GLX,GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev)
#else
ProjectUnsharedLibReferences(GLX,GL,$(GLXLIBSRC),XBuildLibDir)
#endif
GLWIDGETSRC = $(LIBSRC)/GLw
#if SharedLibGLw
#ifndef SharedGLwRev
#define SharedGLwRev 1.0 /* used to name the shared library */
#endif
SharedDSLibReferences(GLW,GLw,$(GLWIDGETSRC),SOGLWREV,SharedGLwRev)
#else
ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir)
#endif
#endif /* BuildGLXLibrary */
#if BuildRenderLibrary
XRENDERLIBSRC = $(LIBSRC)/Xrender
......@@ -2080,7 +2113,7 @@ ProjectUnsharedLibReferences(FS,FS,$(FSLIBSRC),XBuildLibDir)
#define SharedLibFont HasSharedLibraries
#endif
#ifndef NormalLibFont
#define NormalLibFont (!SharedLibFont | ForceNormalLib)
#define NormalLibFont (!SharedLibFont | ForceNormalLib | XserverStaticFontLib)
#endif
#ifndef DebugLibFont
#define DebugLibFont NO /* debugged Font library */
......@@ -2127,6 +2160,53 @@ SharedLibReferences(XPM,Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev)
ProjectUnsharedLibReferences(XPM,Xpm,$(XPMLIBSRC),XBuildLibDir)
#endif
#ifndef SharedLibXft
#define SharedLibXft HasSharedLibraries
#endif
#ifndef NormalLibXft
#define NormalLibXft (!SharedLibXft | ForceNormalLib)
#endif
#ifndef DebugLibXft
#define DebugLibXft NO
#endif
#ifndef ProfileLibXft
#define ProfileLibXft NO
#endif
XFTLIBSRC = $(LIBSRC)/Xft
#if SharedLibXft
#ifndef SharedXftRev
#define SharedXftRev 1.0
#endif
SharedLibReferences(XFT,Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev)
#else
ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir)
#endif
#ifdef Freetype2Dir
#ifndef Freetype2LibDir
#define Freetype2LibDir Freetype2Dir/lib
#endif
#ifndef Freetype2IncDir
#define Freetype2IncDir Freetype2Dir/include
#endif
FREETYPE2DIR = Freetype2Dir
FREETYPE2LIBDIR = Freetype2LibDir
FREETYPE2INCDIR = Freetype2IncDir
FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)
FREETYPE2LIB = -L$(FREETYPE2DIR)/lib -lfreetype
FREETYPE2DEFINES = -DFREETYPE2
#endif
#ifndef XftClientDepLibs
#define XftClientDepLibs $(DEPXFTLIB)
#endif
#ifndef XftClientLibs
#define XftClientLibs $(XFTLIB) $(FREETYPE2LIB)
#endif
#ifndef LdLibraryPath
#define LdLibraryPath LD_LIBRARY_PATH
#endif
......
XCOMM platform: $XConsortium: bsdi.cf /main/22 1996/09/28 16:09:30 rws $
XCOMM platform: $XFree86: xc/config/cf/bsdi.cf,v 3.31 2000/08/01 23:38:45 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/bsdi.cf,v 3.32 2000/10/24 22:45:00 dawes Exp $
#ifndef OSName
#define OSName DefaultOSName
......@@ -103,6 +103,8 @@ XCOMM xf86site.def
#define HasWChar32 YES
#define DirFailPrefix -
#define AvoidNullMakeCommand YES
#define HasVarRun YES
#define HasVarDb YES
# ifndef GccUsesGas
# define GccUsesGas YES
......@@ -121,6 +123,20 @@ XCOMM xf86site.def
# define GccGasOption /**/
#endif
/*
* Build a threaded X server on 4.1 and newer systems
*/
#if (OSMajorVersion == 4 && OSMinorVersion >= 1) || (OSMajorVersion > 4)
#define HasPosixThreads YES /* this will autodefine HasThreadedX */
#define HasThreadSafeAPI YES
XCOMM math.h uses _REENTRANT in FreeBSD, so we define it here too
#define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE
/*
* Heck, build a server that can load modules too...
*/
#define DoLoadableServer YES
#endif
#ifdef i386Architecture
#ifndef BuildXF86DRI
#define BuildXF86DRI NO
......
/* $XFree86: xc/config/cf/iPAQH3600.cf,v 1.2 2000/10/10 14:05:48 tsi Exp $ */
/*
* This configuration file contains additional configuration needed
* to cross compile X for the Compaq iPAQ H3600 PocketPC.
* To use this, add the following to host.def:
#define KDriveXServer YES
#define XiPAQH3500Server YES
*/
#define CrossCompiling YES
#undef i386Architecture
#define Arm32Architecture
#undef OptimizedCDebugFlags
#define OptimizedCDebugFlags -O2
#define ServerCDebugFlags -O2
#undef StandardDefines
#define StandardDefines -Dlinux -D__arm__ -D_POSIX_SOURCE \
-D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
#undef CcCmd
#define StdIncDir /skiff/local/arm-linux/include
#define PreIncDir
#undef PostIncDir
#define PostIncDir /skiff/local/lib/gcc-lib/arm-linux/2.95.2/include
#define CcCmd /skiff/local/bin/arm-linux-gcc
#define DoRanlibCmd YES
#define RanlibCmd /skiff/local/bin/arm-linux-ranlib
#undef ExtraLoadFlags
#define ExtraLoadFlags
#define FbNoPixelAddrCode
#undef TermcapLibrary
#define TermcapLibrary -ltermcap
#undef LdPostLib
#define LdPostLib -L/skiff/local/arm-linux/lib
#undef XfbdevServer
#define XfbdevServer YES
#undef BuildXprint
#define BuildLBX NO
#define BuildFonts NO
#define BuildAppgroup NO
#define BuildRECORD NO
#define BuildDBE NO
#define BuildXCSecurity NO
#define ItsyCompilerBug YES
#define FontServerAccess NO
#define ServerXdmcpDefines /**/
#undef ExtensionOSDefines
#define ExtensionOSDefines
#define ProjectRoot /usr/X11R6
#define GzipFontCompression YES
#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=1
#define HostLinkRule(target, flags, src, libs) cc -I$(BUILDINCDIR) -o target src
/* ComplexHostProgramTarget - Compile a program such that we can run
* it on this host, i.e., don't use the default cross compiler.
*/
#ifndef ComplexHostProgramTarget
#define ComplexHostProgramTarget(program) @@\
CC=cc @@\
STD_INCLUDES= @@\
CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS) @@\
EXTRA_LOAD_FLAGS= @@\
PROGRAM = program @@\
@@\
AllTarget(program) @@\
@@\
program: $(OBJS) $(DEPLIBS) @@\
RemoveTargetProgram($@) @@\
HostLinkRule($@,$(_NOOP_),$(OBJS),$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\
@@\
DependTarget() @@\
@@\
LintTarget() @@\
@@\
clean:: @@\
RemoveFile(ProgramTargetName(program))
#endif /* ComplexHostProgramTarget */
#ifndef SimpleHostProgramTarget
#define SimpleHostProgramTarget(program) @@\
SRCS = program.c @@\
@@\
CC=cc @@\
STD_INCLUDES= @@\
CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS) @@\
EXTRA_LOAD_FLAGS= @@\
PROGRAM = program @@\
@@\
AllTarget(program) @@\
@@\
program: program.o $(DEPLIBS) @@\
RemoveTargetProgram($@) @@\
HostLinkRule($@,$(_NOOP_),program.o,$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\
@@\
DependTarget() @@\
@@\
LintTarget() @@\
@@\
clean:: @@\
RemoveFile(ProgramTargetName(program))
#endif /* SimpleHostProgramTarget */
XCOMM $XFree86: xc/config/cf/kdrive.cf,v 1.6 2000/08/31 04:34:50 keithp Exp $
XCOMM $XFree86: xc/config/cf/kdrive.cf,v 1.7 2000/09/26 04:26:30 keithp Exp $
/*
* This configuration file contains all of the configuration
* information for the XFree86 based X Servers.
......@@ -28,6 +28,9 @@ XCOMM $XConsortium: $
#ifndef XItsyServer
#define XItsyServer NO
#endif
#ifndef XiPAQH3600Server
#define XiPAQH3600Server NO
#endif
#ifndef XvesaServer
#define XvesaServer NO
#endif
......@@ -36,6 +39,10 @@ XCOMM $XConsortium: $
#include <itsy.cf>
#endif
#if XiPAQH3600Server
#include <iPAQH3600.cf>
#endif
#define XprtServer NO
#define BuildXIE NO
#define BuildXInputExt NO
......@@ -49,6 +56,9 @@ XCOMM $XConsortium: $
#ifndef BuildRender
#define BuildRender YES
#endif
#ifndef TouchScreen
#define TouchScreen NO
#endif
/*
* By default, build all of the fonts.
......@@ -158,6 +168,12 @@ XCOMM $XConsortium: $
FONTSERVERACCESS=-DNOFONTSERVERACCESS
#endif
#if TouchScreen
#define TouchScreenDefines -DTOUCHSCREEN
#else
#define TouchScreenDefines /**/
#endif
#if BuildPseudo8
#define Pseudo8Defines -DPSEUDO8
#else
......@@ -171,7 +187,7 @@ FONTSERVERACCESS=-DNOFONTSERVERACCESS
XF86COMSRC=.
#undef ServerExtraDefines
#define ServerExtraDefines -DKDRIVESERVER -DGCCUSESGAS -DDDXOSINIT -DSMART_SCHEDULE $(FONTSERVERACCESS) Pseudo8Defines KdriveServerExtraDefines
#define ServerExtraDefines -DKDRIVESERVER -DGCCUSESGAS -DDDXOSINIT -DSMART_SCHEDULE $(FONTSERVERACCESS) Pseudo8Defines TouchScreenDefines KdriveServerExtraDefines
#undef ServerOSDefines
#define ServerOSDefines -DDDXOSINIT
......
......@@ -4,7 +4,7 @@ XCOMM platform: $TOG: linux.cf /main/47 1998/04/17 11:32:51 mgreess
XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.137 2000/09/19 12:46:03 eich Exp $
XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.141 2000/10/20 12:57:21 alanh Exp $
#ifndef LinuxElfDefault
# define LinuxElfDefault YES
......@@ -172,7 +172,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
/* The DRM module requires kernel services that appeared in late 2.1.x
kernels and are known to be present in 2.2.x kernels. */
#ifndef BuildXF86DRI
# if defined(i386Architecture)
# if defined(i386Architecture) || defined(ia64Architecture)
# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)
# define BuildXF86DRI YES
# else
......@@ -180,6 +180,8 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# endif
# elif defined(SparcArchitecture)
# define BuildXF86DRI YES
# elif defined(AlphaArchitecture)
# define BuildXF86DRI YES
# else
# define BuildXF86DRI NO
# endif
......@@ -191,7 +193,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
kernel revisions. So, we'll only build the module for kernels that are
known to be supported by the module. */
#ifndef BuildXF86DRM
# ifdef i386Architecture
# if defined(i386Architecture) || defined(ia64Architecture)
# if OSMajorVersion == 2
/* Only tested for Linux 2.2.0 through 2.2.12 */
# if OSMinorVersion == 2 && OSTeenyVersion <= 12
......@@ -215,7 +217,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#endif
#ifndef HasAgpGart
# ifdef i386Architecture
# if defined(i386Architecture) || defined(ia64Architecture)
/* The AGPGART header file is included in os-support/linux, which
allows all drivers that depend on AGP to build properly. */
# define HasAgpGart YES
......@@ -457,6 +459,9 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define LinuxMachineDefines -D__alpha__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
# ifdef UseCompaqMathLibrary
# define MathLibrary -lcpml -lm
# endif
#endif /* AlphaArchitecture */
#ifdef Arm32Architecture
......@@ -472,6 +477,10 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define LinuxMachineDefines -D__ia64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
#if UseElfFormat
#define HasPlugin YES
#define VendorHasX11R6_3libXext YES /* XC or XFree86 >= 3.3.1 */
#endif
#endif /* ia64Architecture */
#ifdef Mc68020Architecture
......
XCOMM $XFree86: xc/config/cf/lnxdoc.tmpl,v 3.10 1999/07/04 08:31:00 dawes Exp $
XCOMM $XFree86: xc/config/cf/lnxdoc.tmpl,v 3.11 2000/09/26 15:56:27 tsi Exp $
XCOMM
#ifndef HasSgmlFmt
#define HasSgmlFmt NO
#endif
#ifndef HasLinuxDoc
#define HasLinuxDoc NO
#endif
#ifndef DoSgmlDocs
#define DoSgmlDocs (HasLinuxDoc || HasSgmlFmt)
#endif
......
......@@ -3,7 +3,7 @@ XCOMM platform: $TOG: usl.cf /main/50 1997/04/17 14:11:39 barstow $
XCOMM platform: $XFree86: xc/config/cf/usl.cf,v 3.19 2000/02/15 16:55:09 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/usl.cf,v 3.20 2000/10/24 18:07:34 dawes Exp $
#ifndef OSName
# define OSName DefaultOSName
......@@ -44,7 +44,11 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVer
#define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS
#endif
#if OSMajorVersion > 1 || OSTeenyVersion > 1
# define ExtraLibraries -lsocket -lnsl -lgen -lw
# if OSMajorVersion >= 7
# define ExtraLibraries -lsocket -lnsl -lgen
# else
# define ExtraLibraries -lsocket -lnsl -lgen -lw
# endif
# define ThreadedX YES
# define HasThreadSafeAPI NO
/* UnixWare does not have MT-safe pwd routines. */
......
XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.162 2000/05/31 07:14:52 eich Exp $
XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.164 2000/10/24 18:07:34 dawes Exp $
/******************************************************************************/
/*
* This file is to provide a quick method for most people to change the
......@@ -255,7 +255,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.162 2000/05/31 07:14:52 eich Exp $
neomagic i740 tdfx \
cirrus tseng trident chips apm \
GlideDriver fbdev \
ati r128 AgpGartDrivers cyrix \
ati i128 r128 AgpGartDrivers cyrix \
vga XF86OSCardDrivers XF86ExtraCardDrivers
*/
......@@ -314,6 +314,13 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.162 2000/05/31 07:14:52 eich Exp $
#define InstallXserverSetUID NO
*/
/*
* To link the X server with a dynamic version of the Xfont library,
* uncomment this.
*
#define XserverStaticFontLib NO
*/
/*
* To disable building the font server, uncomment this.
*
......
XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.314 2000/09/20 02:03:46 keithp Exp $
XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.318 2000/10/20 14:58:56 alanh Exp $
/*
* This configuration file contains all of the configuration
* information for the XFree86 based X Servers.
......@@ -70,6 +70,15 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
#define GlideDriver /**/
#endif
/* Use the binary-only library from Matrox? */
#ifndef UseMatroxHal
#define UseMatroxHal NO
#endif
#ifndef BuildMatroxHal
#define BuildMatroxHal NO
#endif
/*
* For Intel platforms, the default is to build all modules which
* are supported on this platform.
......@@ -164,9 +173,9 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
# define XF86CardDrivers mga glint nv tga s3virge sis rendition \
neomagic i740 tdfx \
cirrus tseng trident chips apm \
GlideDriver fbdev \
GlideDriver fbdev i128 \
r128 ati AgpGartDrivers DevelDrivers cyrix \
vga XF86OSCardDrivers XF86ExtraCardDrivers
vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
# endif
#endif
......@@ -435,7 +444,7 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
/* Pure PCI drivers should go first */
# ifndef XF86CardDrivers
# define XF86CardDrivers r128 mga glint s3virge sis cirrus tseng \
# define XF86CardDrivers r128 mga glint s3virge sis \
trident chips fbdev \
DevelDrivers vga \
XF86OSCardDrivers XF86ExtraCardDrivers
......@@ -610,7 +619,12 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
# if defined(SparcArchitecture) || defined(ia64Architecture)
# define GlxArchDefines -D__GLX_ALIGN64
# else
# define GlxArchDefines /**/
# if defined(AlphaArchitecture)
/* On the Alpha we need to ensure floating point accuracy for 3D */
# define GlxArchDefines -mieee
# else
# define GlxArchDefines /**/
# endif
# endif
# ifndef GlxExtraDefines
......
......@@ -7,7 +7,7 @@
# may be given at the top of the build tree for systems that do not define
# any machine-specific preprocessor symbols.
#
# $XFree86: xc/config/imake/Makefile.ini,v 3.8 2000/08/26 15:28:32 dawes Exp $
# $XFree86: xc/config/imake/Makefile.ini,v 3.9 2000/10/26 17:57:45 dawes Exp $
BOOTSTRAPCFLAGS =
CC = cc
......@@ -40,8 +40,8 @@ ccimake: ccimake.c
bootstrap:
-@if [ -d bootstrap ]; then exit 0; else set -x; mkdir bootstrap; fi
$(MV) *.o bootstrap
@if [ -f imake ]; then set -x; $(MV) imake bootstrap; else exit 0; fi
@if [ -f imake.exe ]; then set -x; $(MV) imake.exe bootstrap; else exit 0; fi
@if [ -f imake.exe ]; then set -x; $(MV) imake.exe bootstrap; \
elif [ -f imake ]; then set -x; $(MV) imake bootstrap; else exit 0; fi
relink:
$(RM) imake
......
......@@ -8,7 +8,7 @@
* be passed to the template file. *
* *
***************************************************************************/
/* $XFree86: xc/config/imake/imake.c,v 3.36 2000/07/07 20:06:57 tsi Exp $ */
/* $XFree86: xc/config/imake/imake.c,v 3.37 2000/10/24 18:07:35 dawes Exp $ */
/*
*
......@@ -146,6 +146,7 @@ in this Software without prior written authorization from The Open Group.
# include <sys/types.h>
# include <sys/sysctl.h>
#endif
#include <stdlib.h>
#include <stdio.h>
#include "Xosdefs.h"
#ifndef X_NOT_STDC_ENV
......
......@@ -20,10 +20,11 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/config/makedepend/def.h,v 3.6 1999/03/21 07:34:25 dawes Exp $ */
/* $XFree86: xc/config/makedepend/def.h,v 3.7 2000/10/24 18:07:35 dawes Exp $ */
#include "Xos.h"
#include "Xfuncproto.h"
#include <stdlib.h>
#include <stdio.h>
#ifndef X_NOT_STDC_ENV
#include <string.h>
......
......@@ -35,7 +35,7 @@
*
* Author: Adobe Systems Incorporated
*/
/* $XFree86: xc/config/pswrap/psw.c,v 1.5 2000/06/07 21:36:56 tsi Exp $ */
/* $XFree86: xc/config/pswrap/psw.c,v 1.6 2000/09/26 15:56:27 tsi Exp $ */
/***********/
/* Imports */
......@@ -99,9 +99,9 @@ static int stringBytes;
dst = psw_malloc(strlen(src)+1) , \
strcpy(dst, src)
static int NumArgs(Args args)
static long NumArgs(Args args)
{
register int n = 0;
register long n = 0;
register Arg arg;
register Item item;
for (arg = args; arg; arg = arg->next)
......@@ -308,7 +308,7 @@ static void SetNameTag(Token t)
0 doneTag printobject flush
where doneTag = (last result parameter tag + 1).
*/
static Body AppendResultFlush(Body body, int n)
static Body AppendResultFlush(Body body, long n)
{
Token t, token;
char *ss;
......@@ -317,7 +317,7 @@ static Body AppendResultFlush(Body body, int n)
for (t = body; t->next; t = t->next) ;
token = PSWToken(T_INT, 0L);
token->next = PSWToken(T_INT, (char *) n);
token->next = PSWToken(T_INT, (char *)(long)n);
SafeStrCpy(ss, "printobject");
token->next->next = PSWToken(T_NAME, ss);
......@@ -851,10 +851,10 @@ static void EmitFieldConstructor(Token t)
switch (t->type) {
case T_BOOLEAN:
fprintf(datafil, "DPS_LITERAL%cDPS_BOOL, 0, 0, %d", ATT_SEP, (int) t->val);
fprintf(datafil, "DPS_LITERAL%cDPS_BOOL, 0, 0, %d", ATT_SEP, (int)(long)t->val);
break;
case T_INT:
fprintf(datafil, "DPS_LITERAL%cDPS_INT, 0, 0, %d", ATT_SEP, (int) t->val);