diff options
| author | dawes <dawes> | 2001-03-19 17:45:15 +0000 |
|---|---|---|
| committer | dawes <dawes> | 2001-03-19 17:45:15 +0000 |
| commit | 7bf7bda7738b2029bc71015f9ea08304c15e7240 (patch) | |
| tree | 95c06cadb9f7fdb6d456eafb2cb015653c617724 /xc/config | |
| parent | 856c96701fa6c514447af12b4b881f762e59767c (diff) | |
Import of XFree86 4.0.99.1X_4_0_99_1
Diffstat (limited to 'xc/config')
139 files changed, 1823 insertions, 541 deletions
diff --git a/xc/config/Imakefile b/xc/config/Imakefile index 870f8833f..82dd53141 100644 --- a/xc/config/Imakefile +++ b/xc/config/Imakefile @@ -1,5 +1,5 @@ -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 $Xorg: Imakefile,v 1.3 2000/08/17 19:41:45 cpqbld Exp $ +XCOMM $XFree86: xc/config/Imakefile,v 1.3 2001/01/17 16:22:29 dawes Exp $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" diff --git a/xc/config/cf/Amoeba.cf b/xc/config/cf/Amoeba.cf index a84478902..b5ffe9e9b 100644 --- a/xc/config/cf/Amoeba.cf +++ b/xc/config/cf/Amoeba.cf @@ -1,5 +1,5 @@ -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: $Xorg: Amoeba.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $ +XCOMM platform: $XFree86: xc/config/cf/Amoeba.cf,v 3.10 2001/01/17 16:22:29 dawes Exp $ /* The presence of this configuration file in the X distribution * does not imply full support for the system it describes. diff --git a/xc/config/cf/DGUX.cf b/xc/config/cf/DGUX.cf index b383099ee..b7eb985f9 100644 --- a/xc/config/cf/DGUX.cf +++ b/xc/config/cf/DGUX.cf @@ -1,4 +1,4 @@ -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.6 2001/01/12 19:28:20 dawes Exp $ /* Copyright Takis Psarogiannakopoulos <takis@pmms.cam.ac.uk> * This is the DG/ux configuration file of X11R6.3 */ @@ -101,7 +101,9 @@ XCOMM platform: $XFree86: xc/config/cf/DGUX.cf,v 1.5 2000/07/07 20:06:56 tsi Ex #define ToolkitStringsABIOptions -intelabi -earlyR6bc #endif +#ifndef DefaultCCOptions #define DefaultCCOptions /* -ansi -pedantic */ +#endif #define OptimizedCDebugFlags -O2 /* Add -g -mstandard for full debuging info */ #define OptimizedCplusplusDebugFlags #define DebuggableCDebugFlags -g -mstandard diff --git a/xc/config/cf/FreeBSD.cf b/xc/config/cf/FreeBSD.cf index ecccbc65d..33539b1bb 100644 --- a/xc/config/cf/FreeBSD.cf +++ b/xc/config/cf/FreeBSD.cf @@ -1,8 +1,8 @@ -XCOMM platform: $TOG: FreeBSD.cf /main/21 1997/10/05 20:42:34 kaleb $ +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.101 2000/12/04 18:49:09 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.104 2001/01/17 16:22:29 dawes Exp $ #ifndef UseElfFormat #define UseElfFormat DefaultToElfFormat @@ -36,7 +36,7 @@ XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.101 2000/12/04 18:49:09 d #define OSRelVersion __FreeBSD_version #endif -XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) (OsRelVersion) +XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) (OSRelVersion) #define HasCplusplus YES @@ -60,6 +60,12 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #define HasVarRun YES #define HasVarDb YES +#if (OSMajorVersion > 1) +#define InstallXloadSetGID NO +#else +#define InstallXloadSetGID YES +#endif + #define AvoidNullMakeCommand YES #define StripInstalledPrograms YES #define CompressAllFonts YES @@ -87,11 +93,13 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #define PreProcessCmd CppCmd #define StandardCppOptions -traditional #define StandardCppDefines /**/ +#ifndef DefaultCCOptions #if defined(UseInstalled) #define DefaultCCOptions /**/ #else #define DefaultCCOptions -ansi -pedantic -Dasm=__asm GccWarningOptions #endif +#endif #ifndef ExtraLibraries /* support for multi-byte locales is in libxpg4 rather than libc */ #if (OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)) && \ @@ -408,85 +416,6 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe # define CompressManPages YES #endif -#if CompressManPages - -#ifndef CompressManCmd -# define CompressManCmd gzip -n -#endif - COMPRESSMANCMD = CompressManCmd - -#ifndef InstallManPageLong -#define InstallManPageLong(file,destdir,dest) @@\ -BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\ - @@\ -install.man:: file.man @@\ - MakeDir($(DESTDIR)destdir) @@\ - $(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)* @@\ - $(INSTALL) -c $(INSTMANFLAGS) file.man \ @@\ - $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\ - -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.$(MANSUFFIX) -#endif - -#ifndef InstallGenManPageLong -#define InstallGenManPageLong(file,destdir,dest,suffix) @@\ -BuildInstallHtmlManPage(file,dest,suffix) @@\ - @@\ -install.man:: file.man @@\ - MakeDir($(DESTDIR)destdir) @@\ - $(RM) $(DESTDIR)destdir/dest.suffix* @@\ - $(INSTALL) -c $(INSTMANFLAGS) file.man \ @@\ - $(DESTDIR)destdir/dest.suffix @@\ - -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.suffix -#endif - -#ifndef InstallMultipleMan -#define InstallMultipleMan(list,dest) @@\ -install.man:: list @@\ - MakeDir($(DESTDIR)dest) @@\ - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ - for i in list; do \ @@\ - (MNAME=`echo $$i | cut -f1 -d.`; \ @@\ - set -x; \ @@\ - $(RM) $(DESTDIR)dest/$${MNAME}*; \ @@\ - $(INSTALL) -c $(INSTMANFLAGS) $$i \ @@\ - $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \ @@\ - $(COMPRESSMANCMD) $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX)); \ @@\ - done -#endif - -/* - * InstallManPageAliases - install soft links for aliases. - */ -#ifndef InstallManPageAliasesBase -#define InstallManPageAliasesBase(file,destdir,aliases) @@\ -install.man:: @@\ - @(SUFFIX=`echo $(DESTDIR)destdir/file.* | sed -e 's,.*/[^\.]*.,,'`; \ @@\ - for i in aliases; do (set -x; \ @@\ - $(RM) $(DESTDIR)destdir/$$i.*; \ @@\ - (cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \ @@\ - $$i.$${SUFFIX})); \ @@\ - done) -#endif - -#ifndef InstallManPageAliases -#define InstallManPageAliases(file,destdir,aliases) @@\ -InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\ - @@\ -InstallManPageAliasesBase(file,destdir,aliases) -#endif - - -/* - * InstallGenManPageAliases - install soft links for aliases. - */ -#ifndef InstallGenManPageAliases -#define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\ -InstallHtmlManPageAliases(file,aliases,suffix) @@\ - @@\ -InstallManPageAliasesBase(file,destdir,aliases) -#endif -#endif - #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1) #define HasBsdMake YES #endif diff --git a/xc/config/cf/Imake.cf b/xc/config/cf/Imake.cf index 8a975c1be..d68043095 100644 --- a/xc/config/cf/Imake.cf +++ b/xc/config/cf/Imake.cf @@ -1,4 +1,4 @@ -XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $ +XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $ /* * To add support for another platform: * @@ -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.63 2000/11/06 19:24:00 dawes Exp $ +XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.64 2001/01/17 16:22:29 dawes Exp $ #if defined(__APPLE__) # undef __APPLE__ @@ -799,17 +799,14 @@ XCOMM for compatibility with 3.3.x # define mc68000Architecture #endif /* __sxg__ */ -#if defined(sequent) || defined(_SEQUENT_) +#ifdef _SEQUENT_ +/* undefine assignments resulting from -DSVR4 */ +# undef MacroIncludeFile # define MacroIncludeFile <sequent.cf> +# undef MacroFile # define MacroFile sequent.cf -# ifdef sequent -# undef sequent -# define Dynix3Architecture -# endif -# ifdef _SEQUENT_ -# undef _SEQUENT_ -# define DynixPtxArchitecture -# endif +# undef _SEQUENT_ +# define DynixPtxArchitecture # define SequentArchitecture #endif diff --git a/xc/config/cf/Imake.rules b/xc/config/cf/Imake.rules index 9ddd70a76..7058bf43b 100644 --- a/xc/config/cf/Imake.rules +++ b/xc/config/cf/Imake.rules @@ -1,11 +1,11 @@ XCOMM --------------------------------------------------------------------- XCOMM Imake rules for building libraries, programs, scripts, and data files -XCOMM rules: $TOG: Imake.rules /main/227 1998/02/02 12:07:57 kaleb $ +XCOMM rules: $Xorg: Imake.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ XCOMM XCOMM XCOMM XCOMM -XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.86 2000/12/12 17:05:30 dawes Exp $ +XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.92 2001/02/07 23:28:44 dawes Exp $ /* * MACHINE-INDEPENDENT RULES; DO NOT MODIFY @@ -466,7 +466,7 @@ ProgramTargetName(program.tc): deplist @@\ RemoveTargetProgram($@) @@\ $(CCENVSETUP) $(PROOF) $(PROOFOPTIONS) $(CC) -o $@ $(LDOPTIONS) linklist $(EXTRA_LOAD_FLAGS) @@\ @@\ -clean clean.tc:: @@\ +clean cleantc:: @@\ RemoveFiles(program.tc program.tc.*.*) #else #define ProofProgramTarget(program,deplist,linklist) /**/ @@ -483,7 +483,7 @@ ProgramTargetName(program.tc): deplist @@\ RemoveTargetProgram($@) @@\ $(CXXENVSETUP) $(PROOF) $(PROOFOPTIONS) $(CXX) -o $@ $(CXXLDOPTIONS) linklist $(EXTRA_LOAD_FLAGS) @@\ @@\ -clean clean.tc:: @@\ +clean cleantc:: @@\ RemoveFiles(program.tc program.tc.*.*) #else #define ProofCplusplusProgramTarget(program,deplist,linklist) /**/ @@ -493,7 +493,7 @@ clean clean.tc:: @@\ #ifndef ProofCleanTarget #if HasTestCenter #define ProofCleanTarget() @@\ -clean clean.tc:: @@\ +clean cleantc:: @@\ $(RM) -r TC.Cache #else #define ProofCleanTarget() /**/ @@ -1185,6 +1185,7 @@ InstallTarget(install.ln,Concat(llib-l,libname.ln),$(INSTLIBFLAGS),dest) #endif /* InstallLintLibrary */ +#if !CompressManPages /* * InstallManPageLong - generate rules to install the indicated manual page, * giving it an alternate name. This is used for installing man pages whose @@ -1196,20 +1197,13 @@ InstallTarget(install.ln,Concat(llib-l,libname.ln),$(INSTLIBFLAGS),dest) #define InstallManPageLong(file,destdir,dest) @@\ BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\ @@\ -InstallNamedTarget(install.man,file.man,$(INSTMANFLAGS),destdir,dest.$(MANSUFFIX)) +CppManTarget(file,$(EXTRAMANDEFS)) @@\ + @@\ +InstallNamedTarget(install.man,file.$(MANNEWSUFFIX),$(INSTMANFLAGS),destdir,dest.$(MANSUFFIX)) #endif /* InstallManPageLong */ /* - * InstallManPage - generate rules to install the indicated manual page. - */ -#ifndef InstallManPage -#define InstallManPage(file,destdir) @@\ -InstallManPageLong(file,destdir,file) -#endif /* InstallManPage */ - - -/* * InstallManPageAliases - generate rules to install manual page aliases. */ #ifndef InstallManPageAliases @@ -1217,7 +1211,7 @@ InstallManPageLong(file,destdir,file) InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\ @@\ install.man:: @@\ - @(TMP=/tmp/tmp.$$$$; \ @@\ + @(TMP=#tmp.$$$$; \ @@\ RemoveFile($${TMP}); \ @@\ echo .so `basename destdir`/file.$(MANSUFFIX) > $${TMP}; \ @@\ for i in aliases; do (set -x; \ @@\ @@ -1235,22 +1229,16 @@ install.man:: @@\ #define InstallGenManPageLong(file,destdir,dest,suffix) @@\ BuildInstallHtmlManPage(file,dest,suffix) @@\ @@\ -install.man:: file.man @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ +install.man:: file.$(MANNEWSUFFIX) @@\ MakeDir($(DESTDIR)destdir) @@\ - $(INSTALL) -c $(INSTMANFLAGS) file.man $(DESTDIR)destdir/dest.suffix + $(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\ + $(DESTDIR)destdir/dest.suffix #endif /* InstallGenManPageLong */ /* - * InstallGenManPage - general equivalent of InstallManPage - */ -#ifndef InstallGenManPage -#define InstallGenManPage(file,destdir,suffix) @@\ -InstallGenManPageLong(file,destdir,file,suffix) -#endif /* InstallGenManPage */ - - -/* * InstallGenManPageAliases - general equivalent of InstallManPageAliases */ #ifndef InstallGenManPageAliases @@ -1258,7 +1246,7 @@ InstallGenManPageLong(file,destdir,file,suffix) InstallHtmlManPageAliases(file,aliases,suffix) @@\ @@\ install.man:: @@\ - @(TMP=/tmp/tmp.$$$$; \ @@\ + @(TMP=#tmp.$$$$; \ @@\ RemoveFile($${TMP}); \ @@\ echo .so `basename destdir`/file.suffix > $${TMP}; \ @@\ for i in aliases; do (set -x; \ @@\ @@ -1267,6 +1255,103 @@ install.man:: @@\ RemoveFile($${TMP})) #endif /* InstallGenManPageAliases */ +#else /* CompressManPages */ + +#ifndef InstallManPageLong +#define InstallManPageLong(file,destdir,dest) @@\ +BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\ + @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ +install.man:: file.$(MANNEWSUFFIX) @@\ + MakeDir($(DESTDIR)destdir) @@\ + $(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)* @@\ + $(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\ + $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\ + -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.$(MANSUFFIX) +#endif + +#ifndef InstallGenManPageLong +#define InstallGenManPageLong(file,destdir,dest,suffix) @@\ +BuildInstallHtmlManPage(file,dest,suffix) @@\ + @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ +install.man:: file.$(MANNEWSUFFIX) @@\ + MakeDir($(DESTDIR)destdir) @@\ + $(RM) $(DESTDIR)destdir/dest.suffix* @@\ + $(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\ + $(DESTDIR)destdir/dest.suffix @@\ + -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.suffix +#endif + +#ifndef InstallMultipleMan +#define InstallMultipleMan(list,dest) @@\ +install.man:: list @@\ + MakeDir($(DESTDIR)dest) @@\ + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ + for i in list; do \ @@\ + (MNAME=`echo $$i | cut -f1 -d.`; \ @@\ + set -x; \ @@\ + $(RM) $(DESTDIR)dest/$${MNAME}*; \ @@\ + $(INSTALL) -c $(INSTMANFLAGS) $$i \ @@\ + $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \ @@\ + $(COMPRESSMANCMD) $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX)); \ @@\ + done +#endif + +/* + * InstallManPageAliases - install soft links for aliases. + */ +#ifndef InstallManPageAliasesBase +#define InstallManPageAliasesBase(file,destdir,aliases) @@\ +install.man:: @@\ + @(SUFFIX=`echo $(DESTDIR)destdir/file.* | sed -e 's,.*/[^\.]*.,,'`; \ @@\ + for i in aliases; do (set -x; \ @@\ + $(RM) $(DESTDIR)destdir/$$i.*; \ @@\ + (cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \ @@\ + $$i.$${SUFFIX})); \ @@\ + done) +#endif + +#ifndef InstallManPageAliases +#define InstallManPageAliases(file,destdir,aliases) @@\ +InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\ + @@\ +InstallManPageAliasesBase(file,destdir,aliases) +#endif + + +/* + * InstallGenManPageAliases - install soft links for aliases. + */ +#ifndef InstallGenManPageAliases +#define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\ +InstallHtmlManPageAliases(file,aliases,suffix) @@\ + @@\ +InstallManPageAliasesBase(file,destdir,aliases) +#endif + +#endif /* CompressManPages */ + + +/* + * InstallManPage - generate rules to install the indicated manual page. + */ +#ifndef InstallManPage +#define InstallManPage(file,destdir) @@\ +InstallManPageLong(file,destdir,file) +#endif /* InstallManPage */ + + +/* + * InstallGenManPage - general equivalent of InstallManPage + */ +#ifndef InstallGenManPage +#define InstallGenManPage(file,destdir,suffix) @@\ +InstallGenManPageLong(file,destdir,file,suffix) +#endif /* InstallGenManPage */ + /* * RmanDependency - generate rules to build the rman program if @@ -1300,10 +1385,10 @@ ProgramTargetName($(RMAN)): @@\ #define BuildInstallHtmlManPage(file,dest,suffix) @@\ AllTarget(dest.suffix.html) @@\ @@\ -dest.suffix.html: file.man RmanCmdDependency @@\ +dest.suffix.html: file.$(MANNEWSUFFIX) RmanCmdDependency @@\ RemoveFiles(dest.suffix.html dest.suffix-html) @@\ - RunProgram(RMAN,$(RMANOPTIONS) < file.man > dest.suffix-html) && \ @@\ - $(MV) dest.suffix-html $@ @@\ + RunProgram(RMAN,$(RMANOPTIONS) < file.$(MANNEWSUFFIX) \ @@\ + > dest.suffix-html) && $(MV) dest.suffix-html $@ @@\ @@\ install.man:: dest.suffix.html @@\ MakeDir($(DESTDIR)$(DOCHTMLDIR)) @@\ @@ -3069,13 +3154,24 @@ clean:: @@\ #endif /* CppFileTarget */ /* - * CppManTarget - generates rules to create man source from a file with a .cpp - * suffix. OS-specific man sections are replaced. + * CppManTarget - preprocess man pages. OS-specific man sections are replaced. */ #ifndef CppManTarget +#if !DontPreprocessManPages || defined(PreprocessManPages) +#define CppManTarget(name,defs) @@\ +AllTarget(name.$(MANNEWSUFFIX)) @@\ +CppRawFileTarget(name.$(MANNEWSUFFIX),name.$(MANSRCSUFFIX),$(MANDEFS) defs,NullParameter) +#else #define CppManTarget(name,defs) @@\ -AllTarget(name.man) @@\ -CppRawFileTarget(name.man,name.cpp,$(MANDEFS) defs,NullParameter) +AllTarget(name.$(MANNEWSUFFIX)) @@\ + @@\ +name.$(MANNEWSUFFIX): name.$(MANSRCSUFFIX) @@\ + RemoveFile($@) @@\ + $(LN) name.$(MANSRCSUFFIX) $@ @@\ + @@\ +clean:: @@\ + RemoveFile(name.$(MANNEWSUFFIX)) +#endif #endif /* CppManTarget */ /* diff --git a/xc/config/cf/Imake.tmpl b/xc/config/cf/Imake.tmpl index 0de4d0835..9084eb62d 100644 --- a/xc/config/cf/Imake.tmpl +++ b/xc/config/cf/Imake.tmpl @@ -1,11 +1,11 @@ XCOMM ---------------------------------------------------------------------- XCOMM Makefile generated from IMAKE_TEMPLATE and INCLUDE_IMAKEFILE -XCOMM $TOG: Imake.tmpl /main/249 1997/10/13 15:28:56 kaleb $ +XCOMM $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ XCOMM XCOMM XCOMM XCOMM -XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.87 2000/12/02 19:06:57 herrb Exp $ +XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.95 2001/02/13 17:20:09 tsi Exp $ XCOMM ---------------------------------------------------------------------- /* @@ -32,6 +32,10 @@ all:: .SUFFIXES: .i +/* Intercept clean rules for current directory */ +#undef clean +#define clean cleandir + #include <Imake.cf> XCOMM ----------------------------------------------------------------------- @@ -231,6 +235,14 @@ XCOMM the platform-specific parameters - edit site.def to change #define BuildHtmlManPages NO #endif +#ifndef DontPreprocessManPages +#ifdef UseInstalled +#define DontPreprocessManPages YES +#else +#define DontPreprocessManPages NO +#endif +#endif + #ifndef HasCookieMaker #define HasCookieMaker NO #endif @@ -729,8 +741,17 @@ TCLIBDIR = TclLibDir #ifndef DriverManDefs #define DriverManDefs -D__drivermansuffix__=$(DRIVERMANSUFFIX) #endif -#ifndef ExtraManDefs -#define ExtraManDefs -D__projectroot__=$(PROJECTROOT) +#ifndef ProjectManDefs +#define ProjectManDefs -D__projectroot__=$(PROJECTROOT) +#endif + + +#ifndef CompressManPages +#define CompressManPages NO +#endif + +#ifndef CompressManCmd +#define CompressManCmd gzip -n #endif #ifndef HtmlIndexCmd @@ -778,7 +799,7 @@ TCLIBDIR = TclLibDir #endif #endif #ifndef UNCOMPRESSPATH -#define UNCOMPRESSPATH /usr/ucb/uncompress +#define UNCOMPRESSPATH /usr/ucb/uncompress /* obsolete */ #endif #ifndef OptimizedCDebugFlags #define OptimizedCDebugFlags -O @@ -879,6 +900,9 @@ TCLIBDIR = TclLibDir #ifndef HasGcc2ForCplusplus #define HasGcc2ForCplusplus NO #endif +#ifndef HasBrokenCCForLink +#define HasBrokenCCForLink NO +#endif #ifndef HasCenterLineC #define HasCenterLineC NO #endif @@ -1206,6 +1230,13 @@ TCLIBDIR = TclLibDir #endif #endif #endif +#ifndef DependDefines +# if UseCCMakedepend || UseGccMakedepend +# define DependDefines /**/ +# else +# define DependDefines -DUSE_MAKEDEPEND +# endif +#endif #ifndef DependFlags #define DependFlags /**/ #endif @@ -1342,6 +1373,12 @@ TCLIBDIR = TclLibDir #define ExpandManNames YES #endif #endif +#ifndef ManSrcSuffix +#define ManSrcSuffix man +#endif +#ifndef ManNewSuffix +#define ManNewSuffix _man +#endif #ifndef TOPDIR #define TOPDIR . #endif @@ -1424,7 +1461,7 @@ CXXEXTRA_INCLUDES = CplusplusExtraIncludes CXXSTD_DEFINES = CplusplusStandardDefines $(CXXPROJECT_DEFINES) CXXOPTIONS = CplusplusOptions CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) - CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES) + CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES) CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) #endif COMPRESS = CompressCmd @@ -1460,7 +1497,11 @@ CXXEXTRA_INCLUDES = CplusplusExtraIncludes FILEMANSUFFIX = FileManSuffix /* suffix for file format man pages */ MISCMANSUFFIX = MiscManSuffix /* suffix for misc man pages */ DRIVERMANSUFFIX = DriverManSuffix /* suffix for driver man pages */ - MANDEFS = FileManDefs MiscManDefs DriverManDefs ExtraManDefs + MANSRCSUFFIX = ManSrcSuffix /* suffix for man page source */ + MANNEWSUFFIX = ManNewSuffix /* suffix for preprocessed man source */ + MANDEFS = FileManDefs MiscManDefs DriverManDefs ProjectManDefs $(XORGMANDEFS) $(VENDORMANDEFS) + + COMPRESSMANCMD = CompressManCmd TROFF = TroffCmd NROFF = NroffCmd @@ -1615,7 +1656,7 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile */ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES) - ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) + ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEPENDDEFINES) $(DEFINES) $(EXTRA_DEFINES) CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) LDPRELIB = LdPreLib @@ -1643,6 +1684,7 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags LDSTRIPFLAGS = LdStripFlags LDCOMBINEFLAGS = LdCombineFlags DEPENDFLAGS = DependFlags + DEPENDDEFINES = DependDefines XCOMM Not sure this belongs here TKLIBDIR = TkLibDir @@ -1764,6 +1806,13 @@ ManKeywordsTarget($(MANPATH)) HtmlManIndex +/* Generate the "real" clean rules */ +#undef clean + +clean:: cleandir + +distclean:: cleandir + #ifdef IHaveSubdirs XCOMM ---------------------------------------------------------------------- XCOMM rules for building in SUBDIRS - do not edit @@ -1776,6 +1825,13 @@ TagSubdirs($(SUBDIRS)) MakefileSubdirs($(SUBDIRS)) IncludesSubdirs($(SUBDIRS)) +/* "distclean" subdirectories */ +#undef BootstrapCleanSubdirs +#define BootstrapCleanSubdirs /**/ +#define clean distclean +CleanSubdirs($(SUBDIRS)) +#undef clean + #endif /* must be after all install.man rules that install anything */ @@ -1809,6 +1865,12 @@ depend:: #endif /* if subdirectory rules are needed */ +#ifndef IHaveSpecialMakefileTarget +/* "distclean" also removes the Makefile */ +distclean:: + RemoveFile(Makefile) +#endif + XCOMM ---------------------------------------------------------------------- XCOMM dependencies generated by makedepend IncludeMakefile(DependFileName) diff --git a/xc/config/cf/Imakefile b/xc/config/cf/Imakefile index 7440c8583..0211e17b7 100644 --- a/xc/config/cf/Imakefile +++ b/xc/config/cf/Imakefile @@ -1,5 +1,5 @@ -XCOMM $XConsortium: Imakefile /main/38 1996/11/07 14:43:46 kaleb $ -XCOMM $XFree86: xc/config/cf/Imakefile,v 3.24 2000/11/02 02:51:06 dawes Exp $ +XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ +XCOMM $XFree86: xc/config/cf/Imakefile,v 3.26 2001/01/17 16:22:30 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. @@ -17,6 +17,7 @@ host.def DEFFILES = \ xf86site.def \ +version.def \ $(HOSTDEFFILES) \ site.def diff --git a/xc/config/cf/Library.tmpl b/xc/config/cf/Library.tmpl index c965cd436..656ed84cd 100644 --- a/xc/config/cf/Library.tmpl +++ b/xc/config/cf/Library.tmpl @@ -14,12 +14,12 @@ * Define LargePICTable YES if large (32-bit) PIC tables are needed. */ -XCOMM $TOG: Library.tmpl /main/44 1997/04/28 11:47:53 kaleb $ +XCOMM $Xorg: Library.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ -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.13 2001/01/17 16:22:30 dawes Exp $ #ifndef LibraryCplusplusOptions # if DoSharedLib && defined(SharedLibraryCplusplusOptions) diff --git a/xc/config/cf/Mips.cf b/xc/config/cf/Mips.cf index ad2184acc..cf0446510 100644 --- a/xc/config/cf/Mips.cf +++ b/xc/config/cf/Mips.cf @@ -15,7 +15,7 @@ #define OSMinorVersion 50 #endif -XCOMM platform: $XConsortium: Mips.cf /main/17 1996/09/28 16:06:25 rws $ +XCOMM platform: $Xorg: Mips.cf,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ XCOMM operating system: OSName /*************************************************************************** diff --git a/xc/config/cf/Motif.rules b/xc/config/cf/Motif.rules index 45ad26c05..283ce6ca6 100644 --- a/xc/config/cf/Motif.rules +++ b/xc/config/cf/Motif.rules @@ -13,7 +13,7 @@ * (c) Copyright 1996 FUJITSU LIMITED. * (c) Copyright 1996 Hitachi. */ -XCOMM $TOG: Motif.rules /main/4 1998/02/06 10:53:37 kaleb $ +XCOMM $Xorg: Motif.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ /* Note whether we are the top level project. */ #ifndef SeenTopLevelProject diff --git a/xc/config/cf/Motif.tmpl b/xc/config/cf/Motif.tmpl index 40d31e085..d4b7d3a49 100644 --- a/xc/config/cf/Motif.tmpl +++ b/xc/config/cf/Motif.tmpl @@ -13,7 +13,7 @@ * (c) Copyright 1996 FUJITSU LIMITED. * (c) Copyright 1996 Hitachi. */ -XCOMM $TOG: Motif.tmpl /main/5 1998/02/06 10:53:46 kaleb $ +XCOMM $Xorg: Motif.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ /* Include the X11 project template file. */ #include <X11.tmpl> diff --git a/xc/config/cf/NetBSD.cf b/xc/config/cf/NetBSD.cf index 80c246870..c71f6015d 100644 --- a/xc/config/cf/NetBSD.cf +++ b/xc/config/cf/NetBSD.cf @@ -1,8 +1,8 @@ -XCOMM platform: $XConsortium: NetBSD.cf /main/16 1996/10/31 14:47:14 kaleb $ +XCOMM platform: $Xorg: NetBSD.cf,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ -XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.87 2000/12/03 16:14:08 herrb Exp $ +XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.92 2001/02/11 21:39:36 herrb Exp $ #ifndef OSName @@ -67,11 +67,20 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe (OSMajorVersion == 1 && OSMinorVersion < 2))) #define HasMkstemp YES #endif +/* But the standalone mktemp doesn't exist before NetBSD 1.5*/ +#if (OSMajorVersion ==0 || (OSMajorVersion == 1 && OSMinorVersion <= 4)) +# define HasMktemp NO +#else +# define HasMktemp YES +#endif + #define HasUsableFileMmap YES #define HasVarRun YES #define HasVarDb YES +#define InstallXloadSetGID NO + /* Defines for using the GNU pth thread library -- experimental */ #ifdef NetBSDPth @@ -107,6 +116,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #undef CcCmd #define CcCmd gcc +#ifndef DefaultCCOptions #if defined(UseInstalled) #define DefaultCCOptions /**/ #else @@ -116,6 +126,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #define DefaultCCOptions -ansi -Dasm=__asm GccWarningOptions #endif #endif +#endif #define GccGasOption -DGCCUSESGAS #define AsmDefines -DUSE_GAS @@ -341,10 +352,10 @@ dirs: .EXEC @@\ @@\ all:: file.0 @@\ @@\ -file.0:: file.man @@\ - @if [ -f file.man ]; \ @@\ +file.0:: file.$(MANNEWSUFFIX) @@\ + @if [ -f file.$(MANNEWSUFFIX) ]; \ @@\ then \ @@\ - cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@\ + cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@\ cp /tmp/$$$$.man file.0; \ @@\ $(RM) /tmp/$$$$.man; \ @@\ fi @@\ @@ -362,11 +373,15 @@ clean:: @@\ #define InstallManPageLong(file,destdir,dest) @@\ BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\ @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ InstallManPageLongBase(file,destdir,dest) #define InstallGenManPageLong(file,destdir,dest,suffix) @@\ BuildInstallHtmlManPage(file,dest,suffix) @@\ @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ InstallManPageLongBase(file,destdir,dest) #define InstallMultipleMan(list,dest) @@\ diff --git a/xc/config/cf/Oki.cf b/xc/config/cf/Oki.cf index d51766b29..79992e5ed 100644 --- a/xc/config/cf/Oki.cf +++ b/xc/config/cf/Oki.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: Oki.cf /main/16 1996/09/28 16:06:53 rws $ +XCOMM platform: $Xorg: Oki.cf,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ #ifndef OSName #define OSName Unix System V/860 Release 4.0 Version 3 diff --git a/xc/config/cf/OpenBSD.cf b/xc/config/cf/OpenBSD.cf index e74a9dfcd..b076d72fb 100644 --- a/xc/config/cf/OpenBSD.cf +++ b/xc/config/cf/OpenBSD.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.44 2000/12/02 20:15:03 herrb Exp $ +XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.49 2001/02/03 19:33:04 herrb Exp $ XCOMM #ifndef OSName @@ -72,6 +72,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #define HasVarRun YES #define HasVarDb YES +#define InstallXloadSetGID NO + #ifndef HasLibPthread #define HasLibPthread NO #endif @@ -121,6 +123,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #undef CcCmd #define CcCmd gcc +#ifndef DefaultCCOptions #if defined(UseInstalled) #define DefaultCCOptions /**/ #else @@ -130,6 +133,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe # define DefaultCCOptions -ansi -Dasm=__asm GccWarningOptions # endif #endif +#endif #define GccGasOption -DGCCUSESGAS #define AsmDefines -DUSE_GAS @@ -147,7 +151,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe # define LdPostLib /**/ # define ServerExtraDefines GccGasOption XFree86ServerDefines # ifndef XFree86ConsoleDefines -# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT +# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DWSCONS_SUPPORT -DPCVT_SUPPORT # endif #endif @@ -257,11 +261,11 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #define InstallManPageLongBase(file,destdir,dest) @@\ all:: file.0 @@\ @@\ -file.0:: file.man @@\ - @if [ -f file.man ]; \ @@\ +file.0:: file.$(MANNEWSUFFIX) @@\ + @if [ -f file.$(MANNEWSUFFIX) ]; \ @@\ then \ @@\ - cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) \ @@\ - | $(COL) > file.0; \ @@\ + cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | \ @@\ + $(NROFF) $(MANMACROS) | $(COL) > file.0; \ @@\ fi @@\ @@\ install.man:: @@\ @@ -277,11 +281,15 @@ clean:: @@\ #define InstallManPageLong(file,destdir,dest) @@\ BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\ @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ InstallManPageLongBase(file,destdir,dest) #define InstallGenManPageLong(file,destdir,dest,suffix) @@\ BuildInstallHtmlManPage(file,dest,suffix) @@\ @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ InstallManPageLongBase(file,destdir,dest) #define InstallMultipleMan(list,dest) @@\ @@ -424,8 +432,10 @@ install:: fonts.alias @@\ # endif /* Support for USB Mices */ -# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 6) -# define UsbMouseSupport YES +# ifndef UsbMouseSupport +# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 6) +# define UsbMouseSupport YES +# endif # endif /* diff --git a/xc/config/cf/README b/xc/config/cf/README index 05b4d1500..2d884caaa 100644 --- a/xc/config/cf/README +++ b/xc/config/cf/README @@ -1,9 +1,9 @@ -$TOG: README /main/76 1998/05/11 14:35:10 barstow $ +$Xorg: README,v 1.4 2000/08/18 04:03:58 coskrey Exp $ -$XFree86: xc/config/cf/README,v 1.12 2000/12/02 19:06:57 herrb Exp $ +$XFree86: xc/config/cf/README,v 1.13 2001/01/17 16:22:30 dawes Exp $ The easiest way to write an Imakefile is to find another one that does something similar and copy/modify it! @@ -133,6 +133,8 @@ Imake.tmpl provides defaults for the following variables: NoRConst YES if const for structs of funcs is bad OSMajorVersion major version number of operating system OSMinorVersion minor version number of operating system + OSName operating system name + OSTeenyVersion maintenance version number of operating system OptimizedCDebugFlags C compiler flags to turn on optimization XtPopdownConformance XtPopdown conformans to the specification PreProcessCmd command to run /lib/cpp on scripts @@ -152,7 +154,7 @@ Imake.tmpl provides defaults for the following variables: TagsCmd command to run tags TblCmd command to run tbl TroffCmd command to run troff to get PostScript - UNCOMPRESSPATH command to run uncompress + UNCOMPRESSPATH command to run uncompress (obsolete) UnalignedReferencesAllowed boolean for unaligned copies ok UsrLibDir directory in which to install libraries YaccCmd command to run yacc @@ -265,7 +267,7 @@ X11.tmpl provides defaults for the following variables: NormalLibXtst build libXtst.a NormalLibXag build libXag.a NormalOldX build liboldX.a - OsNameDefines beats me + OsNameDefines If uname(2) unavailable, set to -DOS_NAME=OSName PexApiDir PEX include file location PexCCOptions special options for building PEX library PexCDebugFlags special flags for building PEX library @@ -339,7 +341,7 @@ X11.tmpl provides defaults for the following variables: XtErrorPrefix leading text in XtError() msg; eg. 'X Toolkit ' XtWarningPrefix leading text in XtWarning()msg, same as above XtMalloc0ReturnsNullDefines -D's specifically for libXt - ZBDFTOSNFFILT -D to run uncompress and bdftosnf + ZBDFTOSNFFILT -D to run uncompress and bdftosnf (obsolete) Library.tmpl provides defaults for the following variables: diff --git a/xc/config/cf/Server.tmpl b/xc/config/cf/Server.tmpl index 42aadf311..520687a9f 100644 --- a/xc/config/cf/Server.tmpl +++ b/xc/config/cf/Server.tmpl @@ -1,10 +1,10 @@ -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.17 2001/01/17 16:22:30 dawes Exp $ /* * Server imakefile info - this contains any special redefinitions, etc. * that Imakefiles in the server subtree will need. */ -XCOMM $TOG: Server.tmpl /main/15 1997/07/16 14:43:38 kaleb $ +XCOMM $Xorg: Server.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" LDSTRIPFLAGS="$(LDSTRIPFLAGS)" diff --git a/xc/config/cf/Threads.tmpl b/xc/config/cf/Threads.tmpl index a505fcef7..eb7c0374b 100644 --- a/xc/config/cf/Threads.tmpl +++ b/xc/config/cf/Threads.tmpl @@ -1,5 +1,8 @@ -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 $Xorg: Threads.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ + + + +XCOMM $XFree86: xc/config/cf/Threads.tmpl,v 3.3 2001/01/17 16:22:31 dawes Exp $ /* * For a multi-threaded application or library, diff --git a/xc/config/cf/Win32.cf b/xc/config/cf/Win32.cf index 065e026c0..af864a93f 100644 --- a/xc/config/cf/Win32.cf +++ b/xc/config/cf/Win32.cf @@ -1,4 +1,4 @@ -XCOMM platform: $TOG: Win32.cf /main/57 1997/12/04 11:03:33 kaleb $ +XCOMM platform: $Xorg: Win32.cf,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ #ifndef OSName #define OSName DefaultOSName diff --git a/xc/config/cf/Win32.rules b/xc/config/cf/Win32.rules index 93b91ed5f..4b2e42a04 100644 --- a/xc/config/cf/Win32.rules +++ b/xc/config/cf/Win32.rules @@ -1,4 +1,4 @@ -XCOMM platform: $TOG: Win32.rules /main/51 1997/12/02 14:48:29 kaleb $ +XCOMM platform: $Xorg: Win32.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ #define HasSharedLibraries YES #define NeedLibInsideFlag YES diff --git a/xc/config/cf/WinLib.tmpl b/xc/config/cf/WinLib.tmpl index 9ae402d50..8b5d2174c 100644 --- a/xc/config/cf/WinLib.tmpl +++ b/xc/config/cf/WinLib.tmpl @@ -1,5 +1,8 @@ -XCOMM $XConsortium: WinLib.tmpl /main/3 1996/11/13 14:43:09 lehors $ -XCOMM $XFree86: xc/config/cf/WinLib.tmpl,v 1.2 1999/01/11 14:39:59 dawes Exp $ +XCOMM $Xorg: WinLib.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ + + + +XCOMM $XFree86: xc/config/cf/WinLib.tmpl,v 1.3 2001/01/17 16:22:31 dawes Exp $ #define SharedOldXReqs $(LDPRELIBS) $(XLIBONLY) #define SharedXtReqs $(LDPRELIBS) $(XLIBONLY) diff --git a/xc/config/cf/X11.rules b/xc/config/cf/X11.rules index cc959fe8d..841705794 100644 --- a/xc/config/cf/X11.rules +++ b/xc/config/cf/X11.rules @@ -1,7 +1,7 @@ -XCOMM $TOG: X11.rules /main/4 1997/04/30 15:23:24 kaleb $ +XCOMM $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/X11.rules,v 1.5 2000/11/06 19:24:00 dawes Exp $ +XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $ /* Note whether we are the top level project. */ #ifndef SeenTopLevelProject @@ -94,11 +94,14 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.5 2000/11/06 19:24:00 dawes Exp $ #else # define X11BuildLibPath $(TOP)/exports/lib #endif + +#ifndef BuildLibPath #ifdef SystemBuildLibPath # define BuildLibPath $(XENVLIBDIR):$(SYSTEMENVLIBDIR) #else # define BuildLibPath $(XENVLIBDIR) #endif +#endif #ifndef X11ProjectDefines # define X11ProjectDefines /**/ diff --git a/xc/config/cf/X11.tmpl b/xc/config/cf/X11.tmpl index 094493e78..d34fcb8aa 100644 --- a/xc/config/cf/X11.tmpl +++ b/xc/config/cf/X11.tmpl @@ -1,11 +1,11 @@ XCOMM ---------------------------------------------------------------------- XCOMM X Window System Build Parameters and Rules -XCOMM $TOG: X11.tmpl /main/308 1998/06/16 15:14:24 msr $ +XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $ XCOMM XCOMM XCOMM XCOMM -XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.93 2000/12/15 18:18:04 keithp Exp $ +XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.99 2001/02/09 00:35:02 keithp Exp $ /*************************************************************************** * * @@ -37,6 +37,36 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.93 2000/12/15 18:18:04 keithp Exp $ * MakeXkbDir (basedir,subdir) */ +/* X.Org release string */ +#ifndef XOrgReleaseString +#define XOrgReleaseString Release 6.5 +#endif + +#ifndef XOrgManNameString +#define XOrgManNameString X Version 11 +#endif + +XORGRELSTRING = XOrgReleaseString +XORGMANNAME = XOrgManNameString + +#ifndef XOrgManDefs +#define XOrgManDefs -D__xorgversion__='"$(XORGRELSTRING)" "$(XORGMANNAME)"' +#endif + +#ifndef XVendorManNameString +#define XVendorManNameString XOrgManNameString +#endif +#ifndef XVendorManVersionString +#define XVendorManVersionString XOrgReleaseString +#endif + +VENDORMANNAME = XVendorManNameString +VENDORMANVERSION = XVendorManVersionString + +#ifndef VendorManDefs +#define VendorManDefs -D__vendorversion__='"$(VENDORMANVERSION)" "$(VENDORMANNAME)"' +#endif + /* * X-specific things */ @@ -277,6 +307,9 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.93 2000/12/15 18:18:04 keithp Exp $ #ifndef BuildXvLibrary #define BuildXvLibrary BuildXvExt #endif +#ifndef BuildGLULibrary +#define BuildGLULibrary NO +#endif #ifndef BuildGlxExt #define BuildGlxExt NO #endif @@ -310,6 +343,9 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.93 2000/12/15 18:18:04 keithp Exp $ #ifndef BuildXftLibrary #define BuildXftLibrary BuildRenderLibrary #endif +#ifndef BuildFreetype2Library +#define BuildFreetype2Library BuildXftLibrary +#endif #ifndef BuildMiscDocs #define BuildMiscDocs NO @@ -339,6 +375,9 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.93 2000/12/15 18:18:04 keithp Exp $ #ifndef InstallXtermSetUID #define InstallXtermSetUID YES /* xterm needs to be set uid */ #endif +#ifndef InstallXloadSetGID +#define InstallXloadSetGID YES /* xload often needs set gid kmem */ +#endif #ifndef InstallXinitConfig #define InstallXinitConfig NO /* install sample xinit config */ #endif @@ -358,6 +397,12 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.93 2000/12/15 18:18:04 keithp Exp $ #ifndef InstallAppDefFiles #define InstallAppDefFiles YES /* install application defaults */ #endif +#ifndef UseConfDirForAppDefaults +#define UseConfDirForAppDefaults YES +#endif +#ifndef UseConfDirForXkb +#define UseConfDirForXkb YES +#endif #ifndef CompressAllFonts #define CompressAllFonts NO #endif @@ -483,7 +528,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN #define XMalloc0ReturnsNullDefines Malloc0ReturnsNullDefines #endif #ifndef XtMalloc0ReturnsNullDefines -#define XtMalloc0ReturnsNullDefines Malloc0ReturnsNullDefines +#define XtMalloc0ReturnsNullDefines Malloc0ReturnsNullDefines -DXTMALLOC_BC #endif #endif #ifndef ExtensionOSDefines @@ -1243,6 +1288,10 @@ XCOMM X Window System make variables; these need to be coordinated with rules #ifdef X11ProjectRoot XPROJECTROOT = X11ProjectRoot #endif + + XORGMANDEFS = XOrgManDefs + VENDORMANDEFS = VendorManDefs + #if HasSharedLibraries #ifndef DontUseLibPathVar #ifndef BuildLibPathVar @@ -1484,6 +1533,21 @@ ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir) #endif #endif +#if BuildGLULibrary +#ifndef SharedLibGlu +#define SharedLibGlu HasSharedLibraries +#endif +#ifndef NormalLibGlu +#define NormalLibGlu (!SharedLibX11 | ForceNormalLib) +#endif +#ifndef DebugLibGlu +#define DebugLibGlu NO +#endif +#ifndef ProfileLibGlu +#define ProfileLibGlu NO +#endif +#endif + #if BuildGLXLibrary #ifndef SharedLibGlx #define SharedLibGlx HasSharedLibraries @@ -1691,6 +1755,18 @@ ProjectUnsharedLibReferences(PSRES,psres,$(PSRESLIBSRC),XBuildLibDir) #endif #endif +#if BuildGLULibrary + GLULIBSRC = $(LIBSRC)/GL/glu +#if SharedLibGlu +#ifndef SharedGluRev +#define SharedGluRev 1.3 +#endif +SharedLibReferences(GLU,GLU,$(GLULIBSRC),SOGLUREV,SharedGluRev) +#else +ProjectUnsharedLibReferences(GLU,GLU,$(GLULIBSRC),XBuildLibDir) +#endif +#endif + #if BuildGLXLibrary GLXLIBSRC = $(LIBSRC)/GL #if SharedLibGlx @@ -2201,29 +2277,38 @@ SharedLibReferences(XPM,Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev) ProjectUnsharedLibReferences(XPM,Xpm,$(XPMLIBSRC),XBuildLibDir) #endif -#ifndef SharedLibXft -#define SharedLibXft HasSharedLibraries +#ifndef SharedLibFreetype2 +#define SharedLibFreetype2 HasSharedLibraries #endif -#ifndef NormalLibXft -#define NormalLibXft (!SharedLibXft | ForceNormalLib) +#ifndef NormalLibFreetype2 +#define NormalLibFreetype2 (!SharedLibFreetype2 | ForceNormalLib) #endif -#ifndef DebugLibXft -#define DebugLibXft NO +#ifndef DebugLibFreetype2 +#define DebugLibFreetype2 NO #endif -#ifndef ProfileLibXft -#define ProfileLibXft NO +#ifndef ProfileLibFreetype2 +#define ProfileLibFreetype2 NO #endif - XFTLIBSRC = $(LIBSRC)/Xft -#if SharedLibXft -#ifndef SharedXftRev -#define SharedXftRev 1.0 + FREETYPE2LIBSRC = $(LIBSRC)/freetype2 +#if SharedLibFreetype2 +#ifndef SharedFreetype2Rev +#define SharedFreetype2Rev 6.0 #endif -SharedLibReferences(XFT,Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev) +SharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),SOFREETYPE2REV,SharedFreetype2Rev) #else -ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),XBuildLibDir) #endif +#if BuildFreetype2Library +FREETYPE2INCLUDES=$(TOP_X_INCLUDES)/freetype2 +FREETYPE2DEFINES=-DFREETYPE2 +#define HasFreetype2 YES +#else + #ifdef Freetype2Dir + +#define HasFreetype2 YES + #ifndef Freetype2LibDir #define Freetype2LibDir Freetype2Dir/lib #endif @@ -2238,11 +2323,38 @@ FREETYPE2INCDIR = Freetype2IncDir FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) FREETYPE2LIB = -L$(FREETYPE2LIBDIR) -lfreetype FREETYPE2DEFINES = -DFREETYPE2 +#endif + +#endif + +#ifndef HasFreetype2 +#define HasFreetype2 NO +#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 #ifndef XftClientDepLibs -#define XftClientDepLibs $(DEPXFTLIB) $(DEPXRENDERLIB) +#define XftClientDepLibs $(DEPXFTLIB) $(DEPFREETYPE2LIB) $(DEPXRENDERLIB) #endif #ifndef XftClientLibs #define XftClientLibs $(XFTLIB) $(FREETYPE2LIB) $(XRENDERLIB) @@ -2347,6 +2459,7 @@ ProjectUnsharedLibReferences(XKBUI,xkbui,$(XKBUILIBSRC),XBuildLibDir) * if the InstallAppDefFiles configuration parameter is set. */ #ifndef InstallAppDefaultsLong +#if UseConfDirForAppDefaults #if InstallAppDefFiles #define InstallAppDefaultsLong(file,class) @@\ LinkConfDirectory(app-defaults,.,app-defaults,.) @@\ @@ -2356,6 +2469,15 @@ InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) LinkConfDirectory(app-defaults,.,app-defaults,.) @@\ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) #endif /* InstallAppDefFiles */ +#else /* UseConfDirForAppDefaults */ +#if InstallAppDefFiles +#define InstallAppDefaultsLong(file,class) @@\ +InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) +#else +#define InstallAppDefaultsLong(file,class) @@\ +InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) +#endif /* InstallAppDefFiles */ +#endif /* UseConfDirForAppDefaults */ #endif /* InstallAppDefaultsLong */ /* diff --git a/xc/config/cf/apollo.cf b/xc/config/cf/apollo.cf index a802b1a74..8a5196295 100644 --- a/xc/config/cf/apollo.cf +++ b/xc/config/cf/apollo.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: apollo.cf /main/34 1996/09/28 16:09:07 rws $ +XCOMM platform: $Xorg: apollo.cf,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ /* * Minimally tested, and only in the bsd4.3 environment. X_NOT_POSIX is not diff --git a/xc/config/cf/bsd.cf b/xc/config/cf/bsd.cf index 1c80bb210..6f44f205a 100644 --- a/xc/config/cf/bsd.cf +++ b/xc/config/cf/bsd.cf @@ -1,5 +1,8 @@ -XCOMM platform: $XConsortium: bsd.cf /main/24 1996/09/28 16:09:13 rws $ -XCOMM $XFree86: xc/config/cf/bsd.cf,v 1.2 1998/09/06 04:46:50 dawes Exp $ +XCOMM platform: $Xorg: bsd.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ + + + +XCOMM $XFree86: xc/config/cf/bsd.cf,v 1.3 2001/01/17 16:22:31 dawes Exp $ #ifndef OSName #define OSName 4.3bsd diff --git a/xc/config/cf/bsdLib.rules b/xc/config/cf/bsdLib.rules index c4885b7de..b58aed256 100644 --- a/xc/config/cf/bsdLib.rules +++ b/xc/config/cf/bsdLib.rules @@ -1,10 +1,10 @@ -XCOMM $XConsortium: bsdLib.rules /main/3 1996/09/28 16:09:18 rws $ +XCOMM $Xorg: bsdLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/bsdLib.rules,v 3.13 2000/02/13 06:15:18 dawes Exp $ +XCOMM $XFree86: xc/config/cf/bsdLib.rules,v 3.15 2001/02/16 01:26:08 dawes Exp $ /* * NetBSD/FreeBSD shared library rules */ @@ -321,6 +321,23 @@ clean:: @@\ #endif /* SharedDepModuleTarget */ +#ifndef SharedDriModuleTarget +#define SharedDriModuleTarget(name,deps,solist) @@\ +AllTarget(name) @@\ + @@\ +name: deps @@\ + $(RM) $@~ $@.map @@\ + @(echo 'DRI_MODULE { global: __dri*; local: *; };' > $@.map) @@\ + $(CC) -o $@~ -Wl,--version-script=$@.map $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) BaseShLibReqs @@\ + $(RM) $@ $@.map @@\ + $(MV) $@~ $@ @@\ + @@\ +clean:: @@\ + $(RM) name @@\ + $(RM) name.map + +#endif /* SharedDriModuleTarget */ + /* * SharedLibraryDataTarget - generate rules to create shlib data file; */ diff --git a/xc/config/cf/bsdLib.tmpl b/xc/config/cf/bsdLib.tmpl index 39a7c638a..49c616a89 100644 --- a/xc/config/cf/bsdLib.tmpl +++ b/xc/config/cf/bsdLib.tmpl @@ -1,5 +1,5 @@ -XCOMM $XConsortium: bsdLib.tmpl /main/3 1996/09/28 16:09:25 rws $ -XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.6 2000/08/28 15:29:08 dawes Exp $ +XCOMM $Xorg: bsdLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.7 2001/01/17 16:22:31 dawes Exp $ /* * NetBSD/FreeBSD/OpenBSD shared library template diff --git a/xc/config/cf/bsdi.cf b/xc/config/cf/bsdi.cf index 41433133d..25f5d300a 100644 --- a/xc/config/cf/bsdi.cf +++ b/xc/config/cf/bsdi.cf @@ -1,6 +1,8 @@ -XCOMM platform: $XConsortium: bsdi.cf /main/22 1996/09/28 16:09:30 rws $ -XCOMM platform: $XFree86: xc/config/cf/bsdi.cf,v 3.32 2000/10/24 22:45:00 dawes Exp $ +XCOMM platform: $Xorg: bsdi.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ + + +XCOMM platform: $XFree86: xc/config/cf/bsdi.cf,v 3.35 2001/01/23 23:31:48 dawes Exp $ #ifndef OSName #define OSName DefaultOSName #endif @@ -110,12 +112,14 @@ XCOMM xf86site.def # define GccUsesGas YES # endif #if HasGcc +#ifndef DefaultCCOptions #if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit) #define DefaultCCOptions /**/ #else #define DefaultCCOptions /* -ansi */ #endif #endif +#endif #if GccUsesGas # define GccGasOption -DGCCUSESGAS @@ -215,12 +219,14 @@ XCOMM imake rules. #define ManSourcePath $(MANPATH)/cat #define InstallManPageLong(file,destdir,dest) @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ all:: file.0 @@\ @@\ -file.0:: file.man @@\ - @if [ -f file.man ]; \ @@\ +file.0:: file.$(MANNEWSUFFIX) @@\ + @if [ -f file.$(MANNEWSUFFIX) ]; \ @@\ then \ @@\ - cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@\ + cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@\ cp /tmp/$$$$.man file.0; \ @@\ $(RM) /tmp/$$$$.man; \ @@\ fi @@\ diff --git a/xc/config/cf/cde.rules b/xc/config/cf/cde.rules index e173e46cf..315047207 100644 --- a/xc/config/cf/cde.rules +++ b/xc/config/cf/cde.rules @@ -13,7 +13,7 @@ * (c) Copyright 1996 FUJITSU LIMITED. * (c) Copyright 1996 Hitachi. */ -XCOMM $TOG: cde.rules /main/4 1998/02/06 10:53:52 kaleb $ +XCOMM $Xorg: cde.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ /* Note whether we are the top level project. */ #ifndef SeenTopLevelProject diff --git a/xc/config/cf/cde.tmpl b/xc/config/cf/cde.tmpl index 5dfa301bd..c30a449a8 100644 --- a/xc/config/cf/cde.tmpl +++ b/xc/config/cf/cde.tmpl @@ -1,4 +1,4 @@ -XCOMM $XConsortium: cde.tmpl /main/2 1996/12/04 10:13:09 swick $ +XCOMM $Xorg: cde.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ /* Include the Motif project template file. */ #include <Motif.tmpl> diff --git a/xc/config/cf/convex.cf b/xc/config/cf/convex.cf index deb6d76e1..3b522f7a7 100644 --- a/xc/config/cf/convex.cf +++ b/xc/config/cf/convex.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: convex.cf /main/4 1996/09/28 16:09:50 rws $ +XCOMM platform: $Xorg: convex.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ #ifndef OSName #define OSName ConvexOS V9.0 diff --git a/xc/config/cf/cray.cf b/xc/config/cf/cray.cf index 78f36c5df..4bc685c7b 100644 --- a/xc/config/cf/cray.cf +++ b/xc/config/cf/cray.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: cray.cf /main/52 1996/09/28 16:09:55 rws $ +XCOMM platform: $Xorg: cray.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ #ifndef OSName #define OSName UNICOS 8.0 diff --git a/xc/config/cf/cygwin.cf b/xc/config/cf/cygwin.cf index 8ba0a8ccb..dd11550f0 100644 --- a/xc/config/cf/cygwin.cf +++ b/xc/config/cf/cygwin.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.2 2000/11/30 23:29:55 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.3 2001/01/12 19:28:24 dawes Exp $ XCOMM XCOMM - changes since B20 Cygwin32 release XCOMM - avoided tons of "not in XXX directory" messages; @@ -75,7 +75,9 @@ XCOMM #define OSDefines -DSYSV -DSYSV386 #define HasDlopen NO #define HasGnuMake YES XCOMM #define ExtraLoaderDefines DlopenHack +#ifndef DefaultCCOptions #define DefaultCCOptions -Wall +#endif #define DefaultGcc2i386Opt -O2 #define LibraryCDebugFlags -O2 #define UseGccMakeDepend YES diff --git a/xc/config/cf/cygwin.rules b/xc/config/cf/cygwin.rules index a0c6bfa74..efca2c16a 100644 --- a/xc/config/cf/cygwin.rules +++ b/xc/config/cf/cygwin.rules @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.2 2000/08/23 21:06:18 dawes Exp $ +XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.3 2001/02/13 19:19:11 dawes Exp $ #define CPPOnlyAsm(basename,options) RemoveFile(basename.i) @@\ $(CPP) AsmDefines $(DEFINES) $(INCLUDES) options basename.S | grep -v '^\#' > basename.i @@ -120,8 +120,8 @@ CppFileTarget(libname.def,libname-def.cpp,-DLIBRARY_VERSION=rev,$(ICONFIGFILES)) @@\ junk.c: @@\ echo "#include <cygwin/cygwin_dll.h>" >junk.c @@\ - echo "/*DECLARE_CYGWIN_DLL(dll_main);*/" >>junk.c @@\ - echo "int WINAPI dll_main(HANDLE a, DWORD reason, void *q)" >>junk.c @@\ + echo "DECLARE_CYGWIN_DLL(dll_main);" >>junk.c @@\ + echo "int WINAPI dll_main(HINSTANCE a, DWORD reason, void *q)" >>junk.c @@\ echo "{ return 1; }" >>junk.c @@\ Concat3(lib,libname,.dll): solist junk.o libname.def @@\ RemoveFile(LibraryTargetName(libname)) @@\ diff --git a/xc/config/cf/cygwin.tmpl b/xc/config/cf/cygwin.tmpl index 4de189090..ec18609cd 100644 --- a/xc/config/cf/cygwin.tmpl +++ b/xc/config/cf/cygwin.tmpl @@ -1,5 +1,5 @@ XCOMM $XConsortium: WinLib.tmpl,v 1.1 94/01/08 18:32:51 rws Exp $ -XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.2 2000/12/04 18:49:13 dawes Exp $ +XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.3 2001/02/13 19:19:11 dawes Exp $ #define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) #define SharedXtReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XLIBONLY) @@ -15,6 +15,7 @@ XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.2 2000/12/04 18:49:13 dawes Exp $ #define SharedXpReqs $(LDPRELIB) $(XAUTHLIB) $(EXTENSIONLIB) $(XLIBONLY) #define SharedXvReqs $(LDPRELIB) $(XLIB) #define SharedGLReqs $(LDPRELIB) $(XLIB) +#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) XCOMM #define SharedXfontReqs $(LDPRELIB) $(XLIB) #define SharedXxf86vmReqs $(LDPRELIB) $(XLIB) #define SharedXxf86miscReqs $(LDPRELIB) $(XLIB) diff --git a/xc/config/cf/darwin.cf b/xc/config/cf/darwin.cf index 2ba4f78e0..70f3cca2f 100644 --- a/xc/config/cf/darwin.cf +++ b/xc/config/cf/darwin.cf @@ -1,6 +1,6 @@ -XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.2 2000/11/28 17:25:07 dawes Exp $ +XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.6 2001/02/02 21:40:40 herrb Exp $ -/* Darwin / MacOS-X configuration by John Carmack <johnc@idsoftware.com> */ +/* Darwin / Mac OS X configuration by John Carmack <johnc@idsoftware.com> */ /* imake determines the default values by parsing uname */ #define OSName DefaultOSName @@ -21,25 +21,27 @@ XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.2 2000/11/28 17:25:07 dawes Exp $ */ #define XFree86Devel NO +/* + * This enables Quartz compatibility. + * Turn off to build on raw Darwin systems. + */ +#define DarwinQuartzSupport YES + /* we don't need -lm */ #define MathLibrary /**/ /* we don't have a termcap library */ -#define TermcapLibrary /**/ +#define TermcapLibrary /**/ /* we don't have a dbm library */ -#define DBMLibrary /**/ +#define DBMLibrary /**/ /* our cpp isn't in /lib/cpp */ #define CppCmd /usr/bin/cpp /* we have a gcc compatible compiler, but its not called gcc */ #define CcCmd /usr/bin/cc - -/* if -c isn't passed, there are problems with the cfb libs when - * they include an object file without any symbols - */ -#define RanlibCmd ranlib -c +#define CplusplusCmd /usr/bin/c++ /* uncommenting this line will get -g instead of -O, which builds * a lot faster and gets debug info @@ -49,6 +51,7 @@ XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.2 2000/11/28 17:25:07 dawes Exp $ #endif /* default flags to pass to cc */ +#ifndef DefaultCCOptions #if XFree86Devel # define DefaultCCOptions -Wall -Wpointer-arith -Wstrict-prototypes \ -Wmissing-prototypes -Wmissing-declarations \ @@ -57,17 +60,17 @@ XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.2 2000/11/28 17:25:07 dawes Exp $ #else # define DefaultCCOptions -Wall -Wpointer-arith -traditional-cpp #endif +#endif -/* a lot of xfree86 code needs __powerpc__ to avoid doing outport asm +/* A lot of xfree86 code needs __powerpc__ to avoid doing outport asm. * * __DARWIN__ will be used for platform specific #ifdefs that can't - * be handled by existing X defines + * be handled by existing X defines. * - * there is an unfortunate symbol collision with the appkit for TIFFFaxBlackCodes - * - * We need to define BSD44SOCKETS to get unix domain socket namelen calculated right + * Darwin's alloca() seg faults (rather than returning NULL) on failed + * allocations, so we can't use it. */ -#define StandardDefines -D__powerpc__ -D__DARWIN__ +#define StandardDefines -D__powerpc__ -D__DARWIN__ -DNO_ALLOCA /* programs/rgb/rgb.h and others needs this */ #define HasNdbm YES @@ -100,6 +103,16 @@ XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.2 2000/11/28 17:25:07 dawes Exp $ #define BuildXvExt NO + +/* no OpenGL libraries */ +#ifndef BuildGLXLibrary +# define BuildGLXLibrary NO +#endif +#ifndef BuildGLULibrary +# define BuildGLULibrary NO +#endif + + /* include all the xfree rules */ /* I haven't tracked down why this is needed, but it is... */ #include <xfree86.cf> diff --git a/xc/config/cf/fujitsu.cf b/xc/config/cf/fujitsu.cf index d2c8c3410..3615d3074 100644 --- a/xc/config/cf/fujitsu.cf +++ b/xc/config/cf/fujitsu.cf @@ -1,4 +1,4 @@ -XCOMM platform: $TOG: fujitsu.cf /main/9 1997/04/17 14:11:44 barstow $ +XCOMM platform: $Xorg: fujitsu.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ #ifndef OSName # define OSName DefaultOSName diff --git a/xc/config/cf/generic.cf b/xc/config/cf/generic.cf index de2b09819..dd1cd10a7 100644 --- a/xc/config/cf/generic.cf +++ b/xc/config/cf/generic.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: generic.cf /main/8 1996/09/28 16:10:06 rws $ +XCOMM platform: $Xorg: generic.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ #ifndef OSName #define OSName Unknown Operating System diff --git a/xc/config/cf/hp.cf b/xc/config/cf/hp.cf index c39176998..b64c5dd31 100644 --- a/xc/config/cf/hp.cf +++ b/xc/config/cf/hp.cf @@ -1,4 +1,4 @@ -XCOMM platform: $TOG: hp.cf /main/88 1997/11/12 07:16:22 kaleb $ +XCOMM platform: $Xorg: hp.cf,v 1.5 2000/08/17 19:41:47 cpqbld Exp $ #ifndef OSName # define OSName DefaultOSName @@ -173,7 +173,9 @@ XCOMM operating system: OSName (OSMajorVersion.OSMinorVersion.OSTeenyVersion) # if ThreadedX # define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXUSE_NETDB_R_API # endif -# define CppCmd /opt/langtools/lbin/cpp +# ifndef CppCmd +# define CppCmd /usr/ccs/lbin/cpp +# endif #endif /* CC does not recognize -Ae, and has a different meaning for +e. */ diff --git a/xc/config/cf/hpLib.rules b/xc/config/cf/hpLib.rules index c1852a9f3..cd5dbb432 100644 --- a/xc/config/cf/hpLib.rules +++ b/xc/config/cf/hpLib.rules @@ -1,10 +1,10 @@ -XCOMM $XConsortium: hpLib.rules /main/16 1996/12/04 11:44:35 swick $ +XCOMM $Xorg: hpLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ /* * HP shared library rules */ -XCOMM $XFree86: xc/config/cf/hpLib.rules,v 3.3 1999/01/11 05:13:06 dawes Exp $ +XCOMM $XFree86: xc/config/cf/hpLib.rules,v 3.4 2001/01/17 16:22:31 dawes Exp $ #ifndef HasSharedLibraries # define HasSharedLibraries YES diff --git a/xc/config/cf/hpLib.tmpl b/xc/config/cf/hpLib.tmpl index 42e18a6b0..25d4e4056 100644 --- a/xc/config/cf/hpLib.tmpl +++ b/xc/config/cf/hpLib.tmpl @@ -1,4 +1,4 @@ -XCOMM $XConsortium: hpLib.tmpl /main/10 1996/12/04 11:57:22 swick $ +XCOMM $Xorg: hpLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ /* * HP shared library template diff --git a/xc/config/cf/ibm.cf b/xc/config/cf/ibm.cf index ccdc1c4bf..cab348c6a 100644 --- a/xc/config/cf/ibm.cf +++ b/xc/config/cf/ibm.cf @@ -1,4 +1,4 @@ -XCOMM platform: $TOG: ibm.cf /main/82 1998/02/26 17:03:51 kaleb $ +XCOMM platform: $Xorg: ibm.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ #ifndef OSName # define OSName DefaultOSName diff --git a/xc/config/cf/ibmLib.rules b/xc/config/cf/ibmLib.rules index 2e5c9feb2..215c9139d 100644 --- a/xc/config/cf/ibmLib.rules +++ b/xc/config/cf/ibmLib.rules @@ -1,10 +1,10 @@ -XCOMM $XConsortium: ibmLib.rules /main/15 1996/12/30 16:06:05 kaleb $ +XCOMM $Xorg: ibmLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ /* * AIX shared library rules */ -XCOMM $XFree86: xc/config/cf/ibmLib.rules,v 3.5 2000/02/13 06:15:18 dawes Exp $ +XCOMM $XFree86: xc/config/cf/ibmLib.rules,v 3.6 2001/01/17 16:22:31 dawes Exp $ #ifndef HasSharedLibraries # define HasSharedLibraries YES diff --git a/xc/config/cf/ibmLib.tmpl b/xc/config/cf/ibmLib.tmpl index 6c3be3a97..9597cfd21 100644 --- a/xc/config/cf/ibmLib.tmpl +++ b/xc/config/cf/ibmLib.tmpl @@ -1,10 +1,10 @@ -XCOMM $XConsortium: ibmLib.tmpl /main/21 1996/12/04 12:21:49 swick $ +XCOMM $Xorg: ibmLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ /* * AIX shared library template */ -XCOMM $XFree86: xc/config/cf/ibmLib.tmpl,v 1.2 1999/01/11 14:40:00 dawes Exp $ +XCOMM $XFree86: xc/config/cf/ibmLib.tmpl,v 1.3 2001/01/17 16:22:32 dawes Exp $ /* * IBM used an unusual shared object file name in some librares. diff --git a/xc/config/cf/isc.cf b/xc/config/cf/isc.cf index 1a17f472b..45f0f8774 100644 --- a/xc/config/cf/isc.cf +++ b/xc/config/cf/isc.cf @@ -1,8 +1,8 @@ -XCOMM $XConsortium: isc.cf /main/1 1996/10/31 14:45:18 kaleb $ +XCOMM $Xorg: isc.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -XCOMM platform: $XFree86: xc/config/cf/isc.cf,v 3.15 1999/07/10 12:17:09 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/isc.cf,v 3.16 2001/01/17 16:22:32 dawes Exp $ #ifndef HasGcc2 #define HasGcc2 YES diff --git a/xc/config/cf/linux.cf b/xc/config/cf/linux.cf index 980ec0702..57be0c752 100644 --- a/xc/config/cf/linux.cf +++ b/xc/config/cf/linux.cf @@ -1,10 +1,10 @@ -XCOMM platform: $TOG: linux.cf /main/47 1998/04/17 11:32:51 mgreess +XCOMM platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.157 2000/12/14 17:00:46 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.160 2001/01/30 22:06:14 tsi Exp $ #ifndef LinuxElfDefault # define LinuxElfDefault YES @@ -217,6 +217,10 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class # endif #endif +#ifndef InstallXloadSetGID +#define InstallXloadSetGID NO +#endif + /* <linux/input.h> support mainly for USB support */ #ifndef HasLinuxInput # if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 4) @@ -356,6 +360,13 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #endif /* + * libGLU doesn't build correctly on a libc5 system. + */ +#if !defined(BuildGLULibrary) && (LinuxCLibMajorVersion < 6) +# define BuildGLULibrary NO +#endif + +/* * The Rush extension support. */ #ifndef BuildXF86RushExt @@ -605,7 +616,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class # define OptimizedCDebugFlags -O3 # define LinuxMachineDefines -D__arm__ -U__arm -Uarm # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -# define ServerExtraDefines -DGCCUSEGAS XFree86ServerDefines +# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif /* Arm32Achitecture */ #ifdef ia64Architecture diff --git a/xc/config/cf/lnxLib.rules b/xc/config/cf/lnxLib.rules index a82239d84..aa4d222a4 100644 --- a/xc/config/cf/lnxLib.rules +++ b/xc/config/cf/lnxLib.rules @@ -1,5 +1,5 @@ -XCOMM $TOG: lnxLib.rules /main/14 1998/03/16 11:15:30 mgreess $ -XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.38 2000/06/15 20:49:56 dawes Exp $ +XCOMM $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.40 2001/02/16 01:26:08 dawes Exp $ /* * Linux shared library rules (DLL & ELF versions) @@ -201,6 +201,23 @@ clean:: @@\ #endif /* SharedDepModuleTarget */ +#ifndef SharedDriModuleTarget +#define SharedDriModuleTarget(name,deps,solist) @@\ +AllTarget(name) @@\ + @@\ +name: deps @@\ + $(RM) $@~ $@.map @@\ + @(echo 'DRI_MODULE { global: __dri*; local: *; };' > $@.map) @@\ + $(CC) -o $@~ -Wl,--version-script=$@.map $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) BaseShLibReqs @@\ + $(RM) $@ $@.map @@\ + $(MV) $@~ $@ @@\ + @@\ +clean:: @@\ + $(RM) name @@\ + $(RM) name.map + +#endif /* SharedDriModuleTarget */ + /* * SharedLibraryDataTarget - generate rules to create shlib data file; */ diff --git a/xc/config/cf/lnxLib.tmpl b/xc/config/cf/lnxLib.tmpl index 6f4a9d42d..6c96a47c0 100644 --- a/xc/config/cf/lnxLib.tmpl +++ b/xc/config/cf/lnxLib.tmpl @@ -1,5 +1,5 @@ -XCOMM $TOG: lnxLib.tmpl /main/7 1998/03/20 14:26:41 mgreess $ -XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.12 1999/06/27 14:07:17 dawes Exp $ +XCOMM $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.13 2001/01/17 16:22:32 dawes Exp $ /* * Linux shared library template diff --git a/xc/config/cf/luna.cf b/xc/config/cf/luna.cf index cb5d99c9d..1960d4970 100644 --- a/xc/config/cf/luna.cf +++ b/xc/config/cf/luna.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: luna.cf /main/35 1996/09/28 16:11:11 rws $ +XCOMM platform: $Xorg: luna.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ /* * Please set the values for OSMajorVerion and OSMinorVersion * before making makefiles. diff --git a/xc/config/cf/lynx.cf b/xc/config/cf/lynx.cf index fde307624..7e5c4c55e 100644 --- a/xc/config/cf/lynx.cf +++ b/xc/config/cf/lynx.cf @@ -1,4 +1,9 @@ -XCOMM platform: $XFree86: xc/config/cf/lynx.cf,v 3.40 2000/12/14 17:13:05 dawes Exp $ +XCOMM $Xorg: lynx.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ + + + + +XCOMM platform: $XFree86: xc/config/cf/lynx.cf,v 3.42 2001/01/23 23:31:49 dawes Exp $ #ifndef OSName @@ -284,16 +289,18 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #define InstallManPageLong(file,destdir,dest) @@\ BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\ @@\ -install.man:: file.man @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ +install.man:: file.$(MANNEWSUFFIX) @@\ MakeDir($(DESTDIR)destdir) @@\ $(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)* @@\ - groff -e -t -man -Tascii file.man >/tmp/file.man @@\ + groff -e -t -man -Tascii file.$(MANNEWSUFFIX) >/tmp/file.man @@\ $(INSTALL) -c $(INSTMANFLAGS) /tmp/file.man $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\ echo dest dest $(MANSUFFIX) >> $(DESTDIR)destdir/LIST$(MANSUFFIX) @@\ gawk ' \ @@\ /^\.SH[ ]*NAME/ { \ @@\ getline; sub("\\\\", "(" p ") "); print; exit \ @@\ - }' p=$(MANSUFFIX) file.man >> $(DESTDIR)destdir/../whatis @@\ + }' p=$(MANSUFFIX) file.$(MANNEWSUFFIX) >> $(DESTDIR)destdir/../whatis @@\ $(RM) /tmp/file.man #endif @@ -301,6 +308,8 @@ install.man:: file.man @@\ #define InstallManPageAliases(file,destdir,aliases) @@\ InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\ @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ install.man:: @@\ @(SUFFIX=`echo $(DESTDIR)destdir/file.* | cut -f2,3 -d.`; \ @@\ for i in aliases; do (set -x; \ @@\ @@ -315,16 +324,18 @@ install.man:: @@\ #define InstallGenManPageLong(file,destdir,dest,suffix) @@\ BuildInstallHtmlManPage(file,dest,suffix) @@\ @@\ -install.man:: file.man @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ +install.man:: file.$(MANNEWSUFFIX) @@\ MakeDir($(DESTDIR)destdir) @@\ $(RM) $(DESTDIR)destdir/dest.suffix* @@\ - groff -e -t -man -Tascii file.man >/tmp/file.man @@\ + groff -e -t -man -Tascii file.$(MANNEWSUFFIX) >/tmp/file.man @@\ $(INSTALL) -c $(INSTMANFLAGS) /tmp/file.man $(DESTDIR)destdir/dest.suffix @@\ echo dest dest suffix >> $(DESTDIR)destdir/Concat(LIST,suffix) @@\ gawk ' \ @@\ /^\.SH[ ]*NAME/ { \ @@\ getline; sub("\\\\", "(" p ") "); print; exit \ @@\ - }' p=suffix file.man >> $(DESTDIR)destdir/../whatis @@\ + }' p=suffix file.$(MANNEWSUFFIX) >> $(DESTDIR)destdir/../whatis @@\ $(RM) /tmp/file.man #endif diff --git a/xc/config/cf/macII.cf b/xc/config/cf/macII.cf index 90d1c86b7..b6d867384 100644 --- a/xc/config/cf/macII.cf +++ b/xc/config/cf/macII.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: macII.cf /main/50 1996/09/28 16:11:19 rws $ +XCOMM platform: $Xorg: macII.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ #ifndef OSName #define OSName A/UX 3.0.1 diff --git a/xc/config/cf/mach.cf b/xc/config/cf/mach.cf index 014b94015..cbc7f1d2b 100644 --- a/xc/config/cf/mach.cf +++ b/xc/config/cf/mach.cf @@ -1,8 +1,8 @@ -XCOMM $TOG: mach.cf /main/2 1997/06/08 20:08:20 kaleb $ +XCOMM $Xorg: mach.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -XCOMM platform: $XFree86: xc/config/cf/mach.cf,v 3.11 2000/07/07 20:06:56 tsi Exp $ +XCOMM platform: $XFree86: xc/config/cf/mach.cf,v 3.12 2001/01/17 16:22:32 dawes Exp $ #define OSName Mach 2.5/3.0 #define OSVendor /**/ diff --git a/xc/config/cf/minix.cf b/xc/config/cf/minix.cf index 167f00981..ff77d0e78 100644 --- a/xc/config/cf/minix.cf +++ b/xc/config/cf/minix.cf @@ -1,8 +1,8 @@ -XCOMM $XConsortium: minix.cf /main/1 1996/10/31 14:47:22 kaleb $ +XCOMM $Xorg: minix.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -XCOMM platform: $XFree86: xc/config/cf/minix.cf,v 3.5 1999/07/10 07:24:33 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/minix.cf,v 3.6 2001/01/17 16:22:32 dawes Exp $ /* diff --git a/xc/config/cf/moto.cf b/xc/config/cf/moto.cf index d6243a6ca..b43295932 100644 --- a/xc/config/cf/moto.cf +++ b/xc/config/cf/moto.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: moto.cf /main/16 1996/09/28 16:11:24 rws $ +XCOMM platform: $Xorg: moto.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ #if defined(MotoR3Architecture) diff --git a/xc/config/cf/ncr.cf b/xc/config/cf/ncr.cf index 61279d3fa..a59238e66 100644 --- a/xc/config/cf/ncr.cf +++ b/xc/config/cf/ncr.cf @@ -1,5 +1,9 @@ -XCOMM platform: $XConsortium: ncr.cf /main/28 1996/09/28 16:11:31 rws $ -XCOMM platform: $XFree86: xc/config/cf/ncr.cf,v 3.18 1996/12/27 06:50:22 dawes Exp $ +XCOMM platform: $Xorg: ncr.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ + + + + +XCOMM platform: $XFree86: xc/config/cf/ncr.cf,v 3.21 2001/01/23 23:31:49 dawes Exp $ #ifndef OSName #define OSName Unix System V Release 4/MP-RAS @@ -20,7 +24,9 @@ XCOMM These flags build correctly on SVR4/MP-RAS 3.0. If building on XCOMM SVR4/MP-RAS 2.X, you must add -DWINTCP to StandardDefines XCOMM #define StandardDefines -DSVR4 -DNCR -Di386 +#ifndef DefaultCCOptions #define DefaultCCOptions -Xa -Hnocopyr -W0,-asm +#endif #define DefaultCDebugFlags -O3 #define AllocateLocalDefines -DINCLUDE_ALLOCA_H #define ServerExtraDefines -DNO_SECONDARY AllocateLocalDefines XFree86ServerDefines @@ -70,20 +76,20 @@ XCOMM #define ExtensionOSDefines -DXTESTEXT1 * imake rules. */ #define InstallManPageLong(file,destdir,dest) @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ all:: file.z @@\ @@\ -file.z:: file.man @@\ - @if [ -f file.man ]; \ @@\ +file.z:: file.$(MANNEWSUFFIX) @@\ + @if [ -f file.$(MANNEWSUFFIX) ]; \ @@\ then \ @@\ - cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@\ + cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@\ $(RM) /tmp/$$$$.man.z; \ @@\ pack -f /tmp/$$$$.man; \ @@\ cp /tmp/$$$$.man.z file.z; \ @@\ $(RM) /tmp/$$$$.man.z; \ @@\ fi @@\ @@\ -file.man:: @@\ - @@\ install.man:: @@\ MakeDir($(DESTDIR)destdir) @@\ -@if [ -f file.z ]; \ @@\ diff --git a/xc/config/cf/nec.cf b/xc/config/cf/nec.cf index 364dfcdc4..8fb072ff7 100644 --- a/xc/config/cf/nec.cf +++ b/xc/config/cf/nec.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: nec.cf /main/4 1996/09/28 16:11:37 rws $ +XCOMM platform: $Xorg: nec.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ #ifdef nec_ews_svr2 # define NecCISCArchitecture diff --git a/xc/config/cf/necLib.rules b/xc/config/cf/necLib.rules index 992416702..f01d60c93 100644 --- a/xc/config/cf/necLib.rules +++ b/xc/config/cf/necLib.rules @@ -1,10 +1,10 @@ -XCOMM $XConsortium: necLib.rules /main/4 1996/09/28 16:11:42 rws $ +XCOMM $Xorg: necLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /* * NECOS shared library rules */ -XCOMM $XFree86: xc/config/cf/necLib.rules,v 1.2 1999/01/11 05:13:07 dawes Exp $ +XCOMM $XFree86: xc/config/cf/necLib.rules,v 1.3 2001/01/17 16:22:32 dawes Exp $ #ifndef HasSharedLibraries #define HasSharedLibraries YES diff --git a/xc/config/cf/necLib.tmpl b/xc/config/cf/necLib.tmpl index 2e7f04b05..e586af01b 100644 --- a/xc/config/cf/necLib.tmpl +++ b/xc/config/cf/necLib.tmpl @@ -1,4 +1,4 @@ -XCOMM $XConsortium: necLib.tmpl,v 1.1 94/03/26 18:15:22 rws Exp $ +XCOMM $Xorg: necLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /* * NEC shared library template diff --git a/xc/config/cf/oldlib.rules b/xc/config/cf/oldlib.rules index 52faa69eb..3ee19eb79 100644 --- a/xc/config/cf/oldlib.rules +++ b/xc/config/cf/oldlib.rules @@ -1,6 +1,6 @@ /* You should not use these any more, use new Library.tmpl insead */ -XCOMM $XConsortium: oldlib.rules,v 1.2 91/04/09 19:15:13 rws Exp $ +XCOMM $Xorg: oldlib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /* * ProfiledLibraryObjectRule - generate make rules to build both profiled diff --git a/xc/config/cf/os2.cf b/xc/config/cf/os2.cf index a420663e4..e123328db 100644 --- a/xc/config/cf/os2.cf +++ b/xc/config/cf/os2.cf @@ -1,8 +1,8 @@ -XCOMM $TOG: os2.cf /main/2 1997/08/05 08:51:25 kaleb $ +XCOMM $Xorg: os2.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM platform: $XFree86: xc/config/cf/os2.cf,v 3.31 2000/11/30 23:29:57 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/os2.cf,v 3.33 2001/01/17 16:22:32 dawes Exp $ #define OSName OS/2 #define OSVendor IBM @@ -236,11 +236,6 @@ _NULLCMD_ = @ rem # define ExtraFilesToClean *.~* *.exe *.dll *.obj *.lib *.map #endif -#if CompressManPages -#define CompressManCmd gzip -n - COMPRESSMANCMD = CompressManCmd -#endif - #define ProgramTargetName(target)target.exe /* we don't name libraries lib*.a */ diff --git a/xc/config/cf/os2.rules b/xc/config/cf/os2.rules index 8d28329bd..856acdcef 100644 --- a/xc/config/cf/os2.rules +++ b/xc/config/cf/os2.rules @@ -1,8 +1,8 @@ -XCOMM $XConsortium: os2.rules /main/1 1996/10/31 14:47:27 kaleb $ +XCOMM $Xorg: os2.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM platform: $XFree86: xc/config/cf/os2.rules,v 3.21 2000/04/05 18:13:09 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/os2.rules,v 3.22 2001/01/17 16:22:32 dawes Exp $ .SUFFIXES: .Osuf .c .CCsuf diff --git a/xc/config/cf/os2Lib.rules b/xc/config/cf/os2Lib.rules index 00c517893..acbbb13a5 100644 --- a/xc/config/cf/os2Lib.rules +++ b/xc/config/cf/os2Lib.rules @@ -1,8 +1,8 @@ -XCOMM $XConsortium: os2Lib.rules /main/1 1996/10/31 14:47:29 kaleb $ +XCOMM $Xorg: os2Lib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/os2Lib.rules,v 3.11 2000/04/05 18:13:09 dawes Exp $ +XCOMM $XFree86: xc/config/cf/os2Lib.rules,v 3.12 2001/01/17 16:22:32 dawes Exp $ /* * OS2/EMX shared library rules (DLL version) diff --git a/xc/config/cf/os2Lib.tmpl b/xc/config/cf/os2Lib.tmpl index b4d6852ee..c8d56f56a 100644 --- a/xc/config/cf/os2Lib.tmpl +++ b/xc/config/cf/os2Lib.tmpl @@ -1,8 +1,8 @@ -XCOMM $XConsortium: os2Lib.tmpl /main/1 1996/10/31 14:47:31 kaleb $ +XCOMM $Xorg: os2Lib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.10 2000/08/09 02:57:20 tsi Exp $ +XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.11 2001/01/17 16:22:32 dawes Exp $ /* * OS2/EMX shared library template diff --git a/xc/config/cf/osf1.cf b/xc/config/cf/osf1.cf index f976df7f0..b731d9e51 100644 --- a/xc/config/cf/osf1.cf +++ b/xc/config/cf/osf1.cf @@ -1,4 +1,4 @@ -XCOMM platform: $TOG: osf1.cf /main/74 1997/05/27 15:51:24 kaleb $ +XCOMM platform: $Xorg: osf1.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /* only tested with Digital OSF/1 */ #ifndef OSName @@ -35,6 +35,9 @@ XCOMM operating system: OSName (OSMajorVersion.OSMinorVersion) #define ShLibDir /usr/shlib #define SharedLibPex NO /* losing, no shared -lm */ #endif + +#define InstallXloadSetGID NO + #define ThreadedX ModernOSF1 #if ThreadedX diff --git a/xc/config/cf/osfLib.rules b/xc/config/cf/osfLib.rules index 24e3a622a..71a2d6926 100644 --- a/xc/config/cf/osfLib.rules +++ b/xc/config/cf/osfLib.rules @@ -1,10 +1,10 @@ -XCOMM $XConsortium: osfLib.rules /main/16 1996/09/28 16:11:55 rws $ +XCOMM $Xorg: osfLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /* * OSF/1 shared library rules */ -XCOMM $XFree86: xc/config/cf/osfLib.rules,v 1.2 1999/01/11 05:13:08 dawes Exp $ +XCOMM $XFree86: xc/config/cf/osfLib.rules,v 1.3 2001/01/17 16:22:32 dawes Exp $ #ifndef HasSharedLibraries #define HasSharedLibraries YES diff --git a/xc/config/cf/osfLib.tmpl b/xc/config/cf/osfLib.tmpl index 4e2867fb5..52a18f378 100644 --- a/xc/config/cf/osfLib.tmpl +++ b/xc/config/cf/osfLib.tmpl @@ -1,10 +1,10 @@ -XCOMM $XConsortium: osfLib.tmpl /main/22 1996/09/28 16:12:00 rws $ +XCOMM $Xorg: osfLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /* * OSF/1 shared library template */ -XCOMM $XFree86: xc/config/cf/osfLib.tmpl,v 1.2 1999/01/11 14:40:01 dawes Exp $ +XCOMM $XFree86: xc/config/cf/osfLib.tmpl,v 1.3 2001/01/17 16:22:33 dawes Exp $ #if ThreadedX && ModernOSF1 #if OSMajorVersion < 4 diff --git a/xc/config/cf/pegasus.cf b/xc/config/cf/pegasus.cf index 507effabc..0a6f53a37 100644 --- a/xc/config/cf/pegasus.cf +++ b/xc/config/cf/pegasus.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: pegasus.cf /main/38 1996/09/28 16:12:05 rws $ +XCOMM platform: $Xorg: pegasus.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ #ifndef OSName #define OSName UTek 4.0 diff --git a/xc/config/cf/sco.cf b/xc/config/cf/sco.cf index 81b9131a6..1db678f4a 100644 --- a/xc/config/cf/sco.cf +++ b/xc/config/cf/sco.cf @@ -1,5 +1,5 @@ -XCOMM platform: $XConsortium: sco.cf /main/5 1996/12/04 10:12:36 swick $ -XCOMM platform: $XFree86: xc/config/cf/sco.cf,v 3.13 1997/05/24 13:46:28 dawes Exp $ +XCOMM platform: $Xorg: sco.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ +XCOMM platform: $XFree86: xc/config/cf/sco.cf,v 3.14 2001/01/17 16:22:33 dawes Exp $ /* * This is sco.cf, for SCO Open Server 5.0.2 and SCO UNIX. diff --git a/xc/config/cf/scoLib.rules b/xc/config/cf/scoLib.rules index 55476dd4b..65a2ca3a0 100644 --- a/xc/config/cf/scoLib.rules +++ b/xc/config/cf/scoLib.rules @@ -1,5 +1,5 @@ -XCOMM $XConsortium: scoLib.rules /main/2 1996/09/28 16:12:20 rws $ -XCOMM $XFree86: xc/config/cf/scoLib.rules,v 1.5 1999/10/13 04:20:42 dawes Exp $ +XCOMM $Xorg: scoLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ +XCOMM $XFree86: xc/config/cf/scoLib.rules,v 1.6 2001/01/17 16:22:33 dawes Exp $ /* * SharedLibraryTarget3 - generate rules to create a shared library; diff --git a/xc/config/cf/sequent.cf b/xc/config/cf/sequent.cf index be7db5f02..61deea47e 100644 --- a/xc/config/cf/sequent.cf +++ b/xc/config/cf/sequent.cf @@ -1,84 +1,448 @@ -XCOMM platform: $XConsortium: sequent.cf /main/4 1996/12/04 10:10:49 swick $ +XCOMM platform: $XConsortium: sequent.cf$ + /* * SET VERSION NUMBERS BEFORE MAKING MAKEFILES; also, you'll need to install * util/scripts/bsdinstall.sh before doing a "make install" */ -#if defined(DynixPtxArchitecture) || defined(_SEQUENT_) +/* + * Version numbers are set one of two ways: + * + * If the target version is different than the machine you are building on, + * set the target versions using the environmental variable IMAKEINCLUDES. + * Example: IMAKEINCLUDES="-I. -DOSMajorVersion=4 -DOSMinorVersion=4" + * This is usually only done at Sequent when building a product using + * cross compiling tools and target headers and libraries. + * + * Otherwise, the imake will use uname(2) to calculate the default to be + * the same as the machine you are building on. The X11R6 imake will set + * DefaultOS*Version macros to be these default values. + * Those default values will be used in the assignments below. + * This is the recommended method to be used by customers. + */ + + /* defaults from imake via uname(2) */ +#ifndef OSName +#define OSName DefaultOSName +#endif +#ifndef OSMajorVersion +#define OSMajorVersion DefaultOSMajorVersion +#endif +#ifndef OSMinorVersion +#define OSMinorVersion DefaultOSMinorVersion +#endif +#ifndef OSTeenyVersion +#define OSTeenyVersion DefaultOSTeenyVersion +#endif +XCOMM operating system: OSName V/**/OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion + +/* + * Sequent Dynix/PTX 4.x.x (SVR4) and later operating systems. + * + * Sequent Dynix/PTX 4.2.3 and later operating systems are supported with + * the X11R6 sequent.cf and other X11R6 configuration files. + * Specifically 4.4.2 and later have been tested. + * + * Attempting to use these X11R6 configuration files and X11R6 source files + * with early versions of Dynix/PTX 4.x.x may work, however that will not be + * tested or supported at Sequent. + * Sequent Dynix/PTX 2.1.x has been retired so support for it and earlier + * releases has been removed. + */ + +#if OSMajorVersion >= 4 + +#define SystemV4 YES +#define SequentVersionDefines -DSVR4 +#define ExtraLibraries +#define ForceNormalLib YES +#define HasRequiredLibs YES +#define NeedBerklib NO /* gettimeofday in libc */ -# ifndef OSName -# define OSName Dynix/ptx -# endif -# ifndef OSMajorVersion -# define OSMajorVersion 2 -# endif -# ifndef OSMinorVersion -# define OSMinorVersion 0 -# endif +#define XmExtraLibraries /* for ABI-compliance do not use -lgen here */ +#define MotifDefines -DXM_STRINGS_1_2_2_STATE /* code review */ -# define SystemV YES -# define SymbolTableFlags -# define DefaultCCOptions SymbolTableFlags -# define SharedLibraryCCOptions DefaultCCOptions -# define StandardDefines -DSYSV -# define MotifDefines -DSTRINGS_ALIGNED -DNO_REGCOMP -# define ExtraLibraries $(XBSDLIB) -lsocket -linet -lnsl -lseq -# define XmExtraLibraries /* -lgen (not official i386 ABI?) */ +/* initial port does not use multiple socket libs, default libsocket.so.1.1 */ +#define HasMultipleSockets NO /* obsolete */ /* only libsocket.so.1.1 */ -# define NeedBerklib YES -# define HasShadowPasswd YES -# define InstallXdmConfig YES -# define HasSockets YES +#endif /* OSMajorVersion >= 4 */ /* - * Plan to remove Prototypes defines and use -Xc with - * Dynix/ptx: - * OSMajorVersion=4 - * OSMinorVersion=0 - * Using -Xc with Version 4.0 will elliminate most warnings + * Below this line are generic defines that apply to all Sequent systems. + * However they are currently tested with only OSMajorVersion >= 4 */ -# define NeedFunctionPrototypes YES -# define NeedNestedPrototypes YES -# define NeedConstPrototypes YES -# define NeedVarargsPrototypes YES - /* - * unfortunately pbmplus uses this... + * The following cpp macro defines are order independent, + * since the right-hand-side is constant. + * Therefore these are simply listed in alphabetical order. + * Macros defined later may use these definitions. */ -RANLIB = : -#endif /* defined(DynixPtxArchitecture) || defined(_SEQUENT_) */ +/* + * Threads.tmpl cpp macros. + * Sequent overrides the Threads.tmpl defaults with the values below. + * Sequent has native threads for ptx 4.5.0 and higher. + */ -#if defined(Dynix3Architecture) || defined(sequent) +#if ( OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 5) ) -# ifndef OSName -# define OSName Dynix 3 -# endif -# ifndef OSMajorVersion -# define OSMajorVersion 3 -# endif -# ifndef OSMinorVersion -# define OSMinorVersion 2 -# endif +#define HasPosixThreads YES +#define HasThreadSafeAPI YES +#define ThreadedX YES +#define ThreadsLibraries /**/ +#define ThreadsCplusplusLibraries /**/ +#define ThreadPreStdAPIDefines /**/ +#define ThreadsCompileFlags -Kthread +#define ThreadsCplusplusCompileFlags -Kthread +#define SharedThreadReqs /**/ -# define SymbolTableFlags -W0,-Nn7500 -W0,-Nd10000 -# define DefaultCCOptions SymbolTableFlags -# define StandardDefines -DX_NOT_STDC_ENV -DX_NOT_POSIX -# define ExtraLibraries -lseq +/* + * THREADS macro and environment variable used with Sequent commands only. + * We use THREADS rather than the generic X11 THREADS_CFLAGS because we + * want to ensure that the macro is defined for all compiles and not just + * those Makefiles built from a Imakefile that includes Threads.tmpl. + * + * Sequent compiler option -Kthread will also define -D_SEQUENT_THREADS. + * Currently using -Kthread is the recommended interface to this define. + * Currently there are no extra includes files using -D_SEQUENT_THREADS. + * Currently no reason for makedepend or cpp to use -D_SEQUENT_THREADS. + * If needed in the future, we would add to ProjectThreadsDefines + * + * #define ProjectThreadsDefines -DXTHREADS -D_SEQUENT_THREADS + */ + + THREADS = -Kthread + +#endif /* ptx 4.5.0 or greater has threads */ -# define HasVoidSignalReturn NO -# define HasBsearch NO +/* + * Imake.tmpl cpp macros. + * Sequent overrides the Imake.tmpl defaults with the values below. + */ + +#define BuildLibPathVar LD_LIBRARY_PATH +#define DefaultCCOptions -Xa +#define ExpandManNames YES +#define ExtraFilesToClean *.z +#define HasNdbm YES +#define HasShadowPasswd YES +#define HasSockets YES /* default */ +#define HasVarDirectory NO +#ifdef UseInstalled +#define InstallCmd $(BINDIR)/ptxinst -t "$(TOOLS)" +#else +#define InstallCmd $(SHELL) $(SCRIPTSRC)/ptxinst.sh +#endif /* UseInstalled */ +#define InstPgmFlags -s -m 0555 -o bin -g bin +#define InstBinFlags -s -m 0555 -o bin -g bin +#define InstLibFlags -m 0444 -o bin -g bin +#define InstShLibFlags -m 0555 -o bin -g bin +#define Malloc0ReturnsNull YES +#define ManSuffix 1 /* use just one tab or cpp will die */ +#define LibManSuffix 3x /* use just one tab or cpp will die */ +#define LibmanDir $(MANSOURCEPATH)3 +#define MiscManSuffix 5x /* use just one tab or cpp will die */ +#define MiscManDir $(MANSOURCEPATH)5 +#define MkdirHierCmd mkdir -p +#define NeedConstPrototypes YES +#define NeedFunctionPrototypes YES +#define NeedNestedPrototypes YES +#define NeedVarargsPrototypes YES +#define StripInstalledPrograms YES +#define SystemManDirectory /usr/catman +#define TermcapLibrary -lcurses /* code review for SVR4 ? */ +#define TerminfoDir /usr/lib/terminfo /* Sequent addition */ +#define ToolkitStringsABIOptions -intelabi -# define SetTtyGroup YES -#endif /* defined(Dynix3Architecture) || defined(sequent) */ +/* + * X11.tmpl cpp macros. + * Sequent overrides the X11.tmpl defaults with the values below. + */ -#define BuildServer NO -#define BuildXInputLib NO +#define BuildDps YES #define BuildPexClients NO +#define BuildPexExt YES /* needed for contrib xscope */ +#define BuildServer YES +#define BuildXF86DGA NO /* DGA has no meaning on Sequent HW */ +#define BuildXF86MiscExt NO /* turn off the server portion */ +#define BuildXF86VidModeExt NO /* turn off the server portion */ +#define BuildXInputExt YES +#define BuildXKBuilib YES /* override NO set in xfree86.cf */ +#define ConnectionFlags -DTCPCONN +#define DefaultSystemPath /bin:/etc:/usr/bin:$(BINDIR) +#define DefaultUserPath :/bin:/usr/bin:$(BINDIR) +#define HasPlugin YES +#define HasXServer NO +#define InstallFSConfig YES /* safe since we install to DESTDIR */ +#define InstallXdmConfig YES /* safe since we install to DESTDIR */ +#define MotifBC NO /* default, code review from X11R5 */ +#define XdmServersType fs /* One tab here. Needed if BuildServer YES */ +#define XtMalloc0ReturnsNullDefines Malloc0ReturnsNullDefines -DXTMALLOC_BC +#define XprtServer YES +#define XVirtualFramebufferServer YES +#define XF86SVGAServer NO /* Don't build the XFree86 servers */ +#define XF86S3Server NO +#define XF86S3VServer NO +#define XF86I8514Server NO +#define XF86Mach8Server NO +#define XF86Mach32Server NO +#define XF86Mach64Server NO +#define XF86P9000Server NO +#define XF86AGXServer NO +#define XF86I128Server NO +#define XF86GLINTServer NO +#define XF86REALimageServer NO + +/* + * Motif.tmpl cpp macros. + * Sequent overrides the Motif.tmpl default with the values below. + */ + +#define GencatCmd /usr/lbin/gencat + +/* Port Sequent macro DontBuildMotifConfig to Motif 2.1 */ +/* + * #ifndef MetroLink + * #define DontBuildMotifConfig + * #endif + */ + +/* + * Sequent added cpp macros. + * + * The following cpp macro defines have been introduced by Sequent. + * They will be referenced in Sequent patches sent to TOG. + * They may be moved above if accepted by TOG or X.org. + */ + +#define AdminBaseDir /usr/admin.ptx/etc/base.dir +#define MessageCatDir /usr/lib/message/C +#define NeedXinputAlias YES +#define UseHidesymsLists YES +#define XlbiffMailPath /usr/mail/%s /* used by contrib xlbiff */ + +/* + * Imake.tmpl, X11.tmpl, or other order dependent cpp defines. + * + * The following cpp macro defines are order dependent. + * They depend on previously defined cpp macros. + * Do not change the order. + */ +#define SharedLibraryCCOptions DefaultCCOptions +#define StandardDefines SequentVersionDefines -DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion -DANSICPP -DDYNIX_C2 -DMetroLink +#define StandardCppDefines StandardDefines -D_SOCKET_VERSION=11 -DUnixCpp + +#ifdef ProjectRoot +#define ManDirectoryRoot ProjectRoot/**//catman +#else +#define ManDirectoryRoot SystemManDirectory +#endif +#define XmanSearchPath ManDirectoryRoot /* for X11R5 xman */ + +/* + * Sequent configuration environment specific to building X11 and Motif. + * This environment is only available when UseInstalled is not defined. + * Therefore this environment is not used by customers using xmkmf. + */ + +#ifndef UseInstalled + +/* Product builds using local X11 and Motif trees */ + +/* + * Provide libraries needed by nonX programs in the X11 build tree. + * These are not standard so the customer will be forced to add them to their + * Imakefile SYS_LIBRARIES if needed. An ABI program may not want or need them, + * so we do not include them in the ExtraLibraries provided to customers + * when UseInstalled is defined. We add them here as a convenience when + * building the entire X11 tree (at Sequent or the contractor). + */ +#undef ExtraLibraries +#define ExtraLibraries -lsocket -lnsl + +/* + * Sequent builds X11 and Motif in the same tree. + * The Motif project files include the X11 project files. + * + * Later we may use the Local project files similer the the lynx.cf + * + * #define LocalTmplFile <Motif.tmpl> + * #define LocalRulesFile <Motif.rules> + */ + +/* Try the Metro Link method. */ + +#ifndef MetroLink +#undef ProjectTmplFile +#define ProjectTmplFile <Motif.tmpl> +#undef ProjectRulesFile +#define ProjectRulesFile <Motif.rules> +#endif + +/* + * Later change to Metro Link directory layout, + * or allow $(TOP)/../motif21 + */ + +/* Try the Metro Link method. */ + +#ifndef MetroLink +#define MTop $(TOP)/motif21 +#endif + +/* + * Set the Program macros to be correct for the target machine. + * This will avoid using any crosstools as hardwired strings + * built into binaries that will run on the target machine. + * + * These macro names need to be ported from X11R5 to X11R6. + */ +#define ArProgramBase ar +#define CppProgram /lib/cpp +#define CcProgram cc +#define RanlibProgram ranlib + +/* + * Build all the X11 debug libaries *_d.a for use by Sequent Service + */ + +/* + * Set DebugLibDefault YES for Sequent to build all debug libs. + * If we move this to generic code to *.tmpl files, + * use the default code below that sets the default NO + */ + +#define DebugLibDefault NO + +#ifndef DebugLibDefault +#define DebugLibDefault NO +#endif + +#define DebugLibX11 DebugLibDefault /* debugged X library */ +#define DebugLibXext DebugLibDefault /* debugged Xext library */ +#define DebugLibXau DebugLibDefault /* debugged auth library */ +#define DebugLibXdmcp DebugLibDefault /* debugged XDMCP library */ +#define DebugLibXmu DebugLibDefault /* debugged Xmu library */ +#define DebugLibXp DebugLibDefault /* debugged Xp library */ +#define DebugLibXt DebugLibDefault /* debugged toolkit library */ +#define DebugLibXa DebugLibDefault /* debugged audio library */ +#define DebugLibXaw DebugLibDefault /* debugged widget library */ +#define DebugLibXi DebugLibDefault /* debugged Xi library */ +#define DebugLibXtst DebugLibDefault /* debugged Xtst library */ +#define DebugLibPex DebugLibDefault /* debugged PEX5 library */ +#define DebugLibXie DebugLibDefault /* debugged XIE library */ +#define DebugLibICE DebugLibDefault /* debugged ICE library */ +#define DebugLibSM DebugLibDefault /* debugged SM library */ +#define DebugLibXkey DebugLibDefault /* debugged Xkey library */ +#define DebugLibFS DebugLibDefault /* debugged FS library */ + +/* + * Build all the Motif debug libaries *_d.a for use by Service + */ +#define DebugLibXm DebugLibDefault +#define DebugLibMrm DebugLibDefault +#define DebugLibUil DebugLibDefault + +/* + * Build all the Adobe DPS debug libaries *_d.a for use by Service + */ +#define DebugLibDps DebugLibDefault + +#endif /* ! UseInstalled */ + +/* + * Sequent general make macros. + * X11R6.5 should migrate these to Imake.tmpl. + */ + +XCOMM Sequent general make macros. + +#ifndef PackCmd +#define PackCmd pack +#endif + PACK = PackCmd + +/* + * Sequent unique make macros. These will always be unique to Sequent. + * We introduce them here in sequent.cf since cpp macros are set in sequent.cf. + * We may later move them to sequentLib.tmpl. + */ + +XCOMM Sequent unique make macros. + + ADMINBASEDIR = AdminBaseDir + MESSAGECATDIR = MessageCatDir + +/* + * DPS default values (unique to sequent) + */ +#ifndef PswrapCmd +#define PswrapCmd pswrap +#endif + +#ifdef UseHidesymsLists + +#ifndef HidesymsCmd +#define HidesymsCmd /usr/lib/hidesyms/hidesyms +#endif +#ifndef HsAcppCmd +#define HsAcppCmd /lib/acpp +#endif +/* + * When building in the X11 tree. + * For shared libs, hidesyms executes in a subdir. + * For unshared libs, hidesyms executes in a subsubdir. + * Therefore we add both of these to the acpp path: + * ../../$(BUILDINCROOT)/lib/hidesyms:../$(BUILDINCROOT)/lib/hidesyms + */ +#ifndef HsAcppLocalPath +# define HsAcppLocalPath ../../$(BUILDINCROOT)/lib/hidesyms:../$(BUILDINCROOT)/lib/hidesyms +#endif +#ifndef HsAcppSystemPath +# define HsAcppSystemPath /usr/lib/hidesyms +#endif +#ifndef HsAcppPath +# ifdef UseInstalled +# define HsAcppPath HsAcppSystemPath +# else +# define HsAcppPath HsAcppLocalPath:HsAcppSystemPath +# endif /* UseInstalled */ +#endif +/* + * note: -DABI_SHARED_OBJECT requires a temporary fix added to + * Xt/Error.c to provide missing _abi_* routines not in libc.so.1. + * When the base adds those missing _abi_* to libc.so.1, + * then the code in Xt/Error.c can be removed and the corresponding + * symbols added to Xt/libXt.hs can be removed. + */ +#ifndef HsAcppDefines +#define HsAcppDefines -DABI_SHARED_OBJECT -D_SOCKET_VERSION=11 $(THREADS_DEFINES) +#endif + +/* + * For shared libs, hidesyms executes in a subdir, + * therefore we add a -L../$(BUILDLIBDIR) + */ +#ifndef LdPreLib +#ifndef UseInstalled +#define LdPreLib -L$(BUILDLIBDIR) -L../$(BUILDLIBDIR) +#endif +#endif + +XCOMM HIDESYMS is for filtering system library symbols. + + HIDESYMS = HidesymsCmd + HSACPPPATH = HsAcppPath + HSACPPCMD = HsAcppCmd + HSACPPDEFINES = HsAcppDefines + HSACPP = $(HSACPPCMD) -Y $(HSACPPPATH) $(HSACPPDEFINES) + HSCMD = $(HIDESYMS) -z -p "$(HSACPP)" -#define LnCmd ln -s +#endif /* UseHidesymsLists */ -/* libgen is not part of the i386 ABI. (Are both architectures i386??) */ -#define UseLocalRegex YES +#if OSMajorVersion >= 4 +#include <xfree86.cf> +#include <sequentLib.rules> /* include after macros, before Motif.rules */ +#endif /* OSMajorVersion >= 4 */ diff --git a/xc/config/cf/sequentLib.rules b/xc/config/cf/sequentLib.rules new file mode 100644 index 000000000..7f77e3feb --- /dev/null +++ b/xc/config/cf/sequentLib.rules @@ -0,0 +1,323 @@ +XCOMM $Xorg: sequentLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ + +/* + * SVR4 shared library rules + */ + +#ifndef HasSharedLibraries +# define HasSharedLibraries YES +#endif +#ifndef SharedDataSeparation +# define SharedDataSeparation NO +#endif +#ifndef SharedCodeDef +# define SharedCodeDef /**/ +#endif +#ifndef SharedLibraryDef +# define SharedLibraryDef /**/ +#endif +#ifndef ShLibIncludeFile +# define ShLibIncludeFile <sequentLib.tmpl> +#endif +#ifndef SharedLibraryLoadFlags +/* Sequent may need to implement the X11R5 HasMultipleSockets ? */ +# if HasMultipleSockets +# define SharedLibraryLoadFlags -G -z text $(DEFAULTSOCKETLDOPTIONS) +# define ExtraLoadOptions $(DEFAULTSOCKETLDOPTIONS) +# else +/* # define SharedLibraryLoadFlags -G -z text */ +# define SharedLibraryLoadFlags -G +# define ExtraLoadOptions +# endif +#endif +#ifndef PositionIndependentCFlags +# if HasGcc2 +# define PositionIndependentCFlags -fpic +# else +# define PositionIndependentCFlags -K PIC +# endif +#endif +#ifndef PositionIndependentCplusplusFlags +# if HasGcc2ForCplusplus +# define PositionIndependentCplusplusFlags -fpic +# else +# define PositionIndependentCplusplusFlags -K PIC +# endif +#endif +#ifndef UseExportLists +# define UseExportLists NO +#endif +#ifndef UseHidesymsLists +# define UseHidesymsLists NO +#endif + +#if UseHidesymsLists + +#ifndef BuildHidesyms +#define BuildHidesyms(libname) @@\ +includes:: @@\ + MakeDir($(BUILDLIBDIR)/hidesyms) @@\ + @( if [ -f Concat(lib,libname.hs) ]; \ @@\ + then \ @@\ + (set -x; cd $(BUILDLIBDIR)/hidesyms && \ @@\ + RemoveFile(Concat(lib,libname.hs)) && \ @@\ + $(LN) $(BUILDLIBTOP)/../$(CURRENT_DIR)/Concat(lib,libname.hs) .); \ @@\ + fi; ) +#endif /* BuildHidesyms */ + +/* + * InstallHidesyms - install library hidesyms directive file. (Sequent only) + * Logic cloned from InstallNonExecFile. + * We do not list the hidesyms directive file as a dependency since it + * may not exist. + */ +#ifndef InstallHidesyms +#define InstallHidesyms(libname) @@\ +install:: @@\ + MakeDir($(DESTDIR)/usr/lib/hidesyms) @@\ + @( if [ -f Concat(lib,libname.hs) ]; then \ @@\ + $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) Concat(lib,libname.hs) $(DESTDIR)/usr/lib/hidesyms; fi; ) +#endif /* InstallHidesyms */ + +/* + * InstallLibrary - generate rules to install the indicated library. + * + * Sequent includes an extra "install::" target to install hidesyms files + * and an extra "includes::" target to export library hidesyms files. + * Therefore whenever InstallLibrary is expanded the hidesyms targets + * will also be expanded. This avoids changes to generic cf *.tmpl files. + */ +#ifndef InstallLibrary +#define InstallLibrary(libname,dest) @@\ +install:: LibraryTargetName(libname) @@\ + MakeDir($(DESTDIR)dest) @@\ + $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) LibraryTargetName(libname) $(DESTDIR)dest @@\ + RanLibrary($(RANLIBINSTFLAGS) $(DESTDIR)dest/LibraryTargetName(libname)) @@\ + @@\ +InstallHidesyms(libname) @@\ + @@\ +BuildHidesyms(libname) +#endif /* InstallLibrary */ + +/* + * Sequent additions to MakeLibrary for filtering objects + * with hidesyms before making a normal archive library. + */ + +#ifndef MakeLibrary +#define MakeLibrary(libname,objlist) ( $(RM) -r tmp_hs ; \ @@\ + LIBNAME_HS=`dirname libname`/`basename libname .a`.hs ; \ @@\ + (if [ -f $$LIBNAME_HS ]; \ @@\ + then \ @@\ + LIBNAME_AR=../libname; \ @@\ + $(MKDIRHIER) tmp_hs && \ @@\ + $(CP) *.o tmp_hs && \ @@\ + cd tmp_hs && \ @@\ + $(HSCMD) -i ../$$LIBNAME_HS *.o ; \ @@\ + else \ @@\ + LIBNAME_AR=libname; \ @@\ + fi; \ @@\ + $(AR) $$LIBNAME_AR objlist ) ;\ @@\ + $(RM) -r tmp_hs ) +#endif + +#endif /* UseHidesymsLists */ + +/* + * InstallSharedLibrary - generate rules to install the shared library. + */ +#ifndef InstallSharedLibrary +# define InstallSharedLibrary(libname,rev,dest) @@\ +install:: Concat(lib,libname.so.rev) @@\ + MakeDir($(DESTDIR)dest) @@\ + $(INSTALL) $(INSTALLFLAGS) $(INSTSHLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\ + $(RM) Concat($(DESTDIR)dest/lib,libname.so) @@\ + $(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so) +#endif /* InstallSharedLibrary */ + +/* + * InstallSharedLibraryData - generate rules to install the shared library data + */ +#ifndef InstallSharedLibraryData +# define InstallSharedLibraryData(libname,rev,dest) +#endif /* InstallSharedLibraryData */ + +#ifndef LinkWithExports +# if UseHidesymsLists +# define LinkWithExports(libname,rev,solist,down,up) \ + $(RM) -r tmp_hs @@\ + ( if [ -f Concat(lib,libname.hs) ]; \ @@\ + then \ @@\ + LIBNAME_SO=../$@~; \ @@\ + mkdir tmp_hs; \ @@\ + cd down; \ @@\ + $(CP) *.o up/tmp_hs && \ @@\ + cd up/tmp_hs && \ @@\ + $(HSCMD) -i ../Concat(lib,libname.hs) *.o; \ @@\ + else \ @@\ + LIBNAME_SO=up/$@~; \ @@\ + cd down; \ @@\ + fi; \ @@\ + $(CCENVSETUP) $(LD) -o $$LIBNAME_SO $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS) ) @@\ + $(RM) -r tmp_hs +# else +# if UseExportLists +# define LinkWithExports(libname,rev,solist,down,up) \ + (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS)) @@\ + if [ -f Concat(lib,libname.elist) ]; then \ @@\ + $(RM) down/$@.exports $@.list; \ @@\ + $(CPP) $(ALLINCLUDES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) Concat(lib,libname.elist) | CppSedMagic >$@.list; \ @@\ + $(EXPORTLISTGEN) $@~ $@.list > down/$@.exports; \ @@\ + (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ ShlibExportListOpt($@.exports) solist $(REQUIREDLIBS)); \ @@\ + $(RM) down/$@.exports $@.list; \ @@\ + fi; +# else +# define LinkWithExports(libname,rev,solist,down,up) \ + (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS)) +# endif /* UseExportLists */ +# endif /* UseHidesymsLists */ +#endif + +/* + * SharedLibraryTarget - generate rules to create a shared library; + * build it into a different name so that we do not hose people by having + * the library gone for long periods. + */ +#ifndef SharedLibraryTarget +# define SharedLibraryTarget(libname,rev,solist,down,up) @@\ +AllTarget(Concat(lib,libname.so.rev)) @@\ + @@\ +Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\ + $(RM) $@~ @@\ + LinkWithExports(libname,rev,solist,down,up) @@\ + $(RM) $@ @@\ + $(MV) $@~ $@ @@\ + $(RM) Concat(lib,libname.so) @@\ + $(LN) $@ Concat(lib,libname.so) @@\ + LinkBuildLibrary($@) @@\ + LinkBuildLibrary(Concat(lib,libname.so)) @@\ + @@\ +clean:: @@\ + $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) + +#endif /* SharedLibraryTarget */ + +/* + * SharedLibraryDataTarget - generate rules to create shlib data file; + */ +#ifndef SharedLibraryDataTarget +# define SharedLibraryDataTarget(libname,rev,salist) +#endif /* SharedLibraryTarget */ + +/* + * Sequent does not use the InstallManPageAliases rule. + * Sequent customer installation procedure uses makealiases(1M) + * after the initial product manpages are installed in system directories. + */ +#define InstallManPageAliases(file,destdir,aliases) /* use makealiases(1M) */ + +/* + * Man pages need to be formatted when installed, so override the default + * imake rules. + */ +#if defined(UseInstalled) +MANCAT = cat +#else +MANCAT = sed -f $(CONFIGSRC)/util/installman.sed +#endif + +#define InstallManPageLong(file,destdir,dest) @@\ +all:: file.$(MANSUFFIX).z @@\ + @@\ +file.$(MANSUFFIX).z:: file.man @@\ + @if [ -f file.man ]; \ @@\ + then \ @@\ + $(MANCAT) file.man | $(NEQN) | \ @@\ + $(TBL) | $(NROFF) $(MANMACROS) | $(COL) > file.$(MANSUFFIX); \ @@\ + $(RM) file.$(MANSUFFIX).z; \ @@\ + $(PACK) -f file.$(MANSUFFIX); \ @@\ + fi @@\ + @@\ +file.man:: @@\ + @@\ +install.man:: @@\ + MakeDir($(DESTDIR)destdir) @@\ + @if [ -f file.$(MANSUFFIX).z ]; \ @@\ + then \ @@\ + $(INSTALL) -c $(INSTMANFLAGS) file.$(MANSUFFIX).z $(DESTDIR)destdir/dest.$(MANSUFFIX).z; \@@\ + fi + +#define InstallMultipleManSuffix(list,dest,suff) @@\ +install.man:: @@\ + MakeDir($(DESTDIR)dest) @@\ + MakeFlagsToShellFlags(i,set +e); \ @@\ + @for i in list; do \ @@\ + (set -x; \ @@\ + $(MANCAT) $$i.suff | $(NEQN) | \ @@\ + $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$i.suff; \ @@\ + $(PACK) -f /tmp/$$i.suff; \ @@\ + $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$i.suff.z $(DESTDIR)dest/$$i.$(MANSUFFIX).z; \ @@\ + $(RM) /tmp/$$i.suff.z); \ @@\ + done + +#define InstallMultipleMan(list,dest) @@\ + InstallMultipleManSuffix(list,dest,man) + +/* + * InstallMotifManPage relies on the fact that all the + * Imakefiles where it is used (or Makefile default value) + * will correctly define MANSUFFIX which may be + * either "section" or "section"x. + * Since we rely on MANSUFFIX being defined correctly in each Makefile + * we can also rely on MANDIR = $(MANSOURCEPATH)section + * + * CAUTION: + * The source file "file.section" may have the same name as + * the target file "file.$(MANSUFFIX)" so we must use temporary files + * so that we do not overwrite "file.section". + */ +#define InstallMotifManPage(file,section) @@\ +all:: file.$(MANSUFFIX).z @@\ + @@\ +file.$(MANSUFFIX).z: file.section @@\ + @$(MANCAT) file.section | $(NEQN) | \ @@\ + $(TBL) | $(NROFF) $(MANMACROS) | $(COL) > /tmp/file.man; \ @@\ + $(RM) /tmp/file.man.z; \ @@\ + $(PACK) -f /tmp/file.man; \ @@\ + $(CP) /tmp/file.man.z file.$(MANSUFFIX).z; \ @@\ + $(RM) /tmp/file.man.z @@\ + @@\ +install.man:: file.$(MANSUFFIX).z @@\ + MakeDir($(DESTDIR)$(MANDIR)) @@\ + $(INSTALL) -c $(INSTMANFLAGS) file.$(MANSUFFIX).z $(DESTDIR)$(MANDIR)/file.$(MANSUFFIX).z + +/* + * The Real_MessageCatalogRule defined in Motif.rules does not + * install the generated catalog file. This rule adds an install + * clause to do that. + */ +#define Real_MessageCatalogRule(prefix) @@\ +prefix.cat Concat(prefix,MsgCatI.h): @@\ + $(RM) Concat(prefix,MsgCatI.h) prefix.cat $(MLOCSRC)/C/msg/prefix.msg @@\ + $(MKCATTOOL) Concat(prefix,MsgCatI.h) prefix.msg > $(MLOCSRC)/C/msg/prefix.msg @@\ + $(GENCAT) prefix.cat $(MLOCSRC)/C/msg/prefix.msg @@\ + @@\ +includes:: prefix.cat Concat(prefix,MsgCatI.h) @@\ + @@\ +depend:: prefix.cat Concat(prefix,MsgCatI.h) @@\ + @@\ +all:: prefix.cat @@\ + @@\ +install:: prefix.cat @@\ + MakeDir($(DESTDIR)$(MESSAGECATDIR)) @@\ + $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) prefix.cat $(DESTDIR)$(MESSAGECATDIR)/prefix.cat @@\ + $(RM) $(DESTDIR)$(MESSAGECATDIR)/prefix @@\ + $(LN) prefix.cat $(DESTDIR)$(MESSAGECATDIR)/prefix @@\ + MakeDir($(DESTDIR)$(NLSDIR)) @@\ + $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) prefix.cat $(DESTDIR)$(NLSDIR)/prefix.cat @@\ + $(RM) $(DESTDIR)$(NLSDIR)/prefix @@\ + $(LN) prefix.cat $(DESTDIR)$(NLSDIR)/prefix @@\ + @@\ +clean:: @@\ + $(RM) prefix.cat Concat(prefix,MsgCatI.h) + diff --git a/xc/config/cf/sgi.cf b/xc/config/cf/sgi.cf index fb0df8008..03f6c16f3 100644 --- a/xc/config/cf/sgi.cf +++ b/xc/config/cf/sgi.cf @@ -1,5 +1,5 @@ -XCOMM platform: $TOG: sgi.cf /main/49 1998/02/26 09:12:19 barstow $ -XCOMM $XFree86: xc/config/cf/sgi.cf,v 1.8 1999/06/06 15:36:03 dawes Exp $ +XCOMM platform: $Xorg: sgi.cf,v 1.4 2000/08/17 19:41:48 cpqbld Exp $ +XCOMM $XFree86: xc/config/cf/sgi.cf,v 1.9 2001/01/17 16:22:33 dawes Exp $ #ifndef OSName # define OSName DefaultOSName @@ -161,7 +161,7 @@ XCOMM operating system: OSName (OSMajorVersion.OSMinorVersion.OSTeenyVersion) #define ConstructMFLAGS NO /* build MFLAGS from MAKEFLAGS */ /* Used only for compressed fonts */ -#define UNCOMPRESSPATH /usr/bsd/uncompress +#define UNCOMPRESSPATH /usr/bsd/uncompress /* obsolete */ /* Normally used only to conditionally chose the default font path order */ #define PrimaryScreenResolution 96 diff --git a/xc/config/cf/sgiLib.rules b/xc/config/cf/sgiLib.rules index 27cdfcd6d..e9e575d88 100644 --- a/xc/config/cf/sgiLib.rules +++ b/xc/config/cf/sgiLib.rules @@ -1,5 +1,5 @@ -XCOMM $XConsortium: sgiLib.rules /main/16 1996/09/28 18:11:04 rws $ -XCOMM $XFree86: xc/config/cf/sgiLib.rules,v 1.3 2000/06/15 20:49:56 dawes Exp $ +XCOMM $Xorg: sgiLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ +XCOMM $XFree86: xc/config/cf/sgiLib.rules,v 1.4 2001/01/17 16:22:33 dawes Exp $ #ifndef HasSharedLibraries #define HasSharedLibraries YES diff --git a/xc/config/cf/sgiLib.tmpl b/xc/config/cf/sgiLib.tmpl index a9c28f62e..bf642f26e 100644 --- a/xc/config/cf/sgiLib.tmpl +++ b/xc/config/cf/sgiLib.tmpl @@ -1,4 +1,4 @@ -XCOMM $XConsortium: sgiLib.tmpl /main/2 1996/09/28 16:12:44 rws $ +XCOMM $Xorg: sgiLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /* * SGI shared library template diff --git a/xc/config/cf/site.sample b/xc/config/cf/site.sample new file mode 100644 index 000000000..1ced85a07 --- /dev/null +++ b/xc/config/cf/site.sample @@ -0,0 +1,125 @@ +XCOMM site: $Xorg: site.sample,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ + +/*************************************************************************** + * * + * SITE-SPECIFIC DEFINITIONS * + * * + * This file contains two halves, one included before the vendor-specific * + * configuration file (.cf file), and one included after the .cf file. * + * The before-half should be protected by #ifdef BeforeVendorCF, and the * + * after-half should be protected by #ifdef AfterVendorCF. * + * * + * The before-half should only set things that the .cf file depends on. * + * For the .cf files shipped in this release, the main variables in this * + * category are HasGcc, HasGcc2, HasCplusplus, OSMajorVersion, * + * OSMinorVersion, and OSTeenyVersion. * + * * + * The after-half should contain all other definitions. For example, * + * place your ProjectRoot definition here. * + * * + * OS Major and Minor version numbers should be changed directly in the * + * .cf file, not overridden in site.def. * + * * + ***************************************************************************/ + +/* if you want host-specific customization, this is one way to do it */ +/* +#ifndef SiteIConfigFiles +#define SiteIConfigFiles $(IRULESRC)/host.def +#define LocalConfigFiles host.def +#endif +*/ + + +#ifdef BeforeVendorCF + +/* #include <host.def> */ + +/* On systems where cpp doesn't expand correctly macros in include directives + * the two following macros need to be defined directly (where "X11" is + * really whatever the TopLevelProject macro is defined to be). + */ +# if defined(AIXArchitecture) || defined(SVR4Architecture) || \ + defined(SCOArchitecture) || defined(Win32Architecture) || \ + defined(UXPArchitecture) || defined(SunArchitecture) +# ifndef ProjectRulesFile +# define ProjectRulesFile <X11.rules> +# endif +# ifndef ProjectTmplFile +# define ProjectTmplFile <X11.tmpl> +# endif +# endif + +/* +#ifndef HasGcc2 +#define HasGcc2 YES +#endif +*/ + +#endif /* BeforeVendorCF */ + +#ifdef AfterVendorCF + +#define ProjectRoot /usr/X11R6.4 + +/* Only set HasXdmAuth to YES if you have a Wraphelp.c file. */ +/* #define HasXdmAuth YES */ + +/* +#if defined(SunArchitecture) && defined(SparcArchitecture) +#define HasCodeCenter YES +#ifndef SVR4Architecture +#define HasTestCenter YES +#endif +#endif +*/ + +/* +#ifdef __hp9000s800 +#define HasCodeCenter YES +#endif +*/ + +/* +#if defined(SunArchitecture) && defined(SparcArchitecture) && !defined(SVR4Architecture) +#define HasPurify YES +#endif +*/ + +/* +#define HasSentinel YES +*/ + +/* +#undef DefaultUserPath +#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin +*/ + + +/* You do NOT need SetUID if you only run the server under xdm */ +/* You MAY need SetUID if users run the server by hand or under xinit */ +/* Consult your system administrator before making the X server setuid */ +/* +#if defined(SunArchitecture) && OSMajorVersion > 4 +#define InstallXserverSetUID YES +#endif +*/ + +/* You do NOT need SetUID if you only run the server under xdm */ +/* You MAY need SetUID if users run the server by hand or under xinit */ +/* Consult your system administrator before making the X server setuid */ +/* +#ifdef XFree86Version +#define InstallXserverSetUID YES +#endif +*/ + +#ifndef XnestServer +#undef BuildServer +#define BuildServer YES +#define XnestServer YES +#endif + +/* #include <host.def> */ + +#endif /* AfterVendorCF */ diff --git a/xc/config/cf/sony.cf b/xc/config/cf/sony.cf index 02821b36a..6f40178c3 100644 --- a/xc/config/cf/sony.cf +++ b/xc/config/cf/sony.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: sony.cf /main/69 1996/09/29 18:19:36 kaleb $ +XCOMM platform: $Xorg: sony.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ #ifdef SonyBsdArchitecture diff --git a/xc/config/cf/sun.cf b/xc/config/cf/sun.cf index a9892e588..f8fda7124 100644 --- a/xc/config/cf/sun.cf +++ b/xc/config/cf/sun.cf @@ -1,9 +1,9 @@ -XCOMM platform: $TOG: sun.cf /main/176 1997/12/09 17:27:51 kaleb $ +XCOMM platform: $Xorg: sun.cf,v 1.4 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM platform: $XFree86: xc/config/cf/sun.cf,v 3.54 2000/12/11 22:34:21 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/sun.cf,v 3.55 2001/01/17 16:38:49 dawes Exp $ #ifndef OSName # define OSName DefaultOSName @@ -155,6 +155,15 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion # endif #endif +/* The Xsun server was not building for SunOS 5.7 due to + includes of <sys/cg2reg.h>. +*/ +#if OSMajorVersion < 5 +# define IncludeCG2HeaderDefine -DINCLUDE_CG2_HEADER +#else +# define IncludeCG2HeaderDefine /**/ +#endif + #ifdef i386Architecture # if OSMajorVersion > 4 # if OSMinorVersion >= 8 @@ -164,14 +173,14 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion # define ServerExtraDefines AllocateLocalDefines XFree86ServerDefines \ -D__EXTENSIONS__ # endif -# define ServerOSDefines XFree86ServerOSDefines +# define ServerOSDefines XFree86ServerOSDefines IncludeCG2HeaderDefine # else # define ServerExtraDefines AllocateLocalDefines -# define ServerOSDefines -DDDXOSINIT +# define ServerOSDefines -DDDXOSINIT IncludeCG2HeaderDefine # endif #else # define ServerExtraDefines AllocateLocalDefines -# define ServerOSDefines -DDDXOSINIT +# define ServerOSDefines -DDDXOSINIT IncludeCG2HeaderDefine # define HasPlugin YES #endif diff --git a/xc/config/cf/sunLib.rules b/xc/config/cf/sunLib.rules index caddbaf16..66805ee95 100644 --- a/xc/config/cf/sunLib.rules +++ b/xc/config/cf/sunLib.rules @@ -1,10 +1,10 @@ -XCOMM $XConsortium: sunLib.rules /main/15 1996/09/28 16:13:16 rws $ +XCOMM $Xorg: sunLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /* * SunOS shared library rules */ -XCOMM $XFree86: xc/config/cf/sunLib.rules,v 1.2 1999/01/11 05:13:08 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sunLib.rules,v 1.3 2001/01/17 16:38:49 dawes Exp $ #ifndef HasSharedLibraries #define HasSharedLibraries YES diff --git a/xc/config/cf/sunLib.tmpl b/xc/config/cf/sunLib.tmpl index 47e504cfd..41af354b3 100644 --- a/xc/config/cf/sunLib.tmpl +++ b/xc/config/cf/sunLib.tmpl @@ -1,10 +1,10 @@ -XCOMM $TOG: sunLib.tmpl /main/47 1997/12/12 14:53:33 kaleb $ +XCOMM $Xorg: sunLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/sunLib.tmpl,v 3.11 1998/01/25 03:59:57 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sunLib.tmpl,v 3.12 2001/01/17 16:38:49 dawes Exp $ /* * SunOS shared library template diff --git a/xc/config/cf/sv3Lib.rules b/xc/config/cf/sv3Lib.rules index 9072b4f40..02cef30e6 100644 --- a/xc/config/cf/sv3Lib.rules +++ b/xc/config/cf/sv3Lib.rules @@ -1,8 +1,8 @@ -XCOMM $XConsortium: sv3Lib.rules /main/1 1996/10/31 14:47:33 kaleb $ +XCOMM $Xorg: sv3Lib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/sv3Lib.rules,v 3.3 1999/10/13 04:20:43 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sv3Lib.rules,v 3.4 2001/01/17 16:38:49 dawes Exp $ /* * SVR3 shared library rules * Copyright (c) 1992, 1993 by Thomas Wolfram, Berlin, Germany diff --git a/xc/config/cf/sv3Lib.tmpl b/xc/config/cf/sv3Lib.tmpl index 7935321a4..98fee60be 100644 --- a/xc/config/cf/sv3Lib.tmpl +++ b/xc/config/cf/sv3Lib.tmpl @@ -1,8 +1,8 @@ -XCOMM $XConsortium: sv3Lib.tmpl /main/1 1996/10/31 14:47:35 kaleb $ +XCOMM $Xorg: sv3Lib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/sv3Lib.tmpl,v 3.1 1996/12/27 06:50:28 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sv3Lib.tmpl,v 3.2 2001/01/17 16:38:49 dawes Exp $ /* * SVR3 shared library template * Copyright (c) 1992, 1993 by Thomas Wolfram, Berlin, Germany diff --git a/xc/config/cf/sv4Lib.rules b/xc/config/cf/sv4Lib.rules index ecdfc8566..15fb4fb0b 100644 --- a/xc/config/cf/sv4Lib.rules +++ b/xc/config/cf/sv4Lib.rules @@ -1,10 +1,10 @@ -XCOMM $XConsortium: sv4Lib.rules /main/18 1996/09/28 16:13:29 rws $ +XCOMM $Xorg: sv4Lib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /* * SVR4 shared library rules */ -XCOMM $XFree86: xc/config/cf/sv4Lib.rules,v 3.6 1999/06/06 08:47:45 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sv4Lib.rules,v 3.7 2001/01/17 16:38:49 dawes Exp $ #ifndef HasSharedLibraries # define HasSharedLibraries YES diff --git a/xc/config/cf/sv4Lib.tmpl b/xc/config/cf/sv4Lib.tmpl index edd1acb48..474500c8f 100644 --- a/xc/config/cf/sv4Lib.tmpl +++ b/xc/config/cf/sv4Lib.tmpl @@ -1,10 +1,10 @@ -XCOMM $XConsortium: sv4Lib.tmpl /main/23 1996/12/04 10:11:01 swick $ +XCOMM $Xorg: sv4Lib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /* * SVR4 shared library template */ -XCOMM $XFree86: xc/config/cf/sv4Lib.tmpl,v 3.4 1999/06/06 12:13:23 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sv4Lib.tmpl,v 3.5 2001/01/17 16:38:50 dawes Exp $ /* SVR4 shared libraries are deficient in link semantics */ XMULIBONLY = -lXmu diff --git a/xc/config/cf/svr3.cf b/xc/config/cf/svr3.cf index 3f3973eea..6e81aed18 100644 --- a/xc/config/cf/svr3.cf +++ b/xc/config/cf/svr3.cf @@ -1,8 +1,8 @@ -XCOMM $XConsortium: svr3.cf /main/1 1996/10/31 14:47:37 kaleb $ +XCOMM $Xorg: svr3.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.13 2000/03/21 19:56:59 dawes Exp $ +XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.14 2001/01/17 16:38:50 dawes Exp $ #ifndef HasGcc #define HasGcc YES diff --git a/xc/config/cf/svr4.cf b/xc/config/cf/svr4.cf index b793973b4..b88fc589e 100644 --- a/xc/config/cf/svr4.cf +++ b/xc/config/cf/svr4.cf @@ -1,5 +1,8 @@ -XCOMM $TOG: svr4.cf /main/17 1997/06/08 20:08:31 kaleb $ -XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.42 2000/12/11 22:34:22 dawes Exp $ +XCOMM $Xorg: svr4.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ + + + +XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.43 2001/01/17 16:38:50 dawes Exp $ /* * A default OS name */ diff --git a/xc/config/cf/ultrix.cf b/xc/config/cf/ultrix.cf index 6ab1c89bd..cda1c789d 100644 --- a/xc/config/cf/ultrix.cf +++ b/xc/config/cf/ultrix.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: ultrix.cf /main/68 1996/09/28 16:13:46 rws $ +XCOMM platform: $Xorg: ultrix.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ #ifndef OSName # define OSName DefaultOSName diff --git a/xc/config/cf/usl.cf b/xc/config/cf/usl.cf index d6db645d5..95fdfed0c 100644 --- a/xc/config/cf/usl.cf +++ b/xc/config/cf/usl.cf @@ -1,9 +1,9 @@ -XCOMM platform: $TOG: usl.cf /main/50 1997/04/17 14:11:39 barstow $ +XCOMM platform: $Xorg: usl.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM platform: $XFree86: xc/config/cf/usl.cf,v 3.21 2000/12/11 22:34:24 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/usl.cf,v 3.23 2001/01/17 16:38:50 dawes Exp $ #ifndef OSName # define OSName DefaultOSName @@ -57,7 +57,9 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVer # define SystemMTDefines -D_REENTRANT # define ThreadsLibraries -lthread # define ThreadsCplusplusLibraries -lthread -# define DefaultCCOptions -W0,-2A -Xa -Dasm=__asm +# ifndef DefaultCCOptions +# define DefaultCCOptions -W0,-2A -Xa -Dasm=__asm +# endif #endif #define BuildLibPathVar LD_LIBRARY_PATH diff --git a/xc/config/cf/x386.cf b/xc/config/cf/x386.cf index 1d9c7c80f..c3fbd3871 100644 --- a/xc/config/cf/x386.cf +++ b/xc/config/cf/x386.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: x386.cf /main/15 1996/09/28 16:14:00 rws $ +XCOMM platform: $Xorg: x386.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /***************************************************************************** * Site-specfic parameters * @@ -19,7 +19,7 @@ XCOMM platform: $XConsortium: x386.cf /main/15 1996/09/28 16:14:00 rws $ * Do not change anything below * *****************************************************************************/ -/* You must manually compute BootstrapCFlags for initial build */ +/* You mus manually compute BootstrapCFlags for initial build */ #define BootstrapCFlags OSDefines OSRelease #define StandardDefines OSDefines OSRelease diff --git a/xc/config/cf/xf86.rules b/xc/config/cf/xf86.rules index b277d40c6..e8acc466b 100644 --- a/xc/config/cf/xf86.rules +++ b/xc/config/cf/xf86.rules @@ -1,5 +1,9 @@ -XCOMM $XConsortium: xf86.rules /main/9 1996/10/31 14:54:26 kaleb $ -XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.32 2000/10/30 23:02:06 tsi Exp $ +XCOMM $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ + + + + +XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.33 2001/01/17 16:38:51 dawes Exp $ /* * These rules are needed to build the XFree86 X Servers diff --git a/xc/config/cf/xf86.tmpl b/xc/config/cf/xf86.tmpl index 9b113f24b..54c4e4a01 100644 --- a/xc/config/cf/xf86.tmpl +++ b/xc/config/cf/xf86.tmpl @@ -1,8 +1,8 @@ -XCOMM $XConsortium: xf86.tmpl /main/2 1996/10/31 15:01:41 kaleb $ +XCOMM $Xorg: xf86.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/xf86.tmpl,v 3.27 2000/08/04 16:13:15 eich Exp $ +XCOMM $XFree86: xc/config/cf/xf86.tmpl,v 3.28 2001/01/17 16:38:51 dawes Exp $ #ifdef BuilderEMailAddr BUILDERADDR = BuilderEMailAddr diff --git a/xc/config/cf/xf86site.def b/xc/config/cf/xf86site.def index 27233aa60..114ec3693 100644 --- a/xc/config/cf/xf86site.def +++ b/xc/config/cf/xf86site.def @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.170 2000/12/14 16:38:45 dawes Exp $ +XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.171 2001/02/11 21:39:36 herrb Exp $ /******************************************************************************/ /* * This file is to provide a quick method for most people to change the @@ -748,4 +748,9 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.170 2000/12/14 16:38:45 dawes Exp #define X86EMU_LIBPATH /usr/local/lib */ - +/* + * By default, gccmakedep uses mktemp for security reasons. + * Uncomment this, if your system lacks mktemp. + * +#define HasMktemp NO + */ diff --git a/xc/config/cf/xfree86.cf b/xc/config/cf/xfree86.cf index d86633845..8e3e621ac 100644 --- a/xc/config/cf/xfree86.cf +++ b/xc/config/cf/xfree86.cf @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.338 2000/12/14 16:59:06 dawes Exp $ +XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.346 2001/02/11 21:39:36 herrb Exp $ /* * This configuration file contains all of the configuration * information for the XFree86 based X Servers. @@ -6,14 +6,84 @@ XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.338 2000/12/14 16:59:06 dawes Exp $ * Most of these settings can be overridden in a vendor.cf or the * BeforeVendor part of the site.def file. */ -XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $ +XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ + + +/* Get and set version information. */ + +#include "version.def" +/* + * As of the development trunk after 4.0.2, XFree86 versions are + * M.m.P.s, and XFree86Version is: + * + * M * 10000000 + m * 100000 + P * 1000 + s + * + * See xc/programs/Xserver/hw/xfree86/doc/Versions for further details. + * + * From 3.9.15 to 4.0.x, XFree86 release versions are X.Y.Z, and + * XFree86Version is: + * + * X * 1000 + Y * 100 + Z + * + * For the 3.3.x branch, the versions are X.Y.Z.W, with XFree86Version + * calculated as: + * + * X * 1000 + Y * 100 + Z * 10 + W + * + */ +#ifndef XFree86Version +#ifdef XF86_VERSION_CURRENT +# define XFree86Version XF86_VERSION_CURRENT +#endif +#endif + +#ifndef XFree86VersionString +#ifdef XF86_VERSION_MAJOR +#if XF86_VERSION_SNAP == 0 +#define XFree86VersionString XF86_VERSION_MAJOR.XF86_VERSION_MINOR.XF86_VERSION_PATCH +#else +#define XFree86VersionString XF86_VERSION_MAJOR.XF86_VERSION_MINOR.XF86_VERSION_PATCH.XF86_VERSION_SNAP +#endif +#endif +#endif + +#ifndef XFree86DateString +#ifdef XF86_DATE +#define XFree86DateString XF86_DATE +#endif +#endif + +/* This must be defined here for boostrapping purposes */ +#ifndef XFree86Version +# define XFree86Version 0 +#endif + +#ifndef XVendorString +# define XVendorString "The XFree86 Project, Inc" +#endif + +#ifndef XVendorRelease +# define XVendorRelease XFree86Version +#endif + +#ifndef XVendorManVersionString +#define XVendorManVersionString Version XFree86VersionString +#endif + +#ifndef XVendorManNameString +#define XVendorManNameString XFree86 +#endif /* * This enables some settings for developers. */ #ifndef XFree86Devel -# define XFree86Devel NO +# if (XFree86Version % 1000) +# define XFree86Devel YES +# else +# define XFree86Devel NO +# endif #endif #ifndef BuildDebug @@ -642,6 +712,9 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # ifndef GlxBuiltInR128 # define GlxBuiltInR128 NO # endif +# ifndef GlxBuiltInRadeon +# define GlxBuiltInRadeon NO +# endif # ifndef GlxBuiltInFfb # define GlxBuiltInFfb NO # endif @@ -649,11 +722,11 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define GlxBuiltInSIS NO # endif -# if GlxBuiltInTdfx || GlxBuiltInMga || GlxBuiltInI810 || GlxBuiltInR128 || GlxBuildInFfb || GlxBuiltInSIS +# if GlxBuiltInTdfx || GlxBuiltInMga || GlxBuiltInI810 || GlxBuiltInR128 || GlxBuiltInRadeon || GlxBuildInFfb || GlxBuiltInSIS # define GlxDriverUsesMesa YES # endif -# if GlxBuiltInGamma || GlxBuiltInTdfx || GlxBuiltInMga || GlxBuiltInI810 || GlxBuiltInR128 || GlxBuiltInFfb || GlxBuiltInSIS || GlxBuiltInMesa +# if GlxBuiltInGamma || GlxBuiltInTdfx || GlxBuiltInMga || GlxBuiltInI810 || GlxBuiltInR128 || GlxBuiltInRadeon || GlxBuiltInFfb || GlxBuiltInSIS || GlxBuiltInMesa # define GlxUseBuiltInDRIDriver YES # define DRIDynLoadDefines /**/ # else @@ -815,6 +888,9 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 #ifndef BuildXvLibrary # define BuildXvLibrary YES #endif +#ifndef BuildGLULibrary +# define BuildGLULibrary HasCplusplus +#endif #ifndef BuildGLXLibrary # define BuildGLXLibrary YES #endif @@ -1166,29 +1242,6 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese # define OtherIConfigFiles $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules #endif -/* - * As of 3.9.15, XFree86 release versions are X.Y.Z, and XFree86Version is: - * - * X * 1000 + Y * 100 + Z - * - * For the 3.3.x branch, the versions are X.Y.Z.W, with XFree86Version - * calculated as: - * - * X * 1000 + Y * 100 + Z * 10 + W - * - */ -#ifndef XFree86Version -# define XFree86Version 4002 -#endif - -#ifndef XVendorString -# define XVendorString "The XFree86 Project, Inc" -#endif - -#ifndef XVendorRelease -# define XVendorRelease XFree86Version -#endif - #ifndef UseRgbTxt # define UseRgbTxt YES #endif @@ -1289,5 +1342,9 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese # endif #endif +#ifndef HasMktemp +#define HasMktemp YES +#endif + #include <xf86.rules> diff --git a/xc/config/imake/Imakefile b/xc/config/imake/Imakefile index 36610865d..7c3f6a37f 100644 --- a/xc/config/imake/Imakefile +++ b/xc/config/imake/Imakefile @@ -1,9 +1,9 @@ -XCOMM $TOG: Imakefile /main/10 1997/04/30 15:39:17 kaleb $ +XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ XCOMM XCOMM XCOMM XCOMM -XCOMM $XFree86: xc/config/imake/Imakefile,v 3.9 1999/08/14 10:49:01 dawes Exp $ +XCOMM $XFree86: xc/config/imake/Imakefile,v 3.11 2001/01/24 17:28:55 tsi Exp $ XCOMM Some compilers generate fatal errors if an -L directory does XCOMM not exist. Since BUILDLIBDIR may not exist yet suppress its use. @@ -51,4 +51,5 @@ bootstrapdepend: clean:: RemoveFile(ProgramTargetName(ccimake)) + RemoveFile(Makefile.proto) $(RM) -r bootstrap diff --git a/xc/config/imake/Makefile.ini b/xc/config/imake/Makefile.ini index 50e5ba04f..a1bd52842 100644 --- a/xc/config/imake/Makefile.ini +++ b/xc/config/imake/Makefile.ini @@ -1,4 +1,4 @@ -# $TOG: Makefile.ini /main/25 1997/02/19 18:00:59 mgreess $ +# $Xorg: Makefile.ini,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ # # WARNING WARNING WARNING WARNING WARNING WARNING WARNING # @@ -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.9 2000/10/26 17:57:45 dawes Exp $ +# $XFree86: xc/config/imake/Makefile.ini,v 3.10 2001/01/17 16:38:55 dawes Exp $ BOOTSTRAPCFLAGS = CC = cc diff --git a/xc/config/imake/ccimake.c b/xc/config/imake/ccimake.c index e97866ab0..216b318bb 100644 --- a/xc/config/imake/ccimake.c +++ b/xc/config/imake/ccimake.c @@ -1,4 +1,4 @@ -/* $TOG: ccimake.c /main/16 1998/02/06 11:02:20 kaleb $ */ +/* $Xorg: ccimake.c,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group diff --git a/xc/config/imake/imake.c b/xc/config/imake/imake.c index f43b05b59..89a8a34e7 100644 --- a/xc/config/imake/imake.c +++ b/xc/config/imake/imake.c @@ -1,4 +1,4 @@ -/* $TOG: imake.c /main/104 1998/03/24 12:45:15 kaleb $ */ +/* $Id */ /*************************************************************************** * * @@ -8,7 +8,7 @@ * be passed to the template file. * * * ***************************************************************************/ -/* $XFree86: xc/config/imake/imake.c,v 3.40 2000/11/27 05:06:43 dawes Exp $ */ +/* $XFree86: xc/config/imake/imake.c,v 3.41 2001/01/17 16:38:55 dawes Exp $ */ /* * @@ -1573,7 +1573,7 @@ ReadLine(FILE *tmpfd, char *tmpfname) initialized = TRUE; fprintf (tmpfd, "# Makefile generated by imake - do not edit!\n"); fprintf (tmpfd, "# %s\n", - "$TOG: imake.c /main/104 1998/03/24 12:45:15 kaleb $"); + "$Xorg: imake.c,v 1.5 2000/08/18 04:03:59 coskrey Exp $"); } for (p1 = pline; p1 < end; p1++) { diff --git a/xc/config/imake/imake.man b/xc/config/imake/imake.man index 5c3ea1b1e..62f09e436 100644 --- a/xc/config/imake/imake.man +++ b/xc/config/imake/imake.man @@ -1,4 +1,4 @@ -.\" $TOG: imake.man /main/30 1998/02/06 11:02:42 kaleb $ +.\" $Xorg: imake.man,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ .\" Copyright (c) 1993, 1994, 1998 The Open Group .\" .\" All Rights Reserved. @@ -18,7 +18,10 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from The Open Group. -.TH IMAKE 1 "Release 6.1" "X Version 11" +.\" +.\" $XFree86: xc/config/imake/imake.man,v 1.7 2001/02/07 22:51:55 tsi Exp $ +.\" +.TH IMAKE 1 __xorgversion__ .SH NAME imake \- C preprocessor interface to the make utility .SH SYNOPSIS @@ -88,9 +91,9 @@ on the command line and passes the name of a file containing the following 3 lines: .sp .nf - #define IMAKE_TEMPLATE "Imake.tmpl" - #define INCLUDE_IMAKEFILE <Imakefile> - #include IMAKE_TEMPLATE +\& #define IMAKE_TEMPLATE "Imake.tmpl" +\& #define INCLUDE_IMAKEFILE <Imakefile> +\& #include IMAKE_TEMPLATE .fi .sp where \fIImake.tmpl\fP and \fIImakefile\fP may be overridden by the @@ -127,8 +130,8 @@ For example, the macro .ta 1i 1.6i 5i .nf -#define program_target(program, objlist) @@\e -program: objlist @@\e +\& #define program_target(program, objlist) @@\e + program: objlist @@\e $(CC) \-o $@ objlist $(LDFLAGS) .fi @@ -137,7 +140,7 @@ when called with will expand to .nf -foo: foo1.o foo2.o + foo: foo1.o foo2.o $(CC) \-o $@ foo1.o foo2.o $(LDFLAGS) .fi diff --git a/xc/config/imake/imakemdep.h b/xc/config/imake/imakemdep.h index 4b0753a0b..424e307b9 100644 --- a/xc/config/imake/imakemdep.h +++ b/xc/config/imake/imakemdep.h @@ -1,4 +1,4 @@ -/* $TOG: imakemdep.h /main/102 1998/02/06 11:02:26 kaleb $ */ +/* $Xorg: imakemdep.h,v 1.5 2000/08/17 19:41:50 cpqbld Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group @@ -20,7 +20,7 @@ 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/imake/imakemdep.h,v 3.45 2000/11/14 18:20:32 dawes Exp $ */ +/* $XFree86: xc/config/imake/imakemdep.h,v 3.47 2001/01/19 08:13:28 dawes Exp $ */ /* @@ -151,12 +151,8 @@ in this Software without prior written authorization from The Open Group. #define imake_ccflags "-DSYSV -DUSG -DNOSTDHDRS" #endif -#ifdef sequent -#define imake_ccflags "-DX_NOT_STDC_ENV -DX_NOT_POSIX" -#endif - #ifdef _SEQUENT_ -#define imake_ccflags "-DSYSV -DUSG" +#define imake_ccflags "-Xa -DSVR4" #endif #if defined(SX) || defined(PC_UX) @@ -805,14 +801,18 @@ char *cpp_argv[ARGUMENTS] = { if ((__sp = strchr((buf), ' ')) != NULL) \ *__sp = '/'; \ } while (0) -#else -# if defined(__Lynx__) || defined(Lynx) +#elif defined(__Lynx__) || defined(Lynx) /* Lynx 2.4.0 /bin/cc doesn't like #elif */ -# define DEFAULT_OS_MAJOR_REV "r %[0-9]" -# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]" -# define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]" -# define DEFAULT_OS_NAME "srm %[^\n]" -# endif +# define DEFAULT_OS_MAJOR_REV "r %[0-9]" +# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]" +# define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]" +# define DEFAULT_OS_NAME "srm %[^\n]" +#elif defined(_SEQUENT_) +/* uname -v returns 'Vx.y.z', e.g. 'V4.4.2' */ +# define DEFAULT_OS_MAJOR_REV "v V%[0-9]" +# define DEFAULT_OS_MINOR_REV "v V%*d.%[0-9]" +# define DEFAULT_OS_TEENY_REV "v V%*d.%*d.%[0-9]" +# define DEFAULT_OS_NAME "s %[^\n]" #endif #else /* else MAKEDEPEND */ diff --git a/xc/config/makedepend/Imakefile b/xc/config/makedepend/Imakefile index ad42e7683..2d5f68246 100644 --- a/xc/config/makedepend/Imakefile +++ b/xc/config/makedepend/Imakefile @@ -1,9 +1,9 @@ -XCOMM $TOG: Imakefile /main/27 1997/04/30 15:38:09 kaleb $ +XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ XCOMM XCOMM XCOMM XCOMM -XCOMM $XFree86: xc/config/makedepend/Imakefile,v 3.7 1999/08/14 10:49:02 dawes Exp $ +XCOMM $XFree86: xc/config/makedepend/Imakefile,v 3.8 2001/01/17 16:38:57 dawes Exp $ SRCS = include.c main.c parse.c pr.c cppsetup.c ifparser.c OBJS = include.o main.o parse.o pr.o cppsetup.o ifparser.o diff --git a/xc/config/makedepend/cpp.ed b/xc/config/makedepend/cpp.ed index ffa586f54..3a7db5096 100644 --- a/xc/config/makedepend/cpp.ed +++ b/xc/config/makedepend/cpp.ed @@ -1,5 +1,5 @@ # -# $XConsortium: cpp.ed,v 1.3 89/12/12 12:44:18 jim Exp $ +# $Xorg: cpp.ed,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ # # $Locker $ # diff --git a/xc/config/makedepend/cppsetup.c b/xc/config/makedepend/cppsetup.c index b04e0763e..492033c8e 100644 --- a/xc/config/makedepend/cppsetup.c +++ b/xc/config/makedepend/cppsetup.c @@ -1,4 +1,4 @@ -/* $TOG: cppsetup.c /main/18 1998/02/06 11:09:35 kaleb $ */ +/* $Xorg: cppsetup.c,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group @@ -20,7 +20,7 @@ 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/cppsetup.c,v 3.5 2000/04/04 19:24:45 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/cppsetup.c,v 3.6 2001/01/17 16:38:57 dawes Exp $ */ #include "def.h" diff --git a/xc/config/makedepend/def.h b/xc/config/makedepend/def.h index f3d6b7746..0c1823fcf 100644 --- a/xc/config/makedepend/def.h +++ b/xc/config/makedepend/def.h @@ -1,4 +1,4 @@ -/* $TOG: def.h /main/32 1998/03/25 08:17:45 kaleb $ */ +/* $Xorg: def.h,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group. @@ -20,7 +20,7 @@ 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.7 2000/10/24 18:07:35 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/def.h,v 3.8 2001/01/17 16:38:58 dawes Exp $ */ #include "Xos.h" #include "Xfuncproto.h" diff --git a/xc/config/makedepend/ifparser.c b/xc/config/makedepend/ifparser.c index 5e4e97c62..4cc74a07e 100644 --- a/xc/config/makedepend/ifparser.c +++ b/xc/config/makedepend/ifparser.c @@ -1,5 +1,5 @@ /* - * $XConsortium: ifparser.c /main/10 1996/09/28 16:15:18 rws $ + * $Xorg: ifparser.c,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ * * Copyright 1992 Network Computing Devices, Inc. * @@ -58,7 +58,7 @@ * * ParseIfExpression parse a string for #if */ -/* $XFree86: xc/config/makedepend/ifparser.c,v 3.7 1998/10/05 13:21:48 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/ifparser.c,v 3.8 2001/01/17 16:38:58 dawes Exp $ */ #include "ifparser.h" #include <ctype.h> diff --git a/xc/config/makedepend/ifparser.h b/xc/config/makedepend/ifparser.h index 761084b04..370f36ede 100644 --- a/xc/config/makedepend/ifparser.h +++ b/xc/config/makedepend/ifparser.h @@ -1,5 +1,5 @@ /* - * $XConsortium: ifparser.h /main/4 1996/09/28 16:15:24 rws $ + * $Xorg: ifparser.h,v 1.3 2000/08/17 19:41:51 cpqbld Exp $ * * Copyright 1992 Network Computing Devices, Inc. * @@ -57,7 +57,7 @@ * ParseIfExpression parse a string for #if */ -/* $XFree86: xc/config/makedepend/ifparser.h,v 3.3 1998/10/05 13:21:48 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/ifparser.h,v 3.4 2001/01/17 16:38:58 dawes Exp $ */ #include <stdio.h> diff --git a/xc/config/makedepend/include.c b/xc/config/makedepend/include.c index 664372e29..aad51a1e8 100644 --- a/xc/config/makedepend/include.c +++ b/xc/config/makedepend/include.c @@ -1,4 +1,4 @@ -/* $TOG: include.c /main/21 1998/02/06 11:10:06 kaleb $ */ +/* $Xorg: include.c,v 1.3 2000/08/17 19:41:51 cpqbld Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group @@ -20,7 +20,7 @@ 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/include.c,v 3.4 1998/10/05 13:21:49 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/include.c,v 3.5 2001/01/17 16:38:59 dawes Exp $ */ #include "def.h" diff --git a/xc/config/makedepend/main.c b/xc/config/makedepend/main.c index 44daddf4e..4697bfd13 100644 --- a/xc/config/makedepend/main.c +++ b/xc/config/makedepend/main.c @@ -1,4 +1,4 @@ -/* $TOG: main.c /main/86 1998/03/25 08:17:50 kaleb $ */ +/* $Xorg: main.c,v 1.3 2000/08/17 19:41:51 cpqbld Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group @@ -20,7 +20,7 @@ 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/main.c,v 3.17 2000/11/14 21:59:20 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/main.c,v 3.18 2001/01/17 16:38:59 dawes Exp $ */ #include "def.h" #ifdef hpux diff --git a/xc/config/makedepend/mkdepend.man b/xc/config/makedepend/mkdepend.man index 689f2ff7e..39da75505 100644 --- a/xc/config/makedepend/mkdepend.man +++ b/xc/config/makedepend/mkdepend.man @@ -1,4 +1,4 @@ -.\" $TOG: mkdepend.man /main/20 1998/02/06 11:10:18 kaleb $ +.\" $Xorg: mkdepend.man,v 1.3 2000/08/17 19:41:51 cpqbld Exp $ .\" Copyright (c) 1993, 1994, 1998 The Open Group .\" .\" All Rights Reserved. @@ -18,7 +18,10 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from The .\" Open Group. -.TH MAKEDEPEND 1 "Release 6.4" "X Version 11" +.\" +.\" $XFree86: xc/config/makedepend/mkdepend.man,v 1.4 2001/02/07 22:51:55 tsi Exp $ +.\" +.TH MAKEDEPEND 1 __xorgversion__ .UC 4 .SH NAME makedepend \- create dependencies in makefiles @@ -107,7 +110,7 @@ option. It first searches the makefile for the line .sp - # DO NOT DELETE THIS LINE \-\^\- make depend depends on it. +\& # DO NOT DELETE THIS LINE \-\^\- make depend depends on it. .sp or one provided with the .B \-s @@ -338,9 +341,8 @@ to the list of dependencies for cc(1), make(1) .SH BUGS .B makedepend -parses, but does not currently evaluate, the SVR4 -#predicate(token-list) preprocessor expression; -such expressions are simply assumed to be true. +parses, but does not currently evaluate, the SVR4 #predicate(token-list) +preprocessor expression; such expressions are simply assumed to be true. This may cause the wrong .I #include directives to be evaluated. diff --git a/xc/config/makedepend/parse.c b/xc/config/makedepend/parse.c index c295ceaf3..677b4d63c 100644 --- a/xc/config/makedepend/parse.c +++ b/xc/config/makedepend/parse.c @@ -1,4 +1,4 @@ -/* $TOG: parse.c /main/35 1998/03/25 08:17:55 kaleb $ */ +/* $Xorg: parse.c,v 1.4 2000/08/17 19:41:51 cpqbld Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group @@ -20,7 +20,7 @@ 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/parse.c,v 1.6 1999/03/21 07:34:26 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/parse.c,v 1.7 2001/01/17 16:38:59 dawes Exp $ */ #include "def.h" diff --git a/xc/config/makedepend/pr.c b/xc/config/makedepend/pr.c index 0291098f3..9b797b1f8 100644 --- a/xc/config/makedepend/pr.c +++ b/xc/config/makedepend/pr.c @@ -1,4 +1,4 @@ -/* $TOG: pr.c /main/21 1998/02/06 11:10:30 kaleb $ */ +/* $Xorg: pr.c,v 1.3 2000/08/17 19:41:51 cpqbld Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group @@ -20,7 +20,7 @@ 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/pr.c,v 1.2 1998/10/05 13:21:50 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/pr.c,v 1.3 2001/01/17 16:39:00 dawes Exp $ */ #include "def.h" diff --git a/xc/config/util/Imakefile b/xc/config/util/Imakefile index 551ffe76c..779235a75 100644 --- a/xc/config/util/Imakefile +++ b/xc/config/util/Imakefile @@ -1,5 +1,8 @@ -XCOMM $XConsortium: Imakefile /main/16 1996/11/13 14:43:28 lehors $ -XCOMM $XFree86: xc/config/util/Imakefile,v 3.29 2000/12/06 15:35:01 eich Exp $ +XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ + + + +XCOMM $XFree86: xc/config/util/Imakefile,v 3.31 2001/02/11 21:39:37 herrb Exp $ #if UseCCMakeDepend MDEP_PROG = makedepend @@ -18,6 +21,10 @@ GCCMDEP_PROG = gccmakedep LNDIR_PROG = ProgramTargetName(lndir) #endif +#if HasMktemp +MKTEMPDEFINE = -DHAS_MKTEMP +#endif + #if BuildRman RMAN_PROG = ProgramTargetName(rman) #endif @@ -64,10 +71,10 @@ InstallNamedProg(exportlistgen,exportlistgen,$(BINDIR)) #endif CppScriptTarget(xmkmf,xmkmf.cpp,-DCONFIGDIRSPEC='"'"-I$(CONFIGDIR)"'"',$(ICONFIGFILES)) -CppScriptTarget(makedepend,mdepend.cpp,-DPREPROC='"'"$(PREPROCESSCMD_MKDEPEND)"'"',$(ICONFIGFILES)) +CppScriptTarget(makedepend,mdepend.cpp,$(MKTEMPDEFINE) -DPREPROC='"'"$(PREPROCESSCMD_MKDEPEND)"'"',$(ICONFIGFILES)) CppScriptTarget(mergelib,mergelib.cpp,"-DARCMD=$(AR)" "-DRANLIB=$(RANLIB)",$(ICONFIGFILES)) #ifndef OS2Architecture -CppScriptTarget(gccmakedep,gccmdep.cpp,-DCCCMD='"'"$(GCCCMD)"'"' -DRMCMD='"'"$(RM)"'"' -DLNCMD='"'"$(LN)"'"' -DMVCMD='"'"$(MV)"'"',$(ICONFIGFILES)) +CppScriptTarget(gccmakedep,gccmdep.cpp,$(MKTEMPDEFINE) -DCCCMD='"'"$(GCCCMD)"'"' -DRMCMD='"'"$(RM)"'"' -DLNCMD='"'"$(LN)"'"' -DMVCMD='"'"$(MV)"'"',$(ICONFIGFILES)) #endif #ifndef OpenBSDArchitecture diff --git a/xc/config/util/Makefile.ini b/xc/config/util/Makefile.ini index 5b8d1f475..17d8d74d6 100644 --- a/xc/config/util/Makefile.ini +++ b/xc/config/util/Makefile.ini @@ -1,4 +1,4 @@ -# $XConsortium: Makefile.ini,v 1.2 94/04/17 14:55:28 gildea Exp $ +# $Xorg: Makefile.ini,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ # # A way to get lndir built the first time, before you have imake up # and running. You may well have to specify OSFLAGS=-D<something> to diff --git a/xc/config/util/aminstall.sh b/xc/config/util/aminstall.sh index 6a8def3f3..19a8a4d5a 100644 --- a/xc/config/util/aminstall.sh +++ b/xc/config/util/aminstall.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $XConsortium: aminstall.sh,v 1.1 94/03/29 15:54:08 gildea Exp $ +# $Xorg: aminstall.sh,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ # aminstall - transfer cross-compiled files to system running Amoeba. # Usage: aminstall binary-directory [-s stksz] unix-source amoeba-dest diff --git a/xc/config/util/bsdinst.sh b/xc/config/util/bsdinst.sh index 3ac7afa92..2f9ac4de8 100755 --- a/xc/config/util/bsdinst.sh +++ b/xc/config/util/bsdinst.sh @@ -1,10 +1,10 @@ #!/bin/sh -# $XFree86: xc/config/util/bsdinst.sh,v 3.3 1996/12/23 05:56:13 dawes Exp $ +# $XFree86: xc/config/util/bsdinst.sh,v 3.4 2001/01/17 16:39:01 dawes Exp $ # # This accepts bsd-style install arguments and makes the appropriate calls # to the System V install. -# $XConsortium: bsdinst.sh /main/8 1996/09/28 16:16:11 rws $ +# $Xorg: bsdinst.sh,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ flags="" dst="" diff --git a/xc/config/util/checktree.c b/xc/config/util/checktree.c index ae73225c2..1f8036fe7 100644 --- a/xc/config/util/checktree.c +++ b/xc/config/util/checktree.c @@ -1,4 +1,4 @@ -/* $TOG: checktree.c /main/8 1998/02/06 11:23:04 kaleb $ */ +/* $Xorg: checktree.c,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ */ /* diff --git a/xc/config/util/chownxterm.c b/xc/config/util/chownxterm.c index 64d820466..b8ad48c35 100644 --- a/xc/config/util/chownxterm.c +++ b/xc/config/util/chownxterm.c @@ -1,4 +1,4 @@ -/* $TOG: chownxterm.c /main/4 1998/02/06 11:23:10 kaleb $ */ +/* $Xorg: chownxterm.c,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group diff --git a/xc/config/util/elistgen.hp b/xc/config/util/elistgen.hp index 60a4b526d..fe22e794e 100644 --- a/xc/config/util/elistgen.hp +++ b/xc/config/util/elistgen.hp @@ -1,5 +1,5 @@ XCOMM!/bin/sh -XCOMM $XConsortium: elistgen.hp /main/2 1996/12/04 10:13:14 swick $ +XCOMM $Xorg: elistgen.hp,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ XCOMM XCOMM ######################################################################### XCOMM Construct shared-library export lists for HP-UX based on standardized diff --git a/xc/config/util/elistgen.ibm b/xc/config/util/elistgen.ibm index b1f99d1f3..d36869656 100644 --- a/xc/config/util/elistgen.ibm +++ b/xc/config/util/elistgen.ibm @@ -1,5 +1,5 @@ XCOMM!/bin/sh -XCOMM $XConsortium: elistgen.ibm /main/2 1996/12/04 10:13:18 swick $ +XCOMM $Xorg: elistgen.ibm,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ XCOMM XCOMM ######################################################################### XCOMM Construct shared-library export lists for IBM-AIX based on standardized diff --git a/xc/config/util/elistgen.sun b/xc/config/util/elistgen.sun index 536e52e0c..cd9d1c760 100644 --- a/xc/config/util/elistgen.sun +++ b/xc/config/util/elistgen.sun @@ -1,5 +1,5 @@ XCOMM!/bin/sh -f -XCOMM $TOG: elistgen.sun /main/7 1997/10/24 15:16:44 bill $ +XCOMM $Xorg: elistgen.sun,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ XCOMM XCOMM ######################################################################## XCOMM Construct shared-library scoping mapfile for Solaris based on standardized @@ -15,7 +15,7 @@ XCOMM linker to reconstruct the shared library, libfoo.so. XCOMM XCOMM ######################################################################## XCOMM -XCOMM $XFree86: xc/config/util/elistgen.sun,v 1.6 2000/02/09 17:10:25 dawes Exp $ +XCOMM $XFree86: xc/config/util/elistgen.sun,v 1.7 2001/01/17 16:39:01 dawes Exp $ XCOMM Utility programs FILTER=CXXFILT # C++ symbol demangler diff --git a/xc/config/util/elistgen.usl b/xc/config/util/elistgen.usl index 0923b526f..ef623ff6e 100644 --- a/xc/config/util/elistgen.usl +++ b/xc/config/util/elistgen.usl @@ -1,5 +1,5 @@ XCOMM!/bin/sh -XCOMM $XConsortium: elistgen.usl /main/2 1996/12/04 10:13:26 swick $ +XCOMM $Xorg: elistgen.usl,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ XCOMM XCOMM ######################################################################### XCOMM Construct shared-library export lists for Novell based on standardized diff --git a/xc/config/util/gccmdep.cpp b/xc/config/util/gccmdep.cpp index 0832a4e3c..c6eaaa0b3 100644 --- a/xc/config/util/gccmdep.cpp +++ b/xc/config/util/gccmdep.cpp @@ -3,7 +3,7 @@ XCOMM!/bin/sh XCOMM XCOMM makedepend which uses 'gcc -M' XCOMM -XCOMM $XFree86: xc/config/util/gccmdep.cpp,v 3.5 2000/11/14 21:59:21 dawes Exp $ +XCOMM $XFree86: xc/config/util/gccmdep.cpp,v 3.6 2001/01/26 23:01:44 herrb Exp $ XCOMM XCOMM Based on mdepend.cpp and code supplied by Hongjiu Lu <hjl@nynexst.com> XCOMM @@ -14,6 +14,18 @@ RM=RMCMD LN=LNCMD MV=MVCMD +XCOMM Security: if $tmp exists exit immediately +rm -f ${TMP} +if [ -e ${TMP} ] ; then + echo "$0: ${TMP} exists already, exit." 1>&2 + exit 1; +fi +#if defined(HAS_MKTEMP) +if [ -n "`type -p mktemp`" ] ; then + TMP="`mktemp ${TMP}.XXXXXX`" || exit 1 +fi +#endif + trap "$RM ${TMP}*; exit 1" 1 2 15 trap "$RM ${TMP}*; exit 0" 1 2 13 @@ -33,7 +45,7 @@ while [ $# != 0 ]; do -D*|-I*) args="$args '$1'" ;; - -g|-O*) + -g|-O) ;; *) if [ "$endmarker"x = x ]; then diff --git a/xc/config/util/install.sh b/xc/config/util/install.sh index 33d8e0d89..7b2d40b85 100755 --- a/xc/config/util/install.sh +++ b/xc/config/util/install.sh @@ -3,7 +3,7 @@ # # install - install a program, script, or datafile # -# $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $ +# $Xorg: install.sh,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ # # This script is compatible with the BSD install script, but was written # from scratch. diff --git a/xc/config/util/lndir.c b/xc/config/util/lndir.c index 0355bc504..99dbf00f6 100644 --- a/xc/config/util/lndir.c +++ b/xc/config/util/lndir.c @@ -1,4 +1,4 @@ -/* $TOG: lndir.c /main/17 1998/02/06 11:23:50 kaleb $ */ +/* $Xorg: lndir.c,v 1.4 2000/08/17 19:41:52 cpqbld Exp $ */ /* Create shadow link tree (after X11R4 script of the same name) Mark Reinhold (mbr@lcs.mit.edu)/3 January 1990 */ @@ -22,7 +22,7 @@ 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/util/lndir.c,v 3.10 2000/04/17 16:29:45 eich Exp $ */ +/* $XFree86: xc/config/util/lndir.c,v 3.12 2001/02/11 22:04:07 herrb Exp $ */ /* From the original /bin/sh script: @@ -205,6 +205,12 @@ dodir (char *fn, /* name of "from" directory, either absolute or while ((dp = readdir (df))) { if (dp->d_name[strlen(dp->d_name) - 1] == '~') continue; +#ifdef __DARWIN__ + /* Ignore these Mac OS X Finder data files */ + if (!strcmp(dp->d_name, ".DS_Store") || + !strcmp(dp->d_name, "._.DS_Store")) + continue; +#endif strcpy (p, dp->d_name); if (n_dirs > 0) { diff --git a/xc/config/util/lndir.man b/xc/config/util/lndir.man index 8a52f77c2..0d27b43ab 100644 --- a/xc/config/util/lndir.man +++ b/xc/config/util/lndir.man @@ -1,4 +1,4 @@ -.\" $TOG: lndir.man /main/11 1998/02/06 11:23:56 kaleb $ +.\" $Xorg: lndir.man,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994, 1998 The Open Group .\" @@ -20,7 +20,10 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.TH LNDIR 1 "Release 6.4" "X Version 11" +.\" +.\" $XFree86: xc/config/util/lndir.man,v 1.2 2001/01/27 18:19:55 dawes Exp $ +.\" +.TH LNDIR 1 __xorgversion__ .SH NAME lndir \- create a shadow directory of symbolic links to another directory tree .SH SYNOPSIS diff --git a/xc/config/util/makeg.man b/xc/config/util/makeg.man index 5511d7757..a98f9e30b 100644 --- a/xc/config/util/makeg.man +++ b/xc/config/util/makeg.man @@ -1,4 +1,4 @@ -.\" $TOG: makeg.man /main/2 1998/02/06 11:24:05 kaleb $ +.\" $Xorg: makeg.man,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ .\" Copyright (c) 1996, 1998 The Open Group .\" .\" All Rights Reserved. @@ -19,7 +19,10 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.TH MAKEG 1 "Release 6.4" "X Version 11" +.\" +.\" $XFree86: xc/config/util/makeg.man,v 1.2 2001/01/27 18:19:55 dawes Exp $ +.\" +.TH MAKEG 1 __xorgversion__ .SH NAME makeg \- make a debuggable executable .SH SYNOPSIS diff --git a/xc/config/util/makeg.sh b/xc/config/util/makeg.sh index 0b68a1080..38be8c9e2 100755 --- a/xc/config/util/makeg.sh +++ b/xc/config/util/makeg.sh @@ -1,6 +1,6 @@ #! /bin/sh # makeg - run "make" with options necessary to make a debuggable executable -# $XConsortium: makeg.sh /main/4 1996/06/13 11:45:08 ray $ +# $Xorg: makeg.sh,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ # set GDB=1 in your environment if using gdb on Solaris 2. diff --git a/xc/config/util/makestrs.c b/xc/config/util/makestrs.c index c81e38012..893bf88fc 100644 --- a/xc/config/util/makestrs.c +++ b/xc/config/util/makestrs.c @@ -1,4 +1,4 @@ -/* $TOG: makestrs.c /main/11 1998/02/06 11:24:15 kaleb $ */ +/* $Id */ /* @@ -21,7 +21,7 @@ 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/util/makestrs.c,v 3.4 1998/10/05 13:21:51 dawes Exp $ */ +/* $XFree86: xc/config/util/makestrs.c,v 3.5 2001/01/17 16:39:01 dawes Exp $ */ /* Constructs string definitions */ @@ -233,7 +233,7 @@ static void WriteHeader (char *tagline, File *phile, int abi) (void) fprintf (f, "%s\n%s\n/* %s ABI version -- Do not edit */\n", - "/* $TOG: makestrs.c /main/11 1998/02/06 11:24:15 kaleb $ */", + "/* $Xorg: makestrs.c,v 1.5 2000/08/18 04:03:59 coskrey Exp $ */", "/* This file is automatically generated. */", abistring[abi]); @@ -404,7 +404,7 @@ static void WriteSource(char *tagline, int abi) (void) printf ("%s\n%s\n/* %s ABI version -- Do not edit */\n", - "/* $TOG: makestrs.c /main/11 1998/02/06 11:24:15 kaleb $ */", + "/* $Xorg: makestrs.c,v 1.5 2000/08/18 04:03:59 coskrey Exp $ */", "/* This file is automatically generated. */", abistring[abi]); diff --git a/xc/config/util/makestrs.man b/xc/config/util/makestrs.man index 82734c19f..e30612801 100644 --- a/xc/config/util/makestrs.man +++ b/xc/config/util/makestrs.man @@ -1,4 +1,4 @@ -.\" $TOG: makestrs.man /main/4 1998/02/06 11:24:22 kaleb $ +.\" $Xorg: makestrs.man,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ .\" Copyright (c) 1993, 1994, 1998 The Open Group .\" .\" All Rights Reserved. @@ -18,7 +18,10 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from The .\" Open Group. -.TH MAKESTRS 1 "Release 6.4" "X Version 11" +.\" +.\" $XFree86: xc/config/util/makestrs.man,v 3.7 2001/02/07 23:25:54 dawes Exp $ +.\" +.TH MAKESTRS 1 __xorgversion__ .SH NAME makestrs \- makes string table C source and header(s) .SH SYNOPSIS @@ -79,26 +82,26 @@ no abioptions are specified. .SH SYNTAX The syntax for string-list file is (items in square brackets are optional): .RS 4 -#prefix <text> +\&#prefix <text> .RE .RS 4 -#feature <text> +\&#feature <text> .RE .RS 4 -#externref <text> +\&#externref <text> .RE .RS 4 -#externdef [<text>] +\&#externdef [<text>] .RE .RS 4 [#ctempl <text>] .RE .LP .RS 4 -#file <filename> +\&#file <filename> .RE .RS 4 -#table <tablename> +\&#table <tablename> .RE .RS 4 [#htempl] @@ -125,19 +128,19 @@ The syntax for string-list file is (items in square brackets are optional): <text> .RE .RS 4 -... + ... .RE .RS 4 -#table <tablename> +\&#table <tablename> .RE .RS 4 -...] + ...] .RE .RS 4 [#file <filename> .RE .RS 4 -...] + ...] .RE .LP In words you may have one or more #file directives. Each #file may have diff --git a/xc/config/util/mdepend.cpp b/xc/config/util/mdepend.cpp index b54ef3a19..371e28bfb 100644 --- a/xc/config/util/mdepend.cpp +++ b/xc/config/util/mdepend.cpp @@ -1,6 +1,6 @@ XCOMM!/bin/sh XCOMM -XCOMM $TOG: mdepend.cpp /main/13 1997/06/20 21:12:18 kaleb $ +XCOMM $Xorg: mdepend.cpp,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ XCOMM XCOMM Do the equivalent of the 'makedepend' program, but do it right. XCOMM @@ -22,7 +22,7 @@ XCOMM work on both USG and BSD systems. However, when System V.4 comes out, XCOMM USG users will probably have to change "silent" to "-s" instead of XCOMM "-" (at least, that is what the documentation implies). XCOMM -XCOMM $XFree86: xc/config/util/mdepend.cpp,v 3.3 2000/08/08 03:16:26 dawes Exp $ +XCOMM $XFree86: xc/config/util/mdepend.cpp,v 3.5 2001/02/11 21:39:37 herrb Exp $ XCOMM CC=PREPROC @@ -36,6 +36,18 @@ TMPMAKEFILE=${TMP}c MAGICLINE=${TMP}d ARGS=${TMP}e +XCOMM Security: if $tmp exists exit immediately +rm -f ${TMP} +if [ -e ${TMP} ] ; then + echo "$0: ${TMP} exists already, exit." 1>&2 + exit 1; +fi +#if defined(HAS_MKTEMP) +if [ -n "`type -p mktemp`" ] ; then + TMP="`mktemp ${TMP}.XXXXXX`" || exit 1 +fi +#endif + trap "rm -f ${TMP}*; exit 1" 1 2 15 trap "rm -f ${TMP}*; exit 0" 1 2 13 diff --git a/xc/config/util/mergelib.cpp b/xc/config/util/mergelib.cpp index a645a69af..03aa9e419 100755 --- a/xc/config/util/mergelib.cpp +++ b/xc/config/util/mergelib.cpp @@ -1,6 +1,6 @@ XCOMM!/bin/sh XCOMM -XCOMM $TOG: mergelib.cpp /main/5 1998/02/06 11:24:31 kaleb $ +XCOMM $Xorg: mergelib.cpp,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ XCOMM XCOMM Copyright (c) 1989, 1998 The Open Group XCOMM diff --git a/xc/config/util/mkdirhier.c b/xc/config/util/mkdirhier.c index 7b1aac11a..f456ba274 100644 --- a/xc/config/util/mkdirhier.c +++ b/xc/config/util/mkdirhier.c @@ -1,4 +1,4 @@ -/* $TOG: mkdirhier.c /main/3 1998/02/06 11:24:37 kaleb $ */ +/* $Xorg: mkdirhier.c,v 1.3 2000/08/17 19:41:53 cpqbld Exp $ */ /* Copyright (C) 1996, 1998 The Open Group diff --git a/xc/config/util/mkdirhier.man b/xc/config/util/mkdirhier.man index 26f9201fc..124e726b6 100644 --- a/xc/config/util/mkdirhier.man +++ b/xc/config/util/mkdirhier.man @@ -1,4 +1,4 @@ -.\" $TOG: mkdirhier.man /main/10 1998/02/06 11:24:42 kaleb $ +.\" $Xorg: mkdirhier.man,v 1.3 2000/08/17 19:41:53 cpqbld Exp $ .\" Copyright (c) 1993, 1994, 1998 The Open Group .\" .\" All Rights Reserved. @@ -18,7 +18,10 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from The .\" Open Group. -.TH MKDIRHIER 1 "Release 6.4" "X Version 11" +.\" +.\" $XFree86: xc/config/util/mkdirhier.man,v 1.2 2001/01/27 18:19:55 dawes Exp $ +.\" +.TH MKDIRHIER 1 __xorgversion__ .SH NAME mkdirhier \- makes a directory hierarchy .SH SYNOPSIS diff --git a/xc/config/util/mkdirhier.sh b/xc/config/util/mkdirhier.sh index 889094df7..17390f480 100755 --- a/xc/config/util/mkdirhier.sh +++ b/xc/config/util/mkdirhier.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $XConsortium: mkdirhier.sh,v 1.7 94/03/24 15:46:34 gildea Exp $ +# $Xorg: mkdirhier.sh,v 1.3 2000/08/17 19:41:53 cpqbld Exp $ # Courtesy of Paul Eggert newline=' diff --git a/xc/config/util/mkshadow/Imakefile b/xc/config/util/mkshadow/Imakefile index 38b061412..e8a879d97 100644 --- a/xc/config/util/mkshadow/Imakefile +++ b/xc/config/util/mkshadow/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XConsortium: Imakefile,v 1.1 94/04/13 18:44:40 rws Exp $ +XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:53 cpqbld Exp $ SRCS = mkshadow.c savedir.c wildmat.c OBJS = mkshadow.o savedir.o wildmat.o diff --git a/xc/config/util/mkshadow/mkshadow.c b/xc/config/util/mkshadow/mkshadow.c index 8bd998ac9..53ea8f1f1 100644 --- a/xc/config/util/mkshadow/mkshadow.c +++ b/xc/config/util/mkshadow/mkshadow.c @@ -1,4 +1,4 @@ -/* $XConsortium: mkshadow.c /main/2 1996/12/04 10:11:51 swick $ */ +/* $Xorg: mkshadow.c,v 1.3 2000/08/17 19:41:53 cpqbld Exp $ */ /* mkshadow.c - make a "shadow copy" of a directory tree with symlinks. Copyright 1990, 1993 Free Software Foundation, Inc. diff --git a/xc/config/util/mkshadow/savedir.c b/xc/config/util/mkshadow/savedir.c index 28ae884c0..27c6b1dd5 100644 --- a/xc/config/util/mkshadow/savedir.c +++ b/xc/config/util/mkshadow/savedir.c @@ -1,4 +1,4 @@ -/* $XConsortium: savedir.c,v 1.1 94/04/13 18:26:54 rws Exp $ */ +/* $Xorg: savedir.c,v 1.3 2000/08/17 19:41:53 cpqbld Exp $ */ /* savedir.c -- save the list of files in a directory in a string Copyright 1990, 1993 Free Software Foundation, Inc. diff --git a/xc/config/util/mkshadow/wildmat.c b/xc/config/util/mkshadow/wildmat.c index 2e408e902..8e0c179eb 100644 --- a/xc/config/util/mkshadow/wildmat.c +++ b/xc/config/util/mkshadow/wildmat.c @@ -1,4 +1,4 @@ -/* $XConsortium: wildmat.c,v 1.2 94/04/13 18:40:59 rws Exp $ */ +/* $Xorg: wildmat.c,v 1.3 2000/08/17 19:41:53 cpqbld Exp $ */ /* ** ** Do shell-style pattern matching for ?, \, [], and * characters. diff --git a/xc/config/util/revpath.man b/xc/config/util/revpath.man index a97f8f267..7d9cc94e2 100644 --- a/xc/config/util/revpath.man +++ b/xc/config/util/revpath.man @@ -1,5 +1,5 @@ -.\" $XFree86: xc/config/util/revpath.man,v 1.1 1999/01/03 03:58:14 dawes Exp $ -.TH REVPATH 1 "4.0" "XFree86" +.\" $XFree86: xc/config/util/revpath.man,v 1.2 2001/01/27 18:19:55 dawes Exp $ +.TH REVPATH 1 __vendorversion__ .SH NAME revpath \- generate a relative path that can be used to undo a change-directory .SH SYNOPSIS diff --git a/xc/config/util/xmkmf.cpp b/xc/config/util/xmkmf.cpp index 20546b916..7baf0ea36 100644 --- a/xc/config/util/xmkmf.cpp +++ b/xc/config/util/xmkmf.cpp @@ -1,10 +1,10 @@ XCOMM!/bin/sh -XCOMM $XFree86: xc/config/util/xmkmf.cpp,v 1.3 2000/11/06 21:57:10 dawes Exp $ +XCOMM $XFree86: xc/config/util/xmkmf.cpp,v 1.4 2001/01/17 16:39:02 dawes Exp $ XCOMM XCOMM make a Makefile from an Imakefile from inside or outside the sources XCOMM -XCOMM $XConsortium: xmkmf.cpp /main/22 1996/09/28 16:17:05 rws $ +XCOMM $Xorg: xmkmf.cpp,v 1.3 2000/08/17 19:41:53 cpqbld Exp $ usage="usage: $0 [-a] [top_of_sources_pathname [current_directory]]" diff --git a/xc/config/util/xmkmf.man b/xc/config/util/xmkmf.man index fe3092fc7..b9dcc68f7 100644 --- a/xc/config/util/xmkmf.man +++ b/xc/config/util/xmkmf.man @@ -1,4 +1,4 @@ -.\" $TOG: xmkmf.man /main/9 1998/02/06 11:25:04 kaleb $ +.\" $Xorg: xmkmf.man,v 1.3 2000/08/17 19:41:53 cpqbld Exp $ .\" Copyright (c) 1993, 1994, 1998 The Open Group .\" .\" All Rights Reserved. @@ -18,7 +18,10 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from The .\" Open Group. -.TH XMKMF 1 "Release 6.4" "X Version 11" +.\" +.\" $XFree86: xc/config/util/xmkmf.man,v 1.2 2001/01/27 18:19:55 dawes Exp $ +.\" +.TH XMKMF 1 __xorgversion__ .SH NAME xmkmf \- create a Makefile from an Imakefile .SH SYNOPSIS |