diff options
Diffstat (limited to 'xc/config')
47 files changed, 1079 insertions, 541 deletions
diff --git a/xc/config/Imakefile b/xc/config/Imakefile index fc3db9c95..7ba4559f8 100644 --- a/xc/config/Imakefile +++ b/xc/config/Imakefile @@ -1,5 +1,5 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:45 cpqbld Exp $ -XCOMM $XFree86: xc/config/Imakefile,v 1.3.2.1 2001/05/31 22:20:18 dawes Exp $ +XCOMM $XFree86: xc/config/Imakefile,v 1.4 2001/05/31 18:47:04 dawes Exp $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" diff --git a/xc/config/cf/FreeBSD.cf b/xc/config/cf/FreeBSD.cf index 03ef7ea4c..330cc507c 100644 --- a/xc/config/cf/FreeBSD.cf +++ b/xc/config/cf/FreeBSD.cf @@ -2,7 +2,7 @@ XCOMM platform: $Xorg: FreeBSD.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $ XCOMM XCOMM XCOMM -XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.109 2001/05/03 20:12:35 alanh Exp $ +XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.110 2001/08/16 14:33:44 dawes Exp $ #ifndef UseElfFormat #define UseElfFormat DefaultToElfFormat @@ -507,6 +507,25 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #define PamLibraries -lpam DlLibrary #endif +/* + * On FreeBSD, the run-time loader will use the built-in "rpath" before + * LD_LIBRARY_PATH. This means that utilities like mkfontdir will load + * installed libraries (if they exist) in preference to the ones in the + * build tree, even though LD_LIBRARY_PATH points to the build tree. + * This can result in the build failing. One way to avoid this is to + * pre-load the libraries from the build tree. + * + * There should be a better way than this hack... + */ +#if UseElfFormat +#ifndef PreloadFontSetup +#define PreloadFontSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo libXfont*.so.?)`" +#endif +#ifndef PreloadSetup +#define PreloadSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo lib[A-f]*.so.? | grep -v Xfont)`" +#endif +#endif + #ifndef HasCookieMaker /* Which versions have /dev/urandom? */ #if OSMajorVersion >= 4 diff --git a/xc/config/cf/Imake.cf b/xc/config/cf/Imake.cf index 08270fe2e..dd1afacd6 100644 --- a/xc/config/cf/Imake.cf +++ b/xc/config/cf/Imake.cf @@ -17,7 +17,7 @@ XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $ * * 4. Create a .cf file with the name given by MacroFile. */ -XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.67 2001/04/18 17:13:58 dawes Exp $ +XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.70 2001/08/14 21:53:53 tsi Exp $ #if defined(__APPLE__) # undef __APPLE__ @@ -760,10 +760,45 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686 # undef MIPSEL # undef _MIPSEL # endif +# ifdef __sh__ +# ifndef SuperHArchitecture +# define SuperHArchitecture +# endif +# ifdef __BIG_ENDIAN__ +# ifndef SuperHebArchitecture +# define SuperHebArchitecture +# endif +# endif +# undef __sh__ +# endif /* __sh__ */ +# if defined(__SH3__) || defined(__sh3__) +# ifndef SuperH3Architecture +# define SuperH3Architecture +# endif +# undef __SH3__ +# undef __sh3__ +# endif /* __SH3__ or __sh3__ */ +# ifdef __SH4__ +# ifdef __SH4_NOFPU__ +# ifndef SuperH4NOFPUArchitecture +# define SuperH4NOFPUArchitecture +# endif +# undef __SH4_NOFPU__ +# else +# ifndef SuperH4Architecture +# define SuperH4Architecture +# endif +# endif +# undef __SH4__ +# endif /* __SH4__ */ XCOMM for compatibility with 3.3.x # ifdef PpcArchitecture # define PowerPCArchitecture # endif +# if defined(__s390x__) +# define s390xArchitecture +# undef __s390x__ +# endif #endif /* linux */ #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc)) diff --git a/xc/config/cf/Imake.rules b/xc/config/cf/Imake.rules index d6b3822a3..d8f0a6cb9 100644 --- a/xc/config/cf/Imake.rules +++ b/xc/config/cf/Imake.rules @@ -5,7 +5,7 @@ XCOMM XCOMM XCOMM XCOMM -XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.94 2001/04/26 21:27:48 dawes Exp $ +XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.100 2001/08/09 20:34:05 dawes Exp $ /* * MACHINE-INDEPENDENT RULES; DO NOT MODIFY @@ -25,6 +25,7 @@ XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.94 2001/04/26 21:27:48 dawe * _MUse (a,b) * _MUseCat (a,b,c) * ProgramTargetName (target) + * HostProgramTargetName (target) * RunProgram (progvar,options) * RunProgramWithSetup (setup,progvar,options) * RemoveFile (file) @@ -311,6 +312,10 @@ XCOMM special target for clearmake @@\ #define ProgramTargetName(target)target #endif +#ifndef HostProgramTargetName +#define HostProgramTargetName(target)target +#endif + #ifndef RunProgram #define RunProgram(progvar,options) $(progvar) options #endif @@ -510,8 +515,14 @@ clean cleantc:: @@\ #endif /* RemoveTargetProgram */ #ifndef MakeDir -#define MakeDir(dir) DirFailPrefix@if [ -d dir ]; then set +x; \ @@\ - else (set -x; $(MKDIRHIER) dir); fi +#define MakeDir(dir) DirFailPrefix@if [ -d dir ]; then \ @@\ + set +x; \ @@\ + else \ @@\ + if [ -h dir ]; then \ @@\ + (set -x; rm -f dir); \ @@\ + fi; \ @@\ + (set -x; $(MKDIRHIER) dir); \ @@\ + fi #endif /* MakeDir */ #ifndef BuildIncludesTop @@ -1615,6 +1626,15 @@ step:: list @@\ * * Since the link is used in the installation process, we need to * make the link relative in order to honor $(DESTDIR) if it is set. + * + * Note: The sed script used here is not completely general. It assumes + * that no elements of the path are '..', and that none start with '.' + * that aren't just '.'. + * + * For a more general solution $(REVPATH) could be used. Even though + * it was intended for something a little different, it does do what is + * required here. + * */ #ifndef LinkConfDirectoryLong #if UseSeparateConfDir && HasSymLinks @@ -1625,7 +1645,7 @@ install:: @@\ @MakeFlagsToShellFlags(i,set +e); \ @@\ if [ -d Concat($(DESTDIR),opath/cdir) ]; then \ @@\ RELPATH=`echo opath/cdir | \ @@\ - sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\ + sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ @@\ cd Concat($(DESTDIR),opath/cdir); \ @@\ if [ -d rdir -a ! -h rdir ]; then \ @@\ (cd rdir; tar cf - . | \ @@\ @@ -3167,7 +3187,8 @@ AllTarget(name.$(MANNEWSUFFIX)) @@\ @@\ name.$(MANNEWSUFFIX): name.$(MANSRCSUFFIX) @@\ RemoveFile($@) @@\ - $(LN) name.$(MANSRCSUFFIX) $@ @@\ + cd `dirname name` && \ @@\ + $(LN) `basename name.$(MANSRCSUFFIX)` `basename $@` @@\ @@\ clean:: @@\ RemoveFile(name.$(MANNEWSUFFIX)) diff --git a/xc/config/cf/Imake.tmpl b/xc/config/cf/Imake.tmpl index 98c022d43..2561c9896 100644 --- a/xc/config/cf/Imake.tmpl +++ b/xc/config/cf/Imake.tmpl @@ -5,7 +5,7 @@ XCOMM XCOMM XCOMM XCOMM -XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.102 2001/04/26 21:09:38 dawes Exp $ +XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.105 2001/08/06 20:51:00 dawes Exp $ XCOMM ---------------------------------------------------------------------- /* @@ -400,10 +400,18 @@ XCOMM the platform-specific parameters - edit site.def to change #define ByteOrder X_BIG_ENDIAN #elif defined(Mc88000Architecture) #define ByteOrder X_BIG_ENDIAN +#elif defined(s390Architecture) +#define ByteOrder X_BIG_ENDIAN +#elif defined(s390xArchitecture) +#define ByteOrder X_BIG_ENDIAN #elif defined(Arm32Architecture) #define ByteOrder X_LITTLE_ENDIAN #elif defined(PpcArchitecture) #define ByteOrder X_BIG_ENDIAN +#elif defined(SuperHArchitecture) +#define ByteOrder X_LITTLE_ENDIAN +#elif defined(SuperHebArchitecture) +#define ByteOrder X_BIG_ENDIAN #endif #endif /* ByteOrder */ #ifndef HasFortran @@ -1118,7 +1126,7 @@ TCLIBDIR = TclLibDir #define NeedModuleRanlib NO #endif #ifndef ModuleRanlibCmd -#define ModuleRanlibCmd /*won't be used unless NeedModuleRanlib is YES*/ +#define ModuleRanlibCmd RanlibCmd #endif #ifndef StandardIncludes /* for platform-specifics */ diff --git a/xc/config/cf/Library.tmpl b/xc/config/cf/Library.tmpl index 656ed84cd..60e5db952 100644 --- a/xc/config/cf/Library.tmpl +++ b/xc/config/cf/Library.tmpl @@ -19,7 +19,7 @@ XCOMM $Xorg: Library.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.13 2001/01/17 16:22:30 dawes Exp $ +XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.14 2001/07/25 14:30:03 alanh Exp $ #ifndef LibraryCplusplusOptions # if DoSharedLib && defined(SharedLibraryCplusplusOptions) @@ -302,13 +302,14 @@ CenterLoadTarget(debug_src,basename.SRCsuf,NullParameter,$(ALLDEFINES) options) #ifndef MakeStringsDependency # define MakeStringsDependency @@\ MAKESTRS = $(CONFIGSRC)/util/makestrs @@\ -NoCmpScript(ProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf) @@\ +NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf) @@\ @@\ -ProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf: @@\ - cd $(CONFIGSRC)/util && $(MAKE) ProgramTargetName(makestrs) @@\ +HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf: @@\ + cd $(CONFIGSRC)/util && $(MAKE) HostProgramTargetName(makestrs) @@\ @@\ -includes:: ProgramTargetName($(MAKESTRS)) +includes:: HostProgramTargetName($(MAKESTRS)) #endif + #ifndef ToolkitMakeStrings # if defined(LibTookitMakeStringsDependency) && LibTookitMakeStringsDependency # define ToolkitMakeStrings(files,source,options,depends,dest) @@\ diff --git a/xc/config/cf/OpenBSD.cf b/xc/config/cf/OpenBSD.cf index d4411f2a2..f1de8ea68 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.54 2001/04/22 16:28:18 herrb Exp $ +XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.55 2001/08/15 19:01:03 herrb Exp $ XCOMM #ifndef OSName @@ -581,33 +581,35 @@ install:: fonts.alias @@\ # endif # ifndef XF86Server -# define XF86Server NO +# define XF86Server YES # endif /* Definitions for building the XFree86 server */ # if XF86Server # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT # define ServerExtraDefines GccGasOption XFree86ServerDefines -# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 8) -# ifndef DoLoadableServer -# define DoLoadableServer YES -# endif -# define DevelDrivers cirrus ati - /* Support for USB Mices */ -# define UsbMouseSupport YES -# include <xfree86.cf> - -# else /* 2.7 and earlier */ -# include <xf86.rules> -# ifndef BuildServer -# define BuildServer NO -# endif +# ifndef DoLoadableServer +# define DoLoadableServer YES +# endif +# ifndef XF86CardDrivers +# define XF86CardDrivers ati mga glint s3virge sis savage\ + trident chips tdfx \ + DevelDrivers vga \ + XF86OSCardDrivers XF86ExtraCardDrivers +# endif +# ifndef DevelDrivers +# define DevelDrivers nv +# endif -# define HasSharedLibraries NO -# define BuildDynamicLoading NO + /* Support for USB Mices */ +# ifndef UsbMouseSupport +# define UsbMouseSupport YES # endif + # endif /* XF86Server */ +# include <xfree86.cf> + #endif /* PpcArchitecture */ /* diff --git a/xc/config/cf/README b/xc/config/cf/README index 2d884caaa..8b23214bb 100644 --- a/xc/config/cf/README +++ b/xc/config/cf/README @@ -3,7 +3,7 @@ $Xorg: README,v 1.4 2000/08/18 04:03:58 coskrey Exp $ -$XFree86: xc/config/cf/README,v 1.13 2001/01/17 16:22:30 dawes Exp $ +$XFree86: xc/config/cf/README,v 1.14 2001/05/24 16:34:49 dawes Exp $ The easiest way to write an Imakefile is to find another one that does something similar and copy/modify it! @@ -446,6 +446,16 @@ An <os>Lib.tmpl file provides defaults for the following variables: SharedDtMrmReqs required libs for libDtMrm.so SharedDtMrmRev version number for libDtMrm.so +Vendor.cf files and/or site/host specific .def files may define the +following variables: + + ProjectRoot The directory under which the installation + will operate. This value will be hard coded + into some programs. As a result do not use it + to specify the installation directory for a + cross compiled system, use DESTDIR to + accomplish that task. + The following variables are used by some part of the tree: AckToolset programs/Xserver/hw/xfree86 @@ -546,7 +556,9 @@ Variables that can be set on the make command line: DESTDIR directory under which "make install" should install instead of "/"; used only for testing - "make install" rules. + "make install" rules, binary package building, + and specifying alternative installation directories + for cross compiles. FILE file for "lint1" target to run lint on. CDEBUGFLAGS -g and/or -O flag to control C compiler optimization. CXXDEBUGFLAGS -g and/or -O flag to control C++ optimization. diff --git a/xc/config/cf/X11.tmpl b/xc/config/cf/X11.tmpl index 31141da0a..aaea1ef6c 100644 --- a/xc/config/cf/X11.tmpl +++ b/xc/config/cf/X11.tmpl @@ -5,7 +5,7 @@ XCOMM XCOMM XCOMM XCOMM -XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.115.2.3 2001/06/01 02:24:14 dawes Exp $ +XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.125 2001/08/17 22:08:09 tsi Exp $ /*************************************************************************** * * @@ -286,6 +286,22 @@ VENDORMANVERSION = XVendorManVersionString #ifndef BuildFontCacheLib #define BuildFontCacheLib (BuildFontCache && !BuildServersOnly) #endif +#ifndef BuildFontEncLib +#define BuildFontEncLib BuildLibraries +#endif +/* + * This enables binary compatibility with the older (XFree86 <= 4.1) fontenc + * entry points in the Xfont library (and X server). If this is turned off, + * then SharedFontRev should have it's major revision bumped, and the + * XFree86 font module ABI (in xfree86/common/xf86Module.h) should have it's + * major revision bumped. + * + * Note: this does not enable those older functions in the separate libfontenc + * library (which didn't exist previously). + */ +#ifndef FontencCompatibility +#define FontencCompatibility YES +#endif #ifndef BuildLowMem #define BuildLowMem NO #endif @@ -415,6 +431,9 @@ VENDORMANVERSION = XVendorManVersionString #ifndef BuildGLULibrary #define BuildGLULibrary (BuildGLXLibrary && HasCplusplus) #endif +#ifndef BuildGLwLibrary +#define BuildGLwLibrary (BuildGlxExt || BuildGLXLibrary) +#endif #ifndef BuildXF86RushExt #define BuildXF86RushExt NO #endif @@ -452,6 +471,13 @@ VENDORMANVERSION = XVendorManVersionString #define BuildFreetype2Library (UseFreetype2 && !HasFreetype2) #endif +#ifndef BuildRandR +#define BuildRandR NO +#endif +#ifndef BuildRandRLibrary +#define BuildRandRLibrary !BuildServersOnly +#endif + #ifndef BuildMiscDocs #define BuildMiscDocs NO #endif @@ -899,6 +925,14 @@ FCHOWN_DEFINES = -DHAS_FCHOWN #endif #endif +#ifndef RandRDefines +#if BuildRandR +#define RandRDefines -DRANDR +#else +#define RandRDefines /**/ +#endif +#endif + #ifndef FontCacheExtentionDefines #if BuildFontCache #define FontCacheExtensionDefines -DFONTCACHE @@ -916,7 +950,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN XCSecurityDefines CupDefines PervasiveDBEDefines \ XF86BigfontExtensionDefines DPMSDefines \ LowMemDefines XprintDefines XineramaDefines \ - SitePervasiveExtensionDefines RenderDefines + SitePervasiveExtensionDefines RenderDefines RandRDefines #endif #ifndef SiteExtensionDefines #define SiteExtensionDefines /**/ @@ -1355,9 +1389,9 @@ XCOMM X Window System make variables; these need to be coordinated with rules UCSMAPPREFIX = $(FONTDIR)/util/map- #else RGB = $(CLIENTENVSETUP) $(XBUILDBINDIR)/rgb - FONTC = $(CLIENTENVSETUP) $(XBUILDBINDIR)/bdftopcf - MKFONTDIR = $(CLIENTENVSETUP) $(XBUILDBINDIR)/mkfontdir - XFTCACHE = $(CLIENTENVSETUP) XFT_CONFIG=$(XFTLIBSRC)/XftConfig $(XBUILDBINDIR)/xftcache + FONTC = $(CLIENTENVSETUP) $(PRELOADFONTSETUP) $(XBUILDBINDIR)/bdftopcf + MKFONTDIR = $(CLIENTENVSETUP) $(PRELOADFONTSETUP) $(XBUILDBINDIR)/mkfontdir + XFTCACHE = $(CLIENTENVSETUP) $(PRELOADSETUP) XFT_CONFIG=$(XFTLIBSRC)/XftConfig $(XBUILDBINDIR)/xftcache #if HasPerl MKHTMLINDEX = RunPerlScript($(CONFIGSRC)/util/mkhtmlindex.pl,) #else @@ -1423,6 +1457,13 @@ XCOMM X Window System make variables; these need to be coordinated with rules CLIENTENVSETUP = #endif +#ifdef PreloadSetup + PRELOADSETUP = PreloadSetup +#endif +#ifdef PreloadFontSetup + PRELOADFONTSETUP = PreloadFontSetup +#endif + #ifndef ShLibIncludeFile /* need this to make ANSI-style preprocessors happy */ #define ShLibIncludeFile <noop.rules> @@ -1647,6 +1688,21 @@ ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir) #endif #endif +#if BuildRandRLibrary +#ifndef SharedLibXrandr +#define SharedLibXrandr HasSharedLibraries +#endif +#ifndef NormalLibXrandr +#define NormalLibXrandr YES +#endif +#ifndef DebugLibXrandr +#define DebugLibXrandr NO +#endif +#ifndef ProfileLibXrandr +#define ProfileLibXrandr NO +#endif +#endif + #if BuildGLULibrary #ifndef SharedLibGlu #define SharedLibGlu HasSharedLibraries @@ -1908,6 +1964,18 @@ ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir) #endif #endif +#if BuildRandRLibrary + XRANDRRLIBSRC = $(LIBSRC)/Xrandr +#if SharedLibXrandr +#ifndef SharedXrandrRev +#define SharedXrandrRev 1.0 +#endif +SharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev) +#else +ProjectUnsharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),XBuildLibDir) +#endif +#endif + #if BuildFontCacheLib # ifndef SharedLibXfontcache # define SharedLibXfontcache NO @@ -2371,7 +2439,7 @@ ProjectUnsharedLibReferences(FS,FS,$(FSLIBSRC),XBuildLibDir) FONTLIBSRC = $(LIBSRC)/font #if SharedLibFont #ifndef SharedFontRev -#define SharedFontRev 1.3 +#define SharedFontRev 1.4 #endif SharedFontLibReferences() XCOMM SharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),SOFONTREV,SharedFontRev) @@ -2385,6 +2453,29 @@ ProjectUnsharedLibReferences(FONTSTUB,fntstubs,$(FONTSUBLIBSRC),XBuildLibDir) DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) + +#ifndef SharedLibFontEnc +#define SharedLibFontEnc NO +#endif +#ifndef NormalLibFontEnc +#define NormalLibFontEnc (!SharedLibFont | ForceNormalLib) +#endif +#ifndef DebugLibFontEnc +#define DebugLibFontEnc NO /* debugged fontenc library */ +#endif +#ifndef ProfileLibFontEnc +#define ProfileLibFontEnc NO /* profiled fontenc library */ +#endif + FONTENCLIBSRC = $(LIBSRC)/fontenc +#if SharedLibFontEnc +#ifndef SharedFontEncRev +#define SharedFontEncRev 1.0 +#endif +SharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),SOFONTENCREV,SharedFontEncRev) +#else +ProjectUnsharedLibReferences(XFONTENC,fontenc,$(FONTENCLIBSRC),XBuildLibDir) +#endif + #ifndef SharedLibXpm #define SharedLibXpm HasSharedLibraries #endif @@ -2476,7 +2567,7 @@ FREETYPE2DEFINES = -DFREETYPE2 XFTLIBSRC = $(LIBSRC)/Xft #if SharedLibXft #ifndef SharedXftRev -#define SharedXftRev 1.0 +#define SharedXftRev 1.1 #endif SharedLibReferences(XFT,Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev) #else @@ -2530,7 +2621,7 @@ ProjectUnsharedLibReferences(XKBFILE,xkbfile,$(XKBFILELIBSRC),XBuildLibDir) XKBCOMPCMD = $(BINDIR)/XkbComp #else XKBCOMPSRC = $(PROGRAMSRC)/XkbComp - XKBCOMPCMD = $(CLIENTENVSETUP) $(XBUILDBINDIR)/XkbComp + XKBCOMPCMD = $(CLIENTENVSETUP) $(PRELOADSETUP) $(XBUILDBINDIR)/XkbComp #endif #else /* !BuildXKBlib */ #ifndef XkbClientDepLibs @@ -2830,7 +2921,7 @@ encodings.dir: deplist @@\ @(E=; for i in dirlist; do \ @@\ E="$$E -e $$i"; done; \ @@\ set -x; \ @@\ - RunProgram(MKFONTDIR, -r -p inst/ $$E .)) @@\ + RunProgram(MKFONTDIR, -n -r -p inst/ $$E .)) @@\ @@\ clean:: @@\ RemoveFiles(fonts.dir encodings.dir) diff --git a/xc/config/cf/bsdLib.rules b/xc/config/cf/bsdLib.rules index d4a838878..1cdf97f65 100644 --- a/xc/config/cf/bsdLib.rules +++ b/xc/config/cf/bsdLib.rules @@ -4,7 +4,7 @@ XCOMM $Xorg: bsdLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/bsdLib.rules,v 3.15.2.1 2001/05/24 16:35:38 dawes Exp $ +XCOMM $XFree86: xc/config/cf/bsdLib.rules,v 3.16 2001/05/24 16:34:49 dawes Exp $ /* * NetBSD/FreeBSD shared library rules */ diff --git a/xc/config/cf/bsdLib.tmpl b/xc/config/cf/bsdLib.tmpl index e60448927..96d28f905 100644 --- a/xc/config/cf/bsdLib.tmpl +++ b/xc/config/cf/bsdLib.tmpl @@ -1,5 +1,5 @@ XCOMM $Xorg: bsdLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.8.2.1 2001/05/24 16:35:38 dawes Exp $ +XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.9 2001/05/24 16:34:49 dawes Exp $ /* * NetBSD/FreeBSD/OpenBSD shared library template diff --git a/xc/config/cf/cross.rules b/xc/config/cf/cross.rules index 91859ed5a..703dd774a 100644 --- a/xc/config/cf/cross.rules +++ b/xc/config/cf/cross.rules @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/cross.rules,v 1.2 2000/12/09 03:33:18 dawes Exp $ +XCOMM $XFree86: xc/config/cf/cross.rules,v 1.3 2001/06/25 08:12:30 alanh Exp $ #define HostLinkRule(target, flags, src, libs) cc -I$(BUILDINCDIR) -o target src @@ -13,9 +13,9 @@ XCOMM $XFree86: xc/config/cf/cross.rules,v 1.2 2000/12/09 03:33:18 dawes Exp $ EXTRA_LOAD_FLAGS= @@\ PROGRAM = program @@\ @@\ -AllTarget(program) @@\ +AllTarget(HostProgramTargetName(program)) @@\ @@\ -program: $(OBJS) $(DEPLIBS) @@\ +HostProgramTargetName(program): $(OBJS) $(DEPLIBS) @@\ RemoveTargetProgram($@) @@\ HostLinkRule($@,$(_NOOP_),$(OBJS),$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\ @@\ @@ -24,7 +24,7 @@ DependTarget() @@\ LintTarget() @@\ @@\ clean:: @@\ - RemoveFile(ProgramTargetName(program)) + RemoveFile(HostProgramTargetName(program)) #endif /* ComplexHostProgramTarget */ #ifndef SimpleHostProgramTarget @@ -37,9 +37,9 @@ clean:: @@\ EXTRA_LOAD_FLAGS= @@\ PROGRAM = program @@\ @@\ -AllTarget(program) @@\ +AllTarget(HostProgramTargetName(program)) @@\ @@\ -program: program.o $(DEPLIBS) @@\ +HostProgramTargetName(program): program.o $(DEPLIBS) @@\ RemoveTargetProgram($@) @@\ HostLinkRule($@,$(_NOOP_),program.o,$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\ @@\ @@ -48,5 +48,5 @@ DependTarget() @@\ LintTarget() @@\ @@\ clean:: @@\ - RemoveFile(ProgramTargetName(program)) + RemoveFile(HostProgramTargetName(program)) #endif /* SimpleHostProgramTarget */ diff --git a/xc/config/cf/cygwin.cf b/xc/config/cf/cygwin.cf index ff48187e0..3d4472688 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.16.2.1 2001/05/30 14:29:27 alanh Exp $ +XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.26 2001/08/03 23:43:37 alanh Exp $ #ifndef OSName #define OSName Cygwin @@ -13,10 +13,10 @@ XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.16.2.1 2001/05/30 14:29:27 #define OSMinorVersion 3 #endif #ifndef OSTeenyVersion -#define OSTeenyVersion 1 +#define OSTeenyVersion 2 #endif -#define ProjectRoot /usr/X11R6 +#define ProjectRoot /usr/X11R6 #define BuildServer YES @@ -28,7 +28,10 @@ XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.16.2.1 2001/05/30 14:29:27 #define GccUsesGas YES #define UseGas YES #define GnuCpp YES + +#if !CrossCompiling #define BootstrapCFlags -L/lib/automode.o +#endif #define HasShadowPasswd NO #define HasLibCrypt YES @@ -56,8 +59,17 @@ XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.16.2.1 2001/05/30 14:29:27 #define HasSockets YES #define GzipFontCompression YES #define HasZlib YES +#define GzipLibrary -lz.dll + +/* We don't need -lm */ +#define MathLibrary /**/ + +/* + * /lib/libtermcap.a doesn't have tgetent, which is needed for + * xc/programs/xterm/resize.exe + */ +#define TermcapLibrary -lncurses.dll -#define SharedLibFont NO #define AvoidNullMakeCommand YES #define StripInstalledPrograms NO #define CompressAllFonts YES @@ -71,7 +83,7 @@ XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.16.2.1 2001/05/30 14:29:27 #define ExpandManNames NO #define HasDlopen NO #define HasGnuMake YES -#define UseGccMakeDepend YES +#define UseGccMakeDepend NO /* * This options may depend on the state of POSIX thread @@ -81,32 +93,51 @@ XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.16.2.1 2001/05/30 14:29:27 #define HasThreadSafeAPI NO #define LnCmd ln -s +#ifndef CcCmd #define CcCmd gcc -#define CpluplusCmd c++ -fpermissive +#endif /* CcCmd */ +#ifndef CplusplusCmd +#define CplusplusCmd g++ +#endif /* CplusplusCmd */ +#ifndef AsCmd #define AsCmd as +#endif /* AsCmd */ #define GccGasOption -DGCCUSESGAS #define AsmDefines -DUSE_GAS -DGCCUSESGAS +#ifndef LdCmd #define LdCmd ld +#endif /* LdCmd */ #define MkdirHierCmd mkdir -p +#ifndef CppCmd #define CppCmd cpp +#endif /* CppCmd */ +#ifndef YaccCmd #define YaccCmd byacc +#endif /* YaccCmd */ #define LexCmd flex -l #define LexLib -lfl #define HasFlex YES #define PreProcessCmd CcCmd -E -#define StdIncDir `CcCmd --print-libgcc-file-name | sed 's,\\\\,/,g' | sed 's,libgcc.a,../../../../i686-pc-cygwin/include,'` - +#ifndef PostIncDir #define PostIncDir `CcCmd --print-libgcc-file-name | sed 's,\\\\,/,g' | sed 's,libgcc.a,include,'` +#endif #define LdCombineFlags -r +/* We don't define -ansi yet as newlib (which is cygwin's library) doesn't + * define some needed prototypes when -ansi is set, when that's fixed + * we can remove these lines and use the default XFree86 options. */ +#ifndef DefaultCCOptions +# define DefaultCCOptions /* -ansi -pedantic */ GccWarningOptions +#endif + # ifndef OptimizedCDebugFlags # define OptimizedCDebugFlags DefaultGcc2i386Opt # endif -#define StandardDefines -D__i386__ -DWIN32_LEAN_AND_MEAN -DX_LOCALE -D_X86_ -D__STDC__ -DNO_TCP_H -D__CYGWIN__ -D_XOPEN_SOURCE -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE -DX_SOURCE +#define StandardDefines -D__i386__ -DWIN32_LEAN_AND_MEAN -DX_LOCALE -D_X86_ -D__STDC__ -DNO_TCP_H -D__CYGWIN__ -D_XOPEN_SOURCE -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #define HasWChar32 YES @@ -116,14 +147,14 @@ XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.16.2.1 2001/05/30 14:29:27 #else # define StandardCppDefines StandardDefines #endif -#define ServerOSDefines XFree86ServerDefines -DDDXTIME -DFD_SETSIZE=256 -DDXOSINIT +#define ServerOSDefines XFree86ServerDefines -DDDXTIME -DFD_SETSIZE=256 -DDDXOSINIT #define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #define ConnectionFlags -DTCPCONN -DUNIXCONN #define ExtraLibraries #define InstUidFlags -m 4711 -#define UseRgbTxt YES -#define ExtraFilesToClean *.obj *.orig *.rej junk.c *.exe *.dll *.lib *~ +#define UseRgbTxt YES +#define ExtraFilesToClean *.obj *.orig *.rej junk.c *.exe *.dll *.lib *~ /* * You'll probably want BuildDebug to be YES if you are debugging :) @@ -167,12 +198,13 @@ XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.16.2.1 2001/05/30 14:29:27 #define BuildGlxExt YES #define BuildXInputExt YES #define BuildXF86VidModeExt YES -#define BuildXF86DGA NO +#define BuildXF86DGA NO /* No direct access to hardware */ #define BuildXvExt YES -#define BuildXF86MiscExt YES +#define BuildXF86MiscExt NO #define BuildRender YES -#define BuildXF86DRI NO -#define BuildXF86DRM NO +#define BuildRandR YES +#define BuildXF86DRI NO /* No direct access to hardware */ +#define BuildXF86DRM NO /* No direct access to hardware */ #define BuildXKB YES #define BuildXCMiscExt YES #define BuildTestExt YES @@ -189,7 +221,7 @@ XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.16.2.1 2001/05/30 14:29:27 #define BuildXCSecurity YES #define BuildAppgroup YES #define BuildShapeExt YES -#define BuildScanpci NO +#define BuildScanpci NO /* No direct access to hardware */ #define BuildScreenSaverExt NO @@ -239,6 +271,12 @@ XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.16.2.1 2001/05/30 14:29:27 #define XF86CardDrivers /**/ + +/* + * These man rules were ganked from linux.cf, verbatim. + * I am not convinced that we need them. + */ +#if 0 /* Some of these man page defaults are overriden in the above OS sections */ #ifndef ManSuffix # define ManSuffix 1x @@ -258,10 +296,9 @@ XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.16.2.1 2001/05/30 14:29:27 #ifndef FileManDir # define FileManDir $(MANSOURCEPATH)5 #endif +#endif -/* we don't need -lm */ -#define MathLibrary /**/ -#define TermcapLibrary -ltermcap +/* Server build rules */ #define XnestServer YES #define BuildXprint YES #define XprtServer YES @@ -269,12 +306,15 @@ XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.16.2.1 2001/05/30 14:29:27 #define XWinServer YES /* - * Why we don't use the smart scheduler? + * 2001-06-19 - SmartScheduler is terribly slow on Cygwin. It causes + * visible delays in updating of windows, cursor position, etc. */ #define UseSmartScheduler NO -/* --unix option of cygwin make fools the standard MakeFlagsToShellFlags macro */ -#define MakeFlagsToShellFlags(makeflags,shellcmd)\ +/* + * --unix option of Cygwin make fools the standard MakeFlagsToShellFlags macro + */ +#define MakeFlagsToShellFlags(makeflags,shellcmd) \ for flag in ${MAKEFLAGS} ''; do \ @@\ case "$$flag" in *=*) ;;--*) ;; *[makeflags]*) shellcmd;; esac; done diff --git a/xc/config/cf/cygwin.rules b/xc/config/cf/cygwin.rules index fae4486c4..66f230319 100644 --- a/xc/config/cf/cygwin.rules +++ b/xc/config/cf/cygwin.rules @@ -1,41 +1,35 @@ -XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.5 2001/04/27 12:32:42 alanh Exp $ - -#define CPPOnlyAsm(basename,options) RemoveFile(basename.i) @@\ - $(CPP) AsmDefines $(DEFINES) $(INCLUDES) options basename.S | grep -v '^\#' > basename.i - - +XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.13 2001/08/18 17:25:48 alanh Exp $ /* * Cygwin shared library rules (DLL versions) */ -#define HasSharedLibraries YES -#define NeedLibInsideFlag YES -#define ForceNormalLib NO -#define SharedLibXaw NO -#define SharedLibXmu NO -#define SharedLibXt NO -#define SharedLibSM YES -#define SharedLibICE YES -#define SharedLibXext YES -#define SharedLibXie YES -#define SharedLibXi YES -#define SharedLibPex YES -#define SharedLibXtst YES -#define SharedOldX YES -#define SharedLibXp YES -#define SharedLibGL YES -#define SharedLibXpm YES -#define SharedLibFont NO -#define SharedLibXaw6 NO -#define SharedLibgetsurf NO -#define SharedLibDps YES -#define SharedLibDpsTk YES -#define NormalLibGlu YES -#define SharedLibGlu YES +#define HasSharedLibraries YES +#define NeedLibInsideFlag YES +#define ForceNormalLib NO +#define SharedLibXaw NO +#define SharedLibXmu NO +#define SharedLibXt NO +#define SharedLibSM YES +#define SharedLibICE YES +#define SharedLibXext YES +#define SharedLibXie YES +#define SharedLibXi YES +#define SharedLibPex YES +#define SharedLibXtst YES +#define SharedOldX YES +#define SharedLibXp YES +#define SharedLibGlx YES +#define SharedLibFont NO +#define SharedLibXaw6 NO +#define SharedLibgetsurf NO +#define SharedLibDps YES +#define SharedLibDpsTk YES +#define SharedLibGlu YES #ifndef SharedDataSeparation -#define SharedDataSeparation NO +#define SharedDataSeparation NO #endif + #ifndef SharedCodeDef #define SharedCodeDef /**/ #endif @@ -58,25 +52,62 @@ XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.5 2001/04/27 12:32:42 alanh Exp $ #define UseExportLists YES #endif + /* * SharedDepLibraryTarget - generate rules to create a shared library. */ + #ifndef SharedDepLibraryTarget -#ifdef UseInstalled -#ifndef LinkBuildSonameLibrary -#define LinkBuildSonameLibrary(lib) -#endif -#else -#ifndef LinkBuildSonameLibrary -#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \ +# ifdef UseInstalled +# ifndef LinkBuildSonameLibrary +# define LinkBuildSonameLibrary(lib) +# endif +# else /* !UseInstalled */ +# ifndef LinkBuildSonameLibrary +# define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); @@\ cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .) -#endif -#endif +# endif +# endif /* UseInstalled */ + + +/* + * SharedDepLibraryTarget + */ #define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\ -SharedLibraryTarget(libname,rev,solist,down,up) +AllTarget(Concat3(lib,libname,.dll)) @@\ + @@\ +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(HINSTANCE a, DWORD reason, void *q)" >>junk.c @@\ + echo "{ return 1; }" >>junk.c @@\ + @@\ +Concat3(lib,libname,.dll): deplist junk.o libname.def @@\ + RemoveFile(LibraryTargetName(libname)) @@\ + RemoveFile(Concat3(lib,libname,.dll)) @@\ + MakeDLL(libname,solist) @@\ + LinkBuildLibrary(Concat3(lib,libname,.a)) @@\ + LinkBuildDLL(Concat3(lib,libname,.dll)) @@\ + @@\ +clean:: @@\ + RemoveFile(LibraryTargetName(libname)) @@\ + RemoveFile(Concat3(lib,libname,.dll)) @@\ + RemoveFile(junk.o) @@\ + RemoveFile(junk.c) @@\ + RemoveFile($(BASE_COUNTER)) + #endif /* SharedDepLibraryTarget */ + +/* + * SharedDepModuleTarget + */ + #ifndef SharedDepModuleTarget #define SharedDepModuleTarget(name,deps,solist) @@\ AllTarget(name) @@\ @@ -88,40 +119,52 @@ clean:: @@\ RemoveFile(name) #endif /* SharedDepModuleTarget */ + /* * SharedLibraryDataTarget - generate rules to create shared data file */ + #ifndef SharedLibraryDataTarget #define SharedLibraryDataTarget(libname,rev,salist) #endif + + /* * InstallSharedLibraryData - generate rules to install the shared library data */ + #ifndef InstallSharedLibraryData #define InstallSharedLibraryData(libname,rev,dest) #endif /* InstallSharedLibraryData */ -BASE_COUNTER=/tmp/DLL_BASE_COUNTER -#define MakeDLL(libname,solist) @@\ - if [ -f $(BASE_COUNTER) ]; then true; \ @@\ - else echo 0x67000000 > $(BASE_COUNTER); fi @@\ - dllwrap -s --def libname.def --output-lib Concat3(lib,libname,.a) -o Concat3(lib,libname,.dll) solist junk.o $(REQUIREDLIBS) -image-base `cat $(BASE_COUNTER)` @@\ - IMAGE_LENGTH=`objdump -x Concat3(lib,libname,.dll) |awk '/SizeOfImage/ {print "0x"$$2}'`; \ @@\ +/* + * MakeDll + */ + +#define MakeDLL(libname,solist) @@\ + if [ -f $(BASE_COUNTER) ]; then true; \ @@\ + else echo 0x67000000 > $(BASE_COUNTER); fi @@\ + $(DLLWRAP) -s --def libname.def --output-lib Concat3(lib,libname,.a) -o Concat3(lib,libname,.dll) solist junk.o $(REQUIREDLIBS) -image-base `cat $(BASE_COUNTER)` @@\ + IMAGE_LENGTH=`$(OBJDUMP) -x Concat3(lib,libname,.dll) |awk '/SizeOfImage/ {print "0x"$$2}'`; \ @@\ export IMAGE_LENGTH=`expr '(' \`printf %u $$IMAGE_LENGTH\` / 65536 + 1 ')' '*' 65536` ; \ @@\ export IMAGE_BASE=`cat $(BASE_COUNTER)`; \ @@\ printf 0x%x `expr \`printf %u $$IMAGE_BASE\` + $$IMAGE_LENGTH` > $(BASE_COUNTER) +/* + * SharedLibraryTarget + */ + #define SharedLibraryTarget(libname,rev,solist,down,up) @@\ AllTarget(Concat3(lib,libname,.dll)) @@\ @@\ CppFileTarget(libname.def,libname-def.cpp,-DLIBRARY_VERSION=rev,$(ICONFIGFILES)) @@\ @@\ @@\ -junk.c: @@\ +junk.c: @@\ echo "#include <cygwin/cygwin_dll.h>" >junk.c @@\ - echo "DECLARE_CYGWIN_DLL(dll_main);" >>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 @@\ @@ -129,7 +172,7 @@ Concat3(lib,libname,.dll): solist junk.o libname.def @@\ RemoveFile(Concat3(lib,libname,.dll)) @@\ MakeDLL(libname,solist) @@\ LinkBuildLibrary(Concat3(lib,libname,.a)) @@\ - LinkBuildDLL(Concat3(lib,libname,.dll)) @@\ + LinkBuildDLL(Concat3(lib,libname,.dll)) @@\ clean:: @@\ RemoveFile(LibraryTargetName(libname)) @@\ RemoveFile(Concat3(lib,libname,.dll)) @@\ @@ -137,15 +180,50 @@ clean:: @@\ RemoveFile(junk.c) @@\ RemoveFile($(BASE_COUNTER)) + +/* + * InstallSharedLibrary + */ + #define InstallSharedLibrary(libname,rev,dest) @@\ InstallTarget(install,LibraryTargetName(libname),$(INSTLIBFLAGS),$(USRLIBDIR)) @@\ InstallTarget(install,Concat3(lib,libname,.dll),$(INSTLIBFLAGS),$(BINDIR)) -#define ProgramTargetName(target)target.exe /* - * LinkBuildDLL - export a .dll to exports/bin. + * ProgramTargetName - This can be simply 'target' or 'target.exe' when + * building on Cygwin proper, as Cygwin automatically appends .exe to compiled + * executables and make, rm, ln, etc. will automatically search for a file + * with .exe appended if the raw file name cannot be found. However, + * building with a cross compiler requires 'target.exe', as the cross + * compiler doesn't know to append .exe, nor do the cross compiler tools + * know to search for files with .exe appended if the raw file name cannot + * be found. + */ + +#define ProgramTargetName(target) Concat(target,.exe) + + +/* + * HostProgramTargetName - Don't add .exe if cross-compiling. + */ + +#ifndef HostProgramTargetName +# if CrossCompiling +# define HostProgramTargetName(target) target +# else +# define HostProgramTargetName(target) ProgramTargetName(target) +# endif +#endif + + +/* + * LinkBuildDLL - Cygwin only rule, similar to LinkBuildModule. + * Unfortunately, we have to create a copy of each DLL in xc/exports/bin; + * linking doesn't work, the executables (e.g. xkbcomp) will report + * that they cannot find DLLs (e.g. libX11.dll). */ + #ifdef UseInstalled #define LinkBuildDLL(lib) $(_NULLCMD_) #else @@ -154,79 +232,60 @@ InstallTarget(install,Concat3(lib,libname,.dll),$(INSTLIBFLAGS),$(BINDIR)) cd $(BUILDBINDIR) && $(CP) $(BUILDBINTOP)/$(CURRENT_DIR)/lib . #endif + /* - * LinkBuildBinary - export an .exe to exports/bin. + * LinkBuildBinary - This rule normally creates a link in xc/exports/bin + * to a binary, but we create an actual copy of the binary. + * Creating a link causes the DLLs that the binary depend on, such as + * libX11.dll, not to be found. Copying the binary causes the runtime + * directory to be xc/exports/bin, which is the location of the DLLs, thus, + * the DLLs can now be found by the binary. Phew... + * + * Note that sometimes the binary is not an executable. One example + * is the rgb binary file. + * + * ProgramTargetName is passed to LinkBuildBinary if the binary + * is actually an executable; thus, we do not wrap the binary name + * with ProgramTargetName here. */ - #ifndef LinkBuildBinary -#define LinkBuildBinary(program) @@\ -all:: program @@\ - MakeDir($(BUILDBINDIR)) @@\ - RemoveFile($(BUILDBINDIR)/program) @@\ - $(CP) $(BUILDBINTOP)/$(CURRENT_DIR)/program $(BUILDBINDIR) +#define LinkBuildBinary(binary) @@\ +all:: binary @@\ + MakeDir($(BUILDBINDIR)) @@\ + RemoveFile($(BUILDBINDIR)/binary) @@\ + $(CP) $(BUILDBINTOP)/$(CURRENT_DIR)/binary $(BUILDBINDIR) #endif /* LinkBuildBinary */ -/* This is to replace an ugly hack in /xc/nls/XLC_LOCALE */ -/* the corresponding Imake.rules rule would be: - define LinkFileSpecial(gotodir,tofile,fromfile) @@\ - @MakeFlagsToShellFlags(i,set +e); \ @@\ - cd dir && (set -x; RemoveFile(tofile); $(LN) fromfile tofile) - */ -/* And this replaces a similarlry ugly hack in InstallDynamicModule */ +/* + * ComplexProgramTarget - Imake.rules doesn't wrap the program name + * with ProgramTargetName(), so we need this rule for Cygwin. + */ -#ifndef LinkBuildModule -#ifdef UseInstalled -#define LinkBuildModule(module,subdir) $(_NULLCMD_) -#else -#define LinkBuildModule(module,subdir) @@\ - MakeDir($(BUILDMODULEDIR)/subdir) @@\ - RemoveFile($(BUILDMODULEDIR)/subdir/module) @@\ - $(LN) $(BUILDMODULETOP)/$(CURRENT_DIR)/module $(BUILDMODULEDIR)/subdir/module -#endif -#endif /* LinkBuildModule */ - -#ifndef LinkBuildNamedModule -#define LinkBuildNamedModule(module,name) MakeDir($(BUILDMODULEDIR)) @@\ - RemoveFile($(BUILDMODULEDIR)/module) @@\ - $(BUILDMODULEDIR) $(BUILDMODULETOP)/$(CURRENT_DIR)/module name -#endif /* LinkBuildNamedModule */ - -#define NormalProgramTarget(program,objects,deplibs,locallibs,syslibs) @@\ -AllTarget(ProgramTargetName(program)) @@\ -ProgramTargetName(program): objects deplibs @@\ - RemoveTargetProgram($@) @@\ - LinkRule($@,$(LDOPTIONS),objects,locallibs $(LDLIBS) syslibs) @@\ +#define ComplexProgramTarget(program) @@\ + AllTarget(ProgramTargetName(program)) @@\ + ProgramTargetHelper(program,SRCS,OBJS,DEPLIBS,$(LOCAL_LIBRARIES),NullParameter) @@\ + DependTarget() @@\ + LintTarget() @@\ @@\ clean:: @@\ RemoveFile(ProgramTargetName(program)) -#define ProgramTargetHelper(program,srcs,objs,deplib,locallib,syslib) @@\ -ProgramTargetName(program): $(objs) $(deplib) @@\ - RemoveTargetProgram($@) @@\ - LinkRule($@,$(LDOPTIONS),$(objs),locallib $(LDLIBS) syslib) @@\ - @@\ -InstallProgram(program,$(BINDIR)) @@\ -InstallManPage(program,$(MANDIR)) -#define ComplexProgramTarget(program) @@\ -AllTarget(ProgramTargetName(program)) @@\ - @@\ -ProgramTargetHelper(program,SRCS,OBJS,DEPLIBS,$(LOCAL_LIBRARIES),NullParameter) @@\ - @@\ -DependTarget() @@\ -LintTarget() @@\ - @@\ -clean:: @@\ - RemoveFile(ProgramTargetName(program)) +/* + * ComplexProgramTarget_1 - Imake.rules doesn't wrap the program names + * with ProgramTargetName(), so we need this rule for Cygwin. + */ #define ComplexProgramTarget_1(program,locallib,syslib) @@\ - OBJS = $(OBJS1) $(OBJS2) $(OBJS3) @@\ - SRCS = $(SRCS1) $(SRCS2) $(SRCS3) @@\ - PROGRAM1 = ProgramTargetName(program) @@\ + OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5) \ @@\ + $(OBJS6) $(OBJS7) $(OBJS8) $(OBJS9) $(OBJS10) @@\ + SRCS = $(SRCS1) $(SRCS2) $(SRCS3) $(SRCS4) $(SRCS5) \ @@\ + $(SRCS6) $(SRCS7) $(SRCS8) $(SRCS9) $(SRCS10) @@\ + PROGS_EXE = $(foreach prog,$(PROGRAMS),ProgramTargetName($(prog))) @@\ @@\ -AllTarget($(PROGRAM1) $(PROGRAM2) $(PROGRAM3)) @@\ +AllTarget($(PROGS_EXE)) @@\ @@\ ProgramTargetHelper(program,SRCS1,OBJS1,DEPLIBS1,locallib,syslib) @@\ @@\ @@ -234,46 +293,15 @@ DependTarget() @@\ LintTarget() @@\ @@\ clean:: @@\ - for i in $(PROGRAMS); do $(RM) ProgramTargetName($$i); done - -#define ComplexProgramTarget_2(program,locallib,syslib) @@\ - PROGRAM2 = ProgramTargetName(program) @@\ - @@\ -ProgramTargetHelper(program,SRCS2,OBJS2,DEPLIBS2,locallib,syslib) + RemoveFiles($(PROGS_EXE)) -#define ComplexProgramTarget_3(program,locallib,syslib) @@\ - PROGRAM3 = ProgramTargetName(program) @@\ - @@\ -ProgramTargetHelper(program,SRCS3,OBJS3,DEPLIBS3,locallib,syslib) - -#define ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,flags) @@\ -AllTarget(ProgramTargetName(server)) @@\ -ProgramTargetName(server): subdirs objects libs @@\ - MoveToBakFile($@) @@\ - LinkRule($@,$(LDOPTIONS),objects,libs $(LDLIBS) syslibs) @@\ - @@\ -Concat(load,server): @@\ - MoveToBakFile(ProgramTargetName(server)) @@\ - LinkRule(ProgramTargetName(server),$(LDOPTIONS),objects,libs $(LDLIBS) syslibs) @@\ - @@\ -loadX:: Concat(load,server) @@\ - @@\ -SentinelProgramTarget(server,subdirs objects libs,objects libs $(LDLIBS) syslibs) @@\ -SentinelLinkTarget(Concat(load,server),server,objects libs $(LDLIBS) syslibs) @@\ -PurifyProgramTarget(server,subdirs objects libs,objects libs $(LDLIBS) syslibs) @@\ -PurifyLinkTarget(Concat(load,server),server,objects libs $(LDLIBS) syslibs) @@\ -ProofProgramTarget(server,subdirs objects libs,objects libs $(LDLIBS) syslibs) @@\ -ProofLinkTarget(Concat(load,server),server,objects libs $(LDLIBS) syslibs) @@\ - @@\ -InstallProgramWithFlags(server,$(BINDIR),flags) @@\ - @@\ -clean:: @@\ - RemoveFile(ProgramTargetName(server)) /* - * ProfiledRelocatableTarget - generate rules to produce a profiled relocatable - * object file instead of a library. + * ProfiledRelocatableTarget - generate rules to produce a profiled + * relocatable object file instead of a library. Differs from Imake.rules + * by passing '--oformat pe-i386' to ld. */ + #ifndef ProfiledRelocatableTarget #define ProfiledRelocatableTarget(objname,objlist) @@\ AllTarget(Concat(objname,_p.Osuf)) @@\ @@ -287,8 +315,10 @@ Concat(objname,_p.Osuf): objlist $(EXTRALIBRARYDEPS) @@\ /* * DebuggedRelocatableTarget - generate rules to produce a debuggable - * relocatable object file instead of a library. + * relocatable object file instead of a library. Differs from Imake.rules + * by passing '--oformat pe-i386' to ld. */ + #ifndef DebuggedRelocatableTarget #define DebuggedRelocatableTarget(objname,objlist) @@\ AllTarget(Concat(objname,_d.Osuf)) @@\ @@ -300,3 +330,70 @@ Concat(objname,_d.Osuf): objlist $(EXTRALIBRARYDEPS) @@\ #endif /* DebuggedRelocatableTarget */ +/* + * DependDependencyStatement - Imake.rules wraps $(DEPEND) in + * ProgramTargetName(), which causes cross compiling to think that + * $(DEPEND) hasn't been built, as $(DEPEND) is a host tool, and should + * not be wrapped with ProgramTargetName(). Perhaps there should be + * a HostProgramTargetName()... + */ + +#ifndef DependDependencyStatement +#if HasMakefileSafeInclude +#define DependDependencyStatement() @@\ +DependFileName:: $(DEPEND) +#else +#define DependDependencyStatement() @@\ +depend:: $(DEPEND) +#endif +#endif + + +/* + * DependDependency - Imake.rules wraps $(DEPEND) in ProgramTargetName(). + * This doesn't work when cross compiling, see the locally defined + * DependDependencyStatement comment (above) for more information. + */ + +#ifndef DependDependency +#ifdef UseInstalled +#define DependDependency() /**/ +#else +#define DependDependency() @@\ +DependDependencyStatement() @@\ + @@\ +NoCmpScript($(DEPEND)) @@\ + @@\ +$(DEPEND): @@\ + @echo "checking $@ over in $(DEPENDSRC) first..."; \ @@\ + cd $(DEPENDSRC) && $(MAKE); \ @@\ + echo "okay, continuing in $(CURRENT_DIR)" + +#endif /* UseInstalled */ +#endif /* DependDependency */ + + +/* + * ImakeDependency - Imake.rules wraps $(IMAKE) in ProgramTargetName(), + * which doesn't work when cross compiling, as imake is supposed to be a + * host program. See the locally defined DependDependencyStatement + * comment (above) for more information. + */ + +#ifndef ImakeDependency +#ifdef UseInstalled +#define ImakeDependency(target) /**/ +#else +#define ImakeDependency(target) @@\ +target:: $(IMAKE) @@\ + @@\ +NoCmpScript($(IMAKE) $(IMAKE).Osuf) @@\ + @@\ +$(IMAKE) $(IMAKE).Osuf: @@\ + -@(cd $(IMAKESRC) && if [ -f Makefile ]; then \ @@\ + echo "checking $@ in $(IMAKESRC) first..."; $(MAKE) all; else \ @@\ + echo "bootstrapping $@ from Makefile.ini in $(IMAKESRC) first..."; \ @@\ + $(MAKE) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; fi; \ @@\ + echo "okay, continuing in $(CURRENT_DIR)") +#endif /* UseInstalled */ +#endif /* ImakeDependency */ diff --git a/xc/config/cf/cygwin.tmpl b/xc/config/cf/cygwin.tmpl index 0a06d48dc..7e629656c 100644 --- a/xc/config/cf/cygwin.tmpl +++ b/xc/config/cf/cygwin.tmpl @@ -1,10 +1,12 @@ XCOMM $XConsortium: WinLib.tmpl,v 1.1 94/01/08 18:32:51 rws Exp $ -XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.4 2001/04/18 17:13:58 dawes Exp $ +XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.7 2001/08/19 15:24:05 alanh Exp $ +#define SharedX11Reqs #define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) +#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) #define SharedXtReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XLIBONLY) #define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) -#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) +#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) #define SharedXextReqs $(LDPRELIB) $(XLIBONLY) #define SharedXiReqs $(LDPRELIB) $(XLIB) @@ -27,7 +29,7 @@ XCOMM #define SharedXfontReqs $(LDPRELIB) $(XLIB) #define SharedXrenderReqs $(LDPRELIB) $(EXTENSIONLIB) $(XLIB) #define SharedpsresReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB) #define SharedXmuuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) - +#define SharedXrandrReqs $(LDPRELIB) $(XLIB) #ifndef FixupLibReferences #define FixupLibReferences() @@\ @@ -36,6 +38,40 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif #ifndef XawClientLibs -#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XLIB) $(XPMLIB) +#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#endif + + +/* + * Some Imake defines needed only on Cygwin + */ + +#ifndef DllwrapCmd +#define DllwrapCmd dllwrap +#endif + +#ifndef DlltoolCmd +#define DlltoolCmd dlltool #endif +#ifndef ObjdumpCmd +#define ObjdumpCmd objdump +#endif + +#ifndef DllBaseCounter +# if CrossCompiling +# define DllBaseCounter ~/DLL_BASE_COUNTER /* So you don't have to be root */ +# else +# define DllBaseCounter /tmp/DLL_BASE_COUNTER +#endif +#endif + +/* + * Some Cygwin only Makefile symbols, as opposed to Imake define's + */ + + DLLWRAP = DllwrapCmd + DLLTOOL = DlltoolCmd + OBJDUMP = ObjdumpCmd + BASE_COUNTER = DllBaseCounter + diff --git a/xc/config/cf/darwin.cf b/xc/config/cf/darwin.cf index 2d253737e..53da4e801 100644 --- a/xc/config/cf/darwin.cf +++ b/xc/config/cf/darwin.cf @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.14 2001/05/18 17:48:23 torrey Exp $ +XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.15 2001/06/11 07:23:11 torrey Exp $ /* Darwin / Mac OS X configuration by John Carmack <johnc@idsoftware.com> */ @@ -11,7 +11,8 @@ XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.14 2001/05/18 17:48:23 torrey Exp $ #define HasSnprintf YES #define HasPutenv YES #define HasBSD44Sockets YES -#define BuildGlxExt NO +#define HasUsableFileMmap YES +#define HasZlib YES #ifndef HasShm # define HasShm YES #endif @@ -48,13 +49,6 @@ XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.14 2001/05/18 17:48:23 torrey Exp $ #define CcCmd /usr/bin/cc #define CplusplusCmd /usr/bin/c++ -/* uncommenting this line will get -g instead of -O, which builds - * a lot faster and gets debug info - */ -#if 0 -#define DefaultCDebugFlags -g -#endif - /* default flags to pass to cc */ #ifndef DefaultCCOptions #if XFree86Devel @@ -72,6 +66,16 @@ XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.14 2001/05/18 17:48:23 torrey Exp $ # define LibraryCCOptions DefaultCCOptions -fno-common #endif +#ifdef PpcDarwinArchitecture +# define DarwinMachineDefines -D__powerpc__ +# define OptimizedCDebugFlags -O2 +#endif /* PpcDarwinArchitecture */ + +#ifdef i386DarwinArchitecture +# define DarwinMachineDefines -D__i386__ +# define OptimizedCDebugFlags -O2 -fno-strength-reduce +#endif /* i386DarwinArchitecture */ + /* * __DARWIN__ will be used for platform specific #ifdefs that can't * be handled by existing X defines. @@ -79,11 +83,7 @@ XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.14 2001/05/18 17:48:23 torrey Exp $ * Darwin's alloca() seg faults (rather than returning NULL) on failed * allocations, so we can't use it. */ -#ifdef PpcDarwinArchitecture -#define StandardDefines -D__powerpc__ -D__DARWIN__ -DNO_ALLOCA -#else -#define StandardDefines -D__DARWIN__ -DNO_ALLOCA -#endif +#define StandardDefines DarwinMachineDefines -D__DARWIN__ -DNO_ALLOCA /* programs/rgb/rgb.h and others needs this */ #define HasNdbm YES @@ -117,16 +117,6 @@ XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.14 2001/05/18 17:48:23 torrey Exp $ /* no Display Power Management extension */ #define BuildDPMSExt NO -#define BuildXvExt NO - -/* no OpenGL libraries */ -#ifndef BuildGLXLibrary -# define BuildGLXLibrary NO -#endif -#ifndef BuildGLULibrary -# define BuildGLULibrary NO -#endif - #define BuildLibPathVar DYLD_LIBRARY_PATH /* include rules to build shared libraries */ diff --git a/xc/config/cf/kdrive.cf b/xc/config/cf/kdrive.cf index 5b9bda671..2ff279bcb 100644 --- a/xc/config/cf/kdrive.cf +++ b/xc/config/cf/kdrive.cf @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/kdrive.cf,v 1.9 2001/04/10 16:07:47 dawes Exp $ +XCOMM $XFree86: xc/config/cf/kdrive.cf,v 1.12 2001/06/23 17:00:03 keithp Exp $ /* * This configuration file contains all of the configuration * information for the XFree86 based X Servers. @@ -13,8 +13,11 @@ XCOMM $XConsortium: $ #ifndef XTS300Server #define XTS300Server NO #endif +#ifndef XipaqServer +#define XipaqServer NO +#endif #ifndef XfbdevServer -#define XfbdevServer YES +#define XfbdevServer NO #endif #ifndef XIGSServer #define XIGSServer NO @@ -34,6 +37,9 @@ XCOMM $XConsortium: $ #ifndef XvesaServer #define XvesaServer NO #endif +#ifndef Xmach64Server +#define Xmach64Server NO +#endif #if XItsyServer #include <itsy.cf> diff --git a/xc/config/cf/linux.cf b/xc/config/cf/linux.cf index 8f9b372dc..1bd00bd8b 100644 --- a/xc/config/cf/linux.cf +++ b/xc/config/cf/linux.cf @@ -4,7 +4,7 @@ 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.165.2.1 2001/06/01 02:24:14 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.170 2001/08/13 19:34:52 dawes Exp $ #ifndef LinuxElfDefault # define LinuxElfDefault YES @@ -143,22 +143,29 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class # define BuildAllSpecsDocs YES /* we build-depend on libfreetype6-dev (FreeType 2.x) */ # define BuildFreetype2Library NO +# define HasFreetype2 YES +# define HasLinuxInput YES # define HasXdmAuth YES -/* modern LaTeX chokes on ancient sync.tex document */ -/* # define HasLatex YES */ +# define HasLatex YES # define BuilderEMailAddr "submit@bugs.debian.org" -/* right now glide only works on i386 */ +/* at present, glide2 only works on i386 */ # ifdef i386Architecture -# define HasMMXSupport YES -# define Has3DNowSupport YES -/* 2.4 is not yet the official (or predominant) kernel in unstable */ -# define HasKatmaiSupport NO # define HasGlide2 YES # define Glide2IncDir /usr/include/glide +# endif /* i386Architecture */ +/* at present, glide3 only works on alpha and i386 */ +# if defined(i386Architecture) || defined(AlphaArchitecture) # define HasGlide3 YES # define Glide3IncDir /usr/include/glide3 +# endif /* i386Architecture || AlphaArchitecture */ +/* extended instruction set support */ +# ifdef i386Architecture +# define HasMMXSupport YES +# define Has3DNowSupport YES +/* 2.4 is not yet the official (or predominant) kernel in unstable */ +# define HasKatmaiSupport NO # endif /* i386Architecture */ -# endif /* DebianMaintiner */ +# endif /* DebianMaintainer */ #endif /* LinuxDebian */ #if LinuxDistribution == LinuxRedHat @@ -282,11 +289,13 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #endif /* - * Build shared libGL and the DRI modules without -fPIC. This improves - * performance. + * Build shared libGL and the DRI modules without -fPIC on some architectures. + * This improves performance. */ #if BuildXF86DRI +# if defined(i386Architecture) # define BuildLibGlxWithoutPIC YES +# endif #endif /* The DRM module requires kernel services that appeared in late 2.1.x @@ -470,8 +479,8 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class # ifndef AsCmd # define AsCmd gcc -c -x assembler-with-cpp # endif -# ifndef DoLoadableServer -# define DoLoadableServer NO +# ifndef MakeDllModules +# define MakeDllModules YES # endif # endif /* MipsArchitecure */ # ifndef CcCmd @@ -515,12 +524,19 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class # define LdCmd /usr/alpha-linuxecoff/bin/ld -m alpha # define AsmDefines -DUSE_GAS -U__ELF__ # endif /* AlphaArchitecture */ +# ifdef HPArchitecture +# define CcCmd gcc +# define CplusplusCmd g++ +# define AsCmd as +# define LdCmd ld +# define AsmDefines -DUSE_GAS -U__ELF__ +# endif /* HPArchitecture */ # ifdef ia64Architecture -# define CcCmd gcc -# define CplusplusCmd g++ -# define AsCmd as -# define LdCmd ld -# define AsmDefines -DUSE_GAS -U__ELF__ +# define CcCmd gcc +# define CplusplusCmd g++ +# define AsCmd as +# define LdCmd ld +# define AsmDefines -DUSE_GAS -U__ELF__ # endif /* ia64Architecture */ # ifdef i386Architecture # define CcCmd gcc -b i486-linuxaout @@ -553,6 +569,14 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class # define LdCmd ld # define AsmDefines -D__ELF__ # endif /* ia64Architecture */ +# ifdef HPArchitecture +# define CcCmd gcc +# define CplusplusCmd g++ +# define AsCmd as +# define LdCmd ld +# define AsmDefines -D__ELF__ +# define SharedLibXau YES +# endif /* HPArchitecture */ # ifdef i386Architecture # define CcCmd gcc -b i486-linux # define AsCmd /usr/i486-linux/bin/as @@ -576,7 +600,11 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #endif #if UseElfFormat # ifndef DoLoadableServer -# define DoLoadableServer YES +# ifdef HPArchitecture +# define DoLoadableServer YES +# else +# define DoLoadableServer YES +# endif # endif #endif #ifndef CppCmd @@ -627,6 +655,14 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif /* s390Architecture */ +#ifdef s390xArchitecture +/*#define DefaultCCOptions -fsigned-char */ +#define OptimizedCDebugFlags -O3 +#define LinuxMachineDefines -D__s390x__ +#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 +#endif /* s390xArchitecture */ + #ifdef AlphaArchitecture # ifndef OptimizedCDebugFlags # define OptimizedCDebugFlags DefaultGcc2AxpOpt @@ -703,6 +739,38 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif +#ifdef HPArchitecture +# define OptimizedCDebugFlags -O2 +# define LinuxMachineDefines -D__hppa__ +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines +#endif + +#ifdef SuperHArchitecture +# ifndef SuperHArchOptFlags +# ifdef SuperH4Architecture +# define SuperHArchOptFlags -m4 +# elifdef SuperH4NOFPUArchitecture +# define SuperHArchOptFlags -m4-nofpu +# else +# define SuperHArchOptFlags -m3 +# endif +# endif +# ifndef SuperHebArchitecture +# ifdef SuperHebArchitecture +# define SuperHEndianFlags -mb +# else +# define SuperHEndianFlags -ml +# endif +# endif +# ifndef OptimizedCDebugFlags +# define OptimizedCDebugFlags -O2 SuperHArchOptFlags SuperHEndianFlags +# endif +# define LinuxMachineDefines -D__sh__ +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines +#endif + #ifndef StandardDefines # define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines #endif @@ -772,7 +840,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB) #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB) -#ifdef s390Architecture +#if (defined s390Architecture) || (defined s390xArchitecture) # define HasXServer NO #endif diff --git a/xc/config/cf/lnxLib.rules b/xc/config/cf/lnxLib.rules index aa4d222a4..829206a09 100644 --- a/xc/config/cf/lnxLib.rules +++ b/xc/config/cf/lnxLib.rules @@ -1,5 +1,5 @@ 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 $ +XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.41 2001/06/05 23:03:19 dawes Exp $ /* * Linux shared library rules (DLL & ELF versions) @@ -186,6 +186,45 @@ clean:: @@\ #endif /* SharedDepLibraryTarget */ +/* + * SharedDepCplusplusLibraryTarget - generate rules to create a shared library. + */ +#ifndef SharedDepCplusplusLibraryTarget +#ifdef UseInstalled +#ifndef LinkBuildSonameLibrary +#define LinkBuildSonameLibrary(lib) true +#endif +#else +#ifndef LinkBuildSonameLibrary +#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \ + cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .) +#endif +#endif + +#define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up) @@\ +AllTarget(Concat(lib,libname.so.rev)) @@\ + @@\ +Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\ + $(RM) $@~ @@\ + @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\ + (cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\ + $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\ + LinkBuildSonameLibrary($$SONAME) @@\ + $(RM) $@ @@\ + $(MV) $@~ $@ @@\ + @if $(SOSYMLINK); then (set -x; \ @@\ + $(RM) Concat(lib,libname.so); \ @@\ + $(LN) $@ Concat(lib,libname.so)); fi @@\ + LinkBuildLibrary($@) @@\ + LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\ + @@\ +clean:: @@\ + @MAJREV=`expr rev : '\(.*\)\.'`; \ @@\ + set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\ + $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) + +#endif /* SharedDepCplusplusLibraryTarget */ + #ifndef SharedDepModuleTarget #define SharedDepModuleTarget(name,deps,solist) @@\ AllTarget(name) @@\ diff --git a/xc/config/cf/lnxLib.tmpl b/xc/config/cf/lnxLib.tmpl index 6c96a47c0..27172d623 100644 --- a/xc/config/cf/lnxLib.tmpl +++ b/xc/config/cf/lnxLib.tmpl @@ -1,5 +1,5 @@ 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 $ +XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.14 2001/08/01 00:44:32 tsi Exp $ /* * Linux shared library template @@ -20,24 +20,25 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #define CplusplusLibC #define SharedX11Reqs -#define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) -#define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) -#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) -#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) -#define SharedXextReqs $(LDPRELIB) $(XLIBONLY) -#define SharedXiReqs $(LDPRELIB) $(XLIB) -#define SharedPexReqs $(LDPRELIB) $(XLIBONLY) MathLibrary -#define SharedXtstReqs $(LDPRELIB) $(XLIB) -#define SharedXieReqs $(LDPRELIB) $(XLIBONLY) -#define SharedSMReqs $(LDPRELIB) $(ICELIB) +#define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) +#define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) +#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) +#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) +#define SharedXextReqs $(LDPRELIB) $(XLIBONLY) +#define SharedXiReqs $(LDPRELIB) $(XLIB) +#define SharedXrenderReqs $(LDPRELIB) $(EXTENSIONLIB) $(XLIB) +#define SharedPexReqs $(LDPRELIB) $(XLIBONLY) MathLibrary +#define SharedXtstReqs $(LDPRELIB) $(XLIB) +#define SharedXieReqs $(LDPRELIB) $(XLIBONLY) +#define SharedSMReqs $(LDPRELIB) $(ICELIB) #if GlxUseBuiltInDRIDriver #define ExtraSharedGLReqs /**/ #else #define ExtraSharedGLReqs -ldl #endif -#define SharedGLReqs $(LDPRELIB) $(XLIB) ExtraSharedGLReqs +#define SharedGLReqs $(LDPRELIB) $(XLIB) ExtraSharedGLReqs #else /* UseElfFormat */ diff --git a/xc/config/cf/lnxdoc.rules b/xc/config/cf/lnxdoc.rules index cb8caa97c..67c49cc2e 100644 --- a/xc/config/cf/lnxdoc.rules +++ b/xc/config/cf/lnxdoc.rules @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/lnxdoc.rules,v 3.22 2000/12/18 02:43:27 dawes Exp $ +XCOMM $XFree86: xc/config/cf/lnxdoc.rules,v 3.23 2001/06/04 13:50:13 dawes Exp $ XCOMM XCOMM Rules for formatting Linuxdoc-SGML documentation XCOMM @@ -109,6 +109,10 @@ update.docs:: textfile @@\ @$(RM) __tmp1__ __tmp2__ #endif +/* + * Avoid using LinuxDocTargetLong with base != sgmlfile because HTML + * index generation assumes that base == sgmlfile. + */ #define LinuxDocTargetLong(sgmlfile,textfile,base) @@\ LinuxDocSgmlToText(sgmlfile,textfile) @@\ LinuxDocSgmlToHtml(sgmlfile,base) @@\ diff --git a/xc/config/cf/sco5.cf b/xc/config/cf/sco5.cf index 23aeafb27..7ff5bacf3 100644 --- a/xc/config/cf/sco5.cf +++ b/xc/config/cf/sco5.cf @@ -1,18 +1,14 @@ -XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.7 1998/07/25 05:57:16 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.8 2001/06/30 22:41:43 tsi Exp $ /* - * This is for SCO Open Server 5.0.2 or later. + * This is for SCO Open Server 5.0.6A or later. */ -#ifndef ScoOsMouse -# define ScoOsMouse YES -#endif - #ifndef OSName -#define OSName UNIX System V/386 Open Server 5.0.4 +#define OSName UNIX System V/386 Open Server Release 5 #endif #ifndef OSVendor -#define OSVendor SCO +#define OSVendor Caldera #endif #ifndef OSMajorVersion #define OSMajorVersion 5 @@ -21,7 +17,7 @@ XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.7 1998/07/25 05:57:16 dawes Exp $ #define OSMinorVersion 0 #endif #ifndef OSTeenyVersion -#define OSTeenyVersion 4 +#define OSTeenyVersion 6 #endif /* @@ -35,7 +31,7 @@ XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.7 1998/07/25 05:57:16 dawes Exp $ * product of this is that we get better signals too. */ -#define StandardDefines -Dsco -DSCO -DSYSV -Di386 -DSCO325 -DFD_SETSIZE=256 -D_NO_STATIC +#define StandardDefines -Dsco -DSCO -DSYSV -Di386 -DSCO325 -DFD_SETSIZE=256 -D_NO_STATIC -DMAXPATHLEN=1024 #ifdef HasGcc2 # define DefaultCCOptions -melf GccWarningOptions # define CcCmd gcc @@ -69,22 +65,17 @@ XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.7 1998/07/25 05:57:16 dawes Exp $ #endif #define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS -#if ScoOsMouse -# define ServerExtraSysLibs $(CBRT) -lm -levent SCODynamicFlags -# define ServerExtraDefines ServerCCOptions -DUSE_OSMOUSE XFree86ServerDefines -#else -# define ServerExtraSysLibs $(CBRT) -lm SCODynamicFlags -# define ServerExtraDefines ServerCCOptions XFree86ServerDefines -#endif +#define ServerExtraSysLibs $(CBRT) -lm -levent SCODynamicFlags #define ExtraLibraries -lsocket #define NeedWidePrototypes NO -#define ServerOSDefines -DDDXTIME +#define ServerOSDefines -DDDXTIME XFree86ServerOSDefines #define ToolkitStringsABIOptions -intelabi #define ThreadedX NO #define HasThreadSafeAPI NO #define HasNdbm YES #define HasVFork YES #define HasPutenv YES +#define HasSnprintf YES #define ExecableScripts YES #define HasShadowPasswd YES #define ManSourcePath $(MANPATH)/cat. @@ -107,27 +98,24 @@ XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.7 1998/07/25 05:57:16 dawes Exp $ #define LdCombineFlags -r #define HasLdRunPath YES -#define HasPoll NO +#define HasPoll YES #define PatheticCpp YES #define ArCmdBase ar #define AsCmd as #define CppCmd /lib/cpp #define LdCmd ld -#define LexCmd lex +#define LexCmd flex #define MakeCmd make #define YaccCmd yacc #define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/bin/X11:/usr/local/bin:/etc #define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/bin/X11 -/* - * If you are compiling on an SCO Open Server release prior to 5.0.2, - * you may need to remove -DLOCALCONN. There have been reports of it - * working on some 5.0.0 machines but not others. - */ #define ConnectionFlags -DLOCALCONN -DTCPCONN -DUNIXCONN +#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) + #define InstallManPageAliases(file,destdir,aliases) @@\ install.man:: @@\ @(SUFFIX=`echo $(DESTDIR)destdir/file.* | cut -f3,4 -d.`; \ @@\ @@ -140,7 +128,4 @@ install.man:: @@\ #include <scoLib.rules> /* minor changes to sv4Lib.rules */ #include <sv4Lib.rules> -#ifdef i386Architecture #include <xfree86.cf> -#endif - diff --git a/xc/config/cf/scoLib.rules b/xc/config/cf/scoLib.rules index 65a2ca3a0..1e5e5926b 100644 --- a/xc/config/cf/scoLib.rules +++ b/xc/config/cf/scoLib.rules @@ -1,5 +1,5 @@ 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 $ +XCOMM $XFree86: xc/config/cf/scoLib.rules,v 1.7 2001/06/30 22:41:43 tsi Exp $ /* * SharedLibraryTarget3 - generate rules to create a shared library; @@ -24,13 +24,30 @@ Concat(lib,libname.so.rev): solist1 solist2 solist3 $(EXTRALIBRARYDEPS) @@\ $(RM) Concat(lib,libname.so); \ @@\ $(LN) $@ Concat(lib,libname.so)); fi @@\ LinkBuildLibrary($@) @@\ - LinkBuildLibraryMaybe(Concat(lib,libname.so)$(SOSYMLINK)) @@\ + LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\ @@\ clean:: @@\ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) #endif /* SharedLibraryTarget */ +#ifndef LinkWithExports +# if UseExportLists +# define LinkWithExports(libname,rev,solist,down,up) \ + (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $(DESTDIR)$(SHLIBDIR)/$@ 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 $(DESTDIR)$(SHLIBDIR)/$@ solist $(REQUIREDLIBS)) +# endif +#endif + /* * Redefine this so we can drop -b elf and build COFF objects for the * archived library. This assumes -b elf is hanging out in CCOPTIONS diff --git a/xc/config/cf/sun.cf b/xc/config/cf/sun.cf index 90da33fbe..4d41a6208 100644 --- a/xc/config/cf/sun.cf +++ b/xc/config/cf/sun.cf @@ -3,7 +3,7 @@ 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.56 2001/05/11 09:03:05 alanh Exp $ +XCOMM platform: $XFree86: xc/config/cf/sun.cf,v 3.57 2001/05/28 02:42:25 tsi Exp $ #ifndef OSName # define OSName DefaultOSName @@ -168,21 +168,18 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion # if OSMajorVersion > 4 # if OSMinorVersion >= 8 # define ServerExtraDefines AllocateLocalDefines XFree86ServerDefines \ - -D__EXTENSIONS__ -D__SOL8__ + -D__SOL8__ # else -# define ServerExtraDefines AllocateLocalDefines XFree86ServerDefines \ - -D__EXTENSIONS__ +# define ServerExtraDefines AllocateLocalDefines XFree86ServerDefines # endif -# define ServerOSDefines XFree86ServerOSDefines IncludeCG2HeaderDefine # else # define ServerExtraDefines AllocateLocalDefines -# define ServerOSDefines -DDDXOSINIT IncludeCG2HeaderDefine # endif #else -# define ServerExtraDefines AllocateLocalDefines -# define ServerOSDefines -DDDXOSINIT IncludeCG2HeaderDefine +# define ServerExtraDefines AllocateLocalDefines XFree86ServerDefines # define HasPlugin YES #endif +#define ServerOSDefines XFree86ServerOSDefines IncludeCG2HeaderDefine #ifndef HasPerl /* Solaris 8 comes with perl. Earlier versions don't. */ @@ -237,10 +234,10 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion # define InstallCmd /usr/ucb/install # endif # ifdef i386Architecture -# define StandardDefines -Dsun -Di386 -DSVR4 -D__i386 +# define StandardDefines -Dsun -Di386 -DSVR4 -D__EXTENSIONS__ -D__i386 # define ToolkitStringsABIOptions -intelabi # else -# define StandardDefines -Dsun -DSVR4 +# define StandardDefines -Dsun -Dsparc -DSVR4 -D__EXTENSIONS__ # define ToolkitStringsABIOptions -sparcabi # endif # define ExtraLibraries -lsocket -lnsl @@ -310,14 +307,31 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion # ifndef BuildPexExt # define BuildPexExt (XsunServer || Xsun24Server) # endif -#if (OSMajorVersion > 4) -# ifdef UseGas -# define AsVISOption -Av9a -# else -# define AsVISOption -xarch=v8plus -#endif -# define AsOutputArchSize 32 -#endif +# ifndef BuildGlxExt +# define BuildGlxExt NO /* Not yet */ +# endif +# if (OSMajorVersion > 4) +# if !defined(AsOutputArchSize) || \ + ((AsOutputArchSize != 32) && (AsOutputArchSize != 64)) +# undef AsOutputArchSize +# define AsOutputArchSize 32 +# endif +# ifndef AsVISOption +# if AsOutputArchSize == 32 +# ifdef UseGas +# define AsVISOption -Av8plusa +# else +# define AsVISOption -xarch=v8plusa +# endif +# else +# ifdef UseGas +# define AsVISOption -Av9a +# else +# define AsVISOption -xarch=v9a +# endif +# endif +# endif +# endif #endif /* not i386Architecture */ #if OSMajorVersion >= 4 @@ -325,19 +339,16 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion #endif #if HasGcc -# if OSMajorVersion > 4 && defined(i386Architecture) +# if OSMajorVersion > 4 # ifndef DefaultCCOptions # if UseInstalled # define DefaultCCOptions -DNO_ASM +# elif OSMinorVersion > 6 +# define DefaultCCOptions -DNO_ASM GccWarningOptions +# elif OSMinorVersion > 3 +# define DefaultCCOptions -DNO_ASM GccWarningOptions -ansi -pedantic # else -# if OSMinorVersion > 6 -# define DefaultCCOptions -DNO_ASM -D__EXTENSIONS__ GccWarningOptions -# elif OSMinorVersion > 3 -# define DefaultCCOptions -ansi -pedantic -DNO_ASM \ - -D__EXTENSIONS__ GccWarningOptions -# else -# define DefaultCCOptions -DNO_ASM -# endif +# define DefaultCCOptions -DNO_ASM # endif # endif # endif diff --git a/xc/config/cf/sunLib.rules b/xc/config/cf/sunLib.rules index 66805ee95..8fb82cf95 100644 --- a/xc/config/cf/sunLib.rules +++ b/xc/config/cf/sunLib.rules @@ -4,7 +4,7 @@ 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.3 2001/01/17 16:38:49 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sunLib.rules,v 1.4 2001/05/28 02:42:25 tsi Exp $ #ifndef HasSharedLibraries #define HasSharedLibraries YES @@ -26,14 +26,14 @@ XCOMM $XFree86: xc/config/cf/sunLib.rules,v 1.3 2001/01/17 16:38:49 dawes Exp $ #endif #ifndef PositionIndependentCFlags #if HasGcc2 -#define PositionIndependentCFlags -fpic +#define PositionIndependentCFlags -fPIC #else #define PositionIndependentCFlags -pic #endif #endif #ifndef PositionIndependentCplusplusFlags #if HasGcc2ForCplusplus -#define PositionIndependentCplusplusFlags -fpic +#define PositionIndependentCplusplusFlags -fPIC #else #define PositionIndependentCplusplusFlags -pic #endif diff --git a/xc/config/cf/sv4Lib.rules b/xc/config/cf/sv4Lib.rules index 15fb4fb0b..cfdf0af06 100644 --- a/xc/config/cf/sv4Lib.rules +++ b/xc/config/cf/sv4Lib.rules @@ -4,7 +4,7 @@ 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.7 2001/01/17 16:38:49 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sv4Lib.rules,v 3.8 2001/05/28 02:42:25 tsi Exp $ #ifndef HasSharedLibraries # define HasSharedLibraries YES @@ -26,14 +26,14 @@ XCOMM $XFree86: xc/config/cf/sv4Lib.rules,v 3.7 2001/01/17 16:38:49 dawes Exp $ #endif #ifndef PositionIndependentCFlags # if HasGcc2 -# define PositionIndependentCFlags -fpic +# define PositionIndependentCFlags -fPIC # else # define PositionIndependentCFlags -K PIC # endif #endif #ifndef PositionIndependentCplusplusFlags # if HasGcc2ForCplusplus -# define PositionIndependentCplusplusFlags -fpic +# define PositionIndependentCplusplusFlags -fPIC # else # define PositionIndependentCplusplusFlags -K PIC # endif diff --git a/xc/config/cf/svr4.cf b/xc/config/cf/svr4.cf index b88fc589e..e7a9620bd 100644 --- a/xc/config/cf/svr4.cf +++ b/xc/config/cf/svr4.cf @@ -2,7 +2,7 @@ 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 $ +XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.44 2001/05/28 02:42:25 tsi Exp $ /* * A default OS name */ @@ -238,11 +238,29 @@ XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.43 2001/01/17 16:38:50 dawes Exp $ #define SharedLibXdmGreet YES #endif -#if defined(i386Architecture) || defined(PpcArchitecture) +/* + * At this point, an XFree86 port to Sparc/SunOS cannot be officially supported + * because the system I am using to develop this is just a loaner from Sun. + */ +#if defined(i386Architecture) || \ + defined(PpcArchitecture) || \ + (defined(SparcArchitecture) && \ + defined(SunArchitecture) && \ + defined(BuildXFree86OnSparcSunOS)) #ifndef DoLoadableServer #define DoLoadableServer YES #endif #include <xfree86.cf> #endif +#ifndef GccWarningOptions +# define GccWarningOptions /* */ +#endif +#ifndef XFree86ServerDefines +# define XFree86ServerDefines /* */ +#endif +#ifndef XFree86ServerOSDefines +# define XFree86ServerOSDefines -DDDXOSINIT +#endif + #include <sv4Lib.rules> diff --git a/xc/config/cf/xf86.rules b/xc/config/cf/xf86.rules index e8acc466b..568883a46 100644 --- a/xc/config/cf/xf86.rules +++ b/xc/config/cf/xf86.rules @@ -3,7 +3,7 @@ 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 $ +XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.34 2001/07/19 02:22:44 tsi Exp $ /* * These rules are needed to build the XFree86 X Servers @@ -109,7 +109,7 @@ clean:: @@\ #ifndef DriverObjectList #define DriverObjectList(drivers,list) @@\ -list: $(ICONFIGFILES) @@\ +list: $(ICONFIGFILES) drivers @@\ RemoveFile(list) @@\ @echo Creating list for drivers; \ @@\ DRIVERS="drivers"; \ @@\ diff --git a/xc/config/cf/xf86.tmpl b/xc/config/cf/xf86.tmpl index 54c4e4a01..1374a6f62 100644 --- a/xc/config/cf/xf86.tmpl +++ b/xc/config/cf/xf86.tmpl @@ -2,7 +2,7 @@ XCOMM $Xorg: xf86.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/xf86.tmpl,v 3.28 2001/01/17 16:38:51 dawes Exp $ +XCOMM $XFree86: xc/config/cf/xf86.tmpl,v 3.29 2001/08/01 00:44:32 tsi Exp $ #ifdef BuilderEMailAddr BUILDERADDR = BuilderEMailAddr @@ -53,7 +53,7 @@ MODULE_DEFINES = -DXFree86Module # endif #endif -#if defined(IHaveModules) && DoLoadableServer && defined(OS2Architecture) +#if defined(IHaveModules) && DoLoadableServer /* This overrides the ObjCompile in Imake.rules! */ #undef ObjectCompile diff --git a/xc/config/cf/xf86site.def b/xc/config/cf/xf86site.def index 9c54ca29c..62d5511c9 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.173 2001/04/05 19:29:36 dawes Exp $ +XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.177 2001/08/17 13:27:49 dawes Exp $ /******************************************************************************/ /* * This file is to provide a quick method for most people to change the @@ -396,6 +396,13 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.173 2001/04/05 19:29:36 dawes Exp */ /* + * To enable binary compatibility with previous versions of the font + * encoding support, uncomment this. + * +#define FontencCompatibility YES + */ + +/* * Do you want to Build Fonts (Usually you only want to build and install * fonts once, if this is a first time install you will want to build the * fonts) @@ -467,8 +474,10 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.173 2001/04/05 19:29:36 dawes Exp /* * Select the XInput devices you want by uncommenting this. * -#define XInputDrivers mouse dynapro elo2300 elographics magellan microtouch \ - mutouch spaceorb wacom void +#define XInputDrivers mouse acecad calcomp citron \ + digitaledge dmc dynapro elographics \ + microtouch mutouch penmount spaceorb summa \ + wacom void magictouch */ /* diff --git a/xc/config/cf/xfree86.cf b/xc/config/cf/xfree86.cf index 186cb7623..8fb1c4342 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.360.2.1 2001/05/22 21:25:40 dawes Exp $ +XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.375 2001/08/18 02:46:53 dawes Exp $ /* * This configuration file contains all of the configuration * information for the XFree86 based X Servers. @@ -134,15 +134,10 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ /* XInput drivers */ #ifndef XInputDrivers -#if 1 -#define XInputDrivers mouse digitaledge dynapro elographics \ - microtouch mutouch spaceorb summa \ - wacom void citron -#else -#define XInputDrivers mouse digitaledge dynapro elo2300 \ - elographics magellan citron \ - microtouch mutouch spaceorb summa wacom void -#endif +#define XInputDrivers mouse /* acecad */ calcomp citron \ + digitaledge dmc dynapro elographics \ + microtouch mutouch penmount spaceorb summa \ + wacom void /* magictouch */ #endif /* <linux/input.h> support mainly for USB support */ @@ -302,7 +297,7 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ /* Pure PCI drivers should go first */ # ifndef XF86CardDrivers -# define XF86CardDrivers mga glint nv tga s3virge sis rendition \ +# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ neomagic i740 tdfx savage \ cirrus vmware tseng trident chips apm \ GlideDriver fbdev i128 \ @@ -325,8 +320,7 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ #if defined(SparcArchitecture) && \ !defined(LynxOSArchitecture) && \ !defined(NetBSDArchitecture) && \ - !defined(OpenBSDArchitecture) && \ - !defined(SunArchitecture) + !defined(OpenBSDArchitecture) # ifndef XF86Server # define XF86Server YES # endif @@ -472,7 +466,7 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ # endif # ifndef XF86CardDrivers -# define XF86CardDrivers mga glint nv s3virge sis savage \ +# define XF86CardDrivers mga glint nv s3 s3virge sis savage \ trident chips tdfx fbdev ati \ DevelDrivers newport \ XF86OSCardDrivers XF86ExtraCardDrivers @@ -555,7 +549,7 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ /* Pure PCI drivers should go first */ # ifndef XF86CardDrivers -# define XF86CardDrivers mga tdfx glint s3virge rendition tga \ +# define XF86CardDrivers mga tdfx glint s3 s3virge rendition tga \ savage nv DevelDrivers siliconmotion vga \ XF86OSCardDrivers XF86ExtraCardDrivers # endif @@ -648,7 +642,7 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ /* Pure PCI drivers should go first */ # ifndef XF86CardDrivers -# define XF86CardDrivers mga glint s3virge sis savage\ +# define XF86CardDrivers mga glint s3 s3virge sis savage\ trident chips tdfx fbdev \ DevelDrivers vga \ XF86OSCardDrivers XF86ExtraCardDrivers @@ -664,6 +658,72 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ #endif +/* SuperH drivers */ + +#if defined(SuperHArchitecture) +# ifndef XF86Server +# define XF86Server YES +# endif +/* 1bpp module */ +# ifndef XF1Bpp +# define XF1Bpp YES +# endif +/* 4bpp module */ +# ifndef XF4Bpp +# define XF4Bpp YES +# endif +/* 8/32bpp overlay module */ +# ifndef XF8_32Bpp +# define XF8_32Bpp YES +# endif +/* 8/16bpp dual fb module */ +# ifndef XF8_16Bpp +# define XF8_16Bpp YES +# endif +/* 24/32bpp conversion module */ +# ifndef XF24_32Bpp +# define XF24_32Bpp YES +# endif +/* shadow fb module */ +# ifndef XFShadowFB +# define XFShadowFB YES +# endif +/* fbdevhw module */ +# ifndef XF86FBDevHw +# define XF86FBDevHw YES +# endif +/* XAA module */ +# ifndef XF86XAA +# define XF86XAA YES +# endif +/* ramdac module */ +# ifndef XF86Ramdac +# define XF86Ramdac YES +# endif +/* I2C module */ +# ifndef XF86I2C +# define XF86I2C YES +# endif +/* DDC module */ +# ifndef XF86DDC +# define XF86DDC YES +# endif +/* RAC (Resource Access Control) module */ +# ifndef XF86RAC +# define XF86RAC YES +# endif + +/* int10 module */ +# ifndef XF86Int10 +# define XF86Int10 YES +# endif + +# ifndef XF86CardDrivers +# define XF86CardDrivers fbdev XF86OSCardDrivers XF86ExtraCardDrivers +# endif +#endif + + /* * For Mips/Arc platforms, the default is to build all modules which * are supported on this platform. @@ -680,6 +740,14 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ # define DebugDefines /**/ #endif +#ifndef XF86Server +# define XF86Server NO +#endif +#if !XF86Server +# undef DoLoadableServer +# define DoLoadableServer NO +#endif + /* * Fbdev module defines. They are set to indicate the fb types supported * on different architectures. @@ -733,14 +801,13 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 * The server-side of PEX is not 64-bit clean. */ #if !defined(BuildPexExt) -# if XF86Server && !defined(AlphaArchitecture) && !defined(ia64Architecture) -# define BuildPexExt YES +# if XF86Server && !defined(AlphaArchitecture) && !defined(ia64Architecture) && !defined(s390xArchitecture) +# define BuildPexExt NO /* But we turn off PEX anyway now */ # else # define BuildPexExt NO # endif #endif - /* * Build GLX server interface * --- Doesn't work for 1-bit and 4-bit servers @@ -878,14 +945,19 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define GlxCoreLibDefines /**/ # endif -# if defined(SparcArchitecture) || defined(ia64Architecture) +# if defined(SparcArchitecture) || defined(ia64Architecture) || defined(s390xArchitecture) # define GlxArchDefines -D__GLX_ALIGN64 # else # if defined(AlphaArchitecture) /* On the Alpha we need to ensure floating point accuracy for 3D */ # define GlxArchDefines -mieee # else -# define GlxArchDefines /**/ +# if defined(DarwinArchitecture) +/* GLX contains lots of uninitalized globals, which can upset Darwin */ +# define GlxArchDefines -fno-common +# else +# define GlxArchDefines /**/ +# endif # endif # endif @@ -932,16 +1004,12 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 */ #ifndef BuildXIE # if XF86Server -# define BuildXIE YES +# define BuildXIE NO # else # define BuildXIE NO # endif #endif -#ifndef BuildXIElib -# define BuildXIElib YES -#endif - #ifndef BuildDBElib # define BuildDBElib YES #endif diff --git a/xc/config/imake/imake.c b/xc/config/imake/imake.c index 89a8a34e7..ac95c7e12 100644 --- a/xc/config/imake/imake.c +++ b/xc/config/imake/imake.c @@ -1,4 +1,3 @@ -/* $Id */ /*************************************************************************** * * @@ -8,7 +7,7 @@ * be passed to the template file. * * * ***************************************************************************/ -/* $XFree86: xc/config/imake/imake.c,v 3.41 2001/01/17 16:38:55 dawes Exp $ */ +/* $XFree86: xc/config/imake/imake.c,v 3.45 2001/08/01 00:44:33 tsi Exp $ */ /* * @@ -44,6 +43,8 @@ in this Software without prior written authorization from The Open Group. * on the Makefile. * Options: * -D define. Same as cpp -D argument. + * -U undefine. Same as cpp -U argument. + * -W warning. Same as cpp -W argument. * -I Include directory. Same as cpp -I argument. * -T template. Designate a template other * than Imake.tmpl @@ -149,9 +150,7 @@ in this Software without prior written authorization from The Open Group. #include <stdlib.h> #include <stdio.h> #include "Xosdefs.h" -#ifndef X_NOT_STDC_ENV #include <string.h> -#endif #include <ctype.h> #ifdef WIN32 # include "Xw32defs.h" @@ -224,27 +223,16 @@ typedef union wait waitType; # define WIFEXITED(w) waitCode(w) # endif #endif /* X_NOT_POSIX */ -#ifndef X_NOT_STDC_ENV -# include <stdlib.h> -#else -char *malloc(), *realloc(); -void exit(); -#endif +#include <stdlib.h> #if defined(macII) && !defined(__STDC__) /* stdlib.h fails to define these */ char *malloc(), *realloc(); #endif /* macII */ -#ifdef X_NOT_STDC_ENV -extern char *getenv(); -#endif #include <errno.h> -#ifdef X_NOT_STDC_ENV -extern int errno; -#endif #ifdef __minix_vmd #define USE_FREOPEN 1 #endif -#if !(defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4)) || defined(macII)) +#if !((defined(sun) && !defined(SVR4)) || defined(macII)) #define USE_STRERROR 1 #endif #ifdef __EMX__ @@ -270,11 +258,6 @@ extern int errno; #include <unix.h> #endif -/* - * is strstr() in <strings.h> on X_NOT_STDC_ENV? - * are there any X_NOT_STDC_ENV machines left in the world? - */ -#include <string.h> #include "imakemdep.h" /* @@ -294,7 +277,7 @@ extern int sys_nerr; #include <sys/utsname.h> #endif -#if !(defined(Lynx) || defined(__Lynx__) || (defined(SVR4) && !defined(sun))) +#if !(defined(Lynx) || defined(__Lynx__) || (defined(SVR4) && !defined(sun))) && !defined(__CYGWIN__) #define HAS_MKSTEMP #endif @@ -399,7 +382,7 @@ boolean show = TRUE; int main(int argc, char *argv[]) { - FILE *tmpfd; + FILE *tmpfd = NULL; char makeMacro[ BUFSIZ ]; char makefileMacro[ BUFSIZ ]; @@ -414,7 +397,9 @@ main(int argc, char *argv[]) if ((tmpfd = fopen(tmpMakefile, "w+")) == NULL) LogFatal("Cannot create temporary file %s.", tmpMakefile); } else { +#ifdef HAS_MKSTEMP int fd; +#endif tmpMakefile = Strdup(tmpMakefile); #ifndef HAS_MKSTEMP if (mktemp(tmpMakefile) == NULL || @@ -587,6 +572,8 @@ SetOpts(int argc, char **argv) AddCppArg(argv[0]); } else if (argv[0][1] == 'U') { AddCppArg(argv[0]); + } else if (argv[0][1] == 'W') { + AddCppArg(argv[0]); } else if (argv[0][1] == 'f') { if (argv[0][2]) Imakefile = argv[0]+2; @@ -1052,8 +1039,13 @@ get_ld_version(FILE *inFile) } while (c != EOF && !isdigit (c)); ungetc (c, ldprog); (void) fscanf (ldprog, "%d.%d", &ldmajor, &ldminor); + /* Start conversion to a more rational number */ + if ((ldmajor > 2) || ((ldmajor == 2) && (ldminor > 9))) + ldmajor *= 100; + else + ldmajor *= 10; fprintf(inFile, "#define DefaultLinuxBinUtilsMajorVersion %d\n", - ldmajor * 10 + ldminor); + ldmajor + ldminor); pclose (ldprog); } } @@ -1383,7 +1375,9 @@ CleanCppInput(char *imakefile) strcmp(ptoken, "pragma") && strcmp(ptoken, "undef")) { if (outFile == NULL) { +#ifdef HAS_MKSTEMP int fd; +#endif tmpImakefile = Strdup(tmpImakefile); #ifndef HAS_MKSTEMP if (mktemp(tmpImakefile) == NULL || diff --git a/xc/config/imake/imakemdep.h b/xc/config/imake/imakemdep.h index 6d47f2f66..58c173e3b 100644 --- a/xc/config/imake/imakemdep.h +++ b/xc/config/imake/imakemdep.h @@ -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.50 2001/04/25 16:44:54 tsi Exp $ */ +/* $XFree86: xc/config/imake/imakemdep.h,v 3.54 2001/08/06 20:51:02 dawes Exp $ */ /* @@ -65,7 +65,7 @@ in this Software without prior written authorization from The Open Group. #ifdef imake_ccflags #undef imake_ccflags #endif -#define imake_ccflags "-Dsco -DSYSV" +#define imake_ccflags "-Dsco -DSYSV -DSCO -DSCO325" #endif #ifdef sony @@ -292,8 +292,8 @@ in this Software without prior written authorization from The Open Group. #define DEFAULT_CPP "cpp" #endif #ifdef __CYGWIN__ -#define USE_CC_E #define DEFAULT_CC "gcc" +#define DEFAULT_CPP "/usr/bin/cpp" #endif #if defined (__QNX__) #define DEFAULT_CPP "/usr/X11R6/bin/cpp" @@ -352,12 +352,30 @@ char *cpp_argv[ARGUMENTS] = { # ifdef __arm__ "-D__arm__", # endif +# ifdef __s390x__ + "-D__s390x__", +# endif # ifdef __sparc__ "-D__sparc__", # endif # ifdef __m68k__ "-D__m68k__", # endif +# ifdef __sh__ + "-D__sh__", +# endif +# ifdef __sh3__ + "-D__sh3__", +# endif +# ifdef __SH3__ + "-D__SH3__", +# endif +# ifdef __SH4__ + "-D__SH4__", +# endif +# ifdef __SH4NOFPU__ + "-D__SH4_NOFPU__", +# endif # ifdef __GNUC__ "-traditional", # endif @@ -460,7 +478,7 @@ char *cpp_argv[ARGUMENTS] = { # ifdef SCO "-DSCO", # ifdef _SCO_DS - "-DSCO325 -DSVR4", + "-DSCO325", # endif # endif # endif @@ -498,7 +516,7 @@ char *cpp_argv[ARGUMENTS] = { # ifdef SCO "-DSCO", # ifdef _SCO_DS - "-DSCO325 -DSVR4", + "-DSCO325", # endif # endif # ifdef ESIX @@ -1120,6 +1138,21 @@ struct symtab predefs[] = { # ifdef __s390__ {"__s390__", "1"}, # endif +# ifdef __sh__ + {"__sh__", "1"}, +# endif +# ifdef __sh3_ + {"__sh3__", "1"}, +# endif +# ifdef __SH3__ + {"__SH3__", "1"}, +# endif +# ifdef __SH4__ + {"__SH4__", "1"}, +# endif +# ifdef __SH4NOFPU__ + {"__SH4NOFPU__", "1"}, +# endif #if defined(__ppc__) {"__ppc__", "1"}, #endif diff --git a/xc/config/makedepend/Imakefile b/xc/config/makedepend/Imakefile index 2d5f68246..c9967dc27 100644 --- a/xc/config/makedepend/Imakefile +++ b/xc/config/makedepend/Imakefile @@ -3,7 +3,7 @@ XCOMM XCOMM XCOMM XCOMM -XCOMM $XFree86: xc/config/makedepend/Imakefile,v 3.8 2001/01/17 16:38:57 dawes Exp $ +XCOMM $XFree86: xc/config/makedepend/Imakefile,v 3.10 2001/06/25 08:12:31 alanh 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 @@ -29,7 +29,12 @@ STDINC_DEFINES = -DINCLUDEDIR=\"$(STDINCDIR)\" POSTINCDIR = PostIncDir POSTINC_DEFINES = -DPOSTINCDIR=\"$(POSTINCDIR)\" #endif -INC_DEFINES = $(PREINC_DEFINES) $(STDINC_DEFINES) $(POSTINC_DEFINES) +#ifdef cygwinArchitecture +EXTRAINCDIR = /usr/include/w32api +EXTRAINC_DEFINES = -DEXTRAINCDIR=\"$(EXTRAINCDIR)\" +#endif +INC_DEFINES = $(PREINC_DEFINES) $(STDINC_DEFINES) $(POSTINC_DEFINES) \ + $(EXTRAINC_DEFINES) OSUF = .Osuf OSUF_DEFINES = -DOBJSUFFIX=\"$(OSUF)\" MAIN_DEFINES = $(INC_DEFINES) $(SIGNAL_DEFINES) $(OSUF_DEFINES) @@ -41,7 +46,7 @@ INCLUDES = -I$(IMAKESRC) -I$(TOP)/include $(TOP_X_INCLUDES)/X11 XBSDLIB = /**/ #endif -AllTarget(ProgramTargetName(makedepend)) +AllTarget(HostProgramTargetName(makedepend)) /* * bootstrapping: want to build the real makedepend diff --git a/xc/config/makedepend/def.h b/xc/config/makedepend/def.h index 2b02b2b55..243530149 100644 --- a/xc/config/makedepend/def.h +++ b/xc/config/makedepend/def.h @@ -20,15 +20,13 @@ 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.9 2001/04/29 23:25:02 tsi Exp $ */ +/* $XFree86: xc/config/makedepend/def.h,v 3.10 2001/07/25 15:04:40 dawes Exp $ */ #include "Xos.h" #include "Xfuncproto.h" #include <stdlib.h> #include <stdio.h> -#ifndef X_NOT_STDC_ENV #include <string.h> -#endif #include <ctype.h> #if 0 #ifndef X_NOT_POSIX @@ -125,15 +123,10 @@ struct filepointer { long f_line; }; -#ifndef X_NOT_STDC_ENV #include <stdlib.h> #if defined(macII) && !defined(__STDC__) /* stdlib.h fails to define these */ char *malloc(), *realloc(); #endif /* macII */ -#else -char *malloc(); -char *realloc(); -#endif char *copy(char *str); int match(char *str, char **list); @@ -173,8 +166,6 @@ int cppsetup(char *line, struct filepointer *filep, struct inclist *inc); -#if NeedVarargsPrototypes extern void fatalerr(char *, ...); extern void warning(char *, ...); extern void warning1(char *, ...); -#endif diff --git a/xc/config/makedepend/ifparser.h b/xc/config/makedepend/ifparser.h index 370f36ede..89d2a2fb2 100644 --- a/xc/config/makedepend/ifparser.h +++ b/xc/config/makedepend/ifparser.h @@ -57,13 +57,10 @@ * ParseIfExpression parse a string for #if */ -/* $XFree86: xc/config/makedepend/ifparser.h,v 3.4 2001/01/17 16:38:58 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/ifparser.h,v 3.5 2001/07/25 15:04:40 dawes Exp $ */ #include <stdio.h> -#ifndef __STDC__ -#define const /**/ -#endif typedef int Bool; #define False 0 #define True 1 @@ -79,10 +76,8 @@ typedef struct _if_parser { } IfParser; const char *ParseIfExpression ( -#ifdef __STDC__ IfParser *, const char *, long * -#endif ); diff --git a/xc/config/makedepend/main.c b/xc/config/makedepend/main.c index abc06b83a..ac16e8155 100644 --- a/xc/config/makedepend/main.c +++ b/xc/config/makedepend/main.c @@ -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.20 2001/04/29 23:25:02 tsi Exp $ */ +/* $XFree86: xc/config/makedepend/main.c,v 3.22 2001/07/25 15:04:40 dawes Exp $ */ #include "def.h" #ifdef hpux @@ -41,9 +41,7 @@ in this Software without prior written authorization from The Open Group. #endif #endif -#if NeedVarargsPrototypes #include <stdarg.h> -#endif #ifdef MINIX #define USE_CHMOD 1 @@ -100,11 +98,6 @@ boolean show_where_not = FALSE; boolean warn_multiple = FALSE; /* Warn on multiple includes of same file */ static void redirect(char *line, char *makefile); -#if !NeedVarargsPrototypes -void fatalerr(); -void warning(); -void warning1(); -#endif static #ifdef SIGNALRETURNSINT @@ -118,7 +111,7 @@ catch (int sig) fatalerr ("got signal %d\n", sig); } -#if defined(USG) || (defined(i386) && defined(SYSV)) || defined(WIN32) || defined(__EMX__) || defined(Lynx_22) +#if defined(USG) || (defined(i386) && defined(SYSV)) || defined(WIN32) || defined(__EMX__) || defined(Lynx_22) || defined(__CYGWIN__) #define USGISH #endif @@ -369,6 +362,12 @@ main(int argc, char *argv[]) *incp++ = INCLUDEDIR; #endif +#ifdef EXTRAINCDIR + if (incp >= includedirs + MAXDIRS) + fatalerr("Too many -I flags.\n"); + *incp++ = EXTRAINCDIR; +#endif + #ifdef POSTINCDIR if (incp >= includedirs + MAXDIRS) fatalerr("Too many -I flags.\n"); @@ -670,12 +669,12 @@ redirect(char *line, char *makefile) fatalerr("cannot open \"%s\"\n", makefile); sprintf(backup, "%s.bak", makefile); unlink(backup); -#if defined(WIN32) || defined(__EMX__) +#if defined(WIN32) || defined(__EMX__) || defined(__CYGWIN__) fclose(fdin); #endif if (rename(makefile, backup) < 0) fatalerr("cannot rename %s to %s\n", makefile, backup); -#if defined(WIN32) || defined(__EMX__) +#if defined(WIN32) || defined(__EMX__) || defined(__CYGWIN__) if ((fdin = fopen(backup, "r")) == NULL) fatalerr("cannot open \"%s\"\n", backup); #endif @@ -706,65 +705,31 @@ redirect(char *line, char *makefile) } void -#if NeedVarargsPrototypes fatalerr(char *msg, ...) -#else -/*VARARGS*/ -fatalerr(msg,x1,x2,x3,x4,x5,x6,x7,x8,x9) - char *msg; -#endif { -#if NeedVarargsPrototypes va_list args; -#endif fprintf(stderr, "%s: error: ", ProgramName); -#if NeedVarargsPrototypes va_start(args, msg); vfprintf(stderr, msg, args); va_end(args); -#else - fprintf(stderr, msg,x1,x2,x3,x4,x5,x6,x7,x8,x9); -#endif exit (1); } void -#if NeedVarargsPrototypes warning(char *msg, ...) -#else -/*VARARGS0*/ -warning(msg,x1,x2,x3,x4,x5,x6,x7,x8,x9) - char *msg; -#endif { -#if NeedVarargsPrototypes va_list args; -#endif fprintf(stderr, "%s: warning: ", ProgramName); -#if NeedVarargsPrototypes va_start(args, msg); vfprintf(stderr, msg, args); va_end(args); -#else - fprintf(stderr, msg,x1,x2,x3,x4,x5,x6,x7,x8,x9); -#endif } void -#if NeedVarargsPrototypes warning1(char *msg, ...) -#else -/*VARARGS0*/ -warning1(msg,x1,x2,x3,x4,x5,x6,x7,x8,x9) - char *msg; -#endif { -#if NeedVarargsPrototypes va_list args; va_start(args, msg); vfprintf(stderr, msg, args); va_end(args); -#else - fprintf(stderr, msg,x1,x2,x3,x4,x5,x6,x7,x8,x9); -#endif } diff --git a/xc/config/pswrap/main.c b/xc/config/pswrap/main.c index fb67400be..49ea2242c 100644 --- a/xc/config/pswrap/main.c +++ b/xc/config/pswrap/main.c @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/config/pswrap/main.c,v 1.4 2000/06/07 19:50:47 tsi Exp $ */ +/* $XFree86: xc/config/pswrap/main.c,v 1.5 2001/08/18 02:47:10 dawes Exp $ */ #include <stdio.h> @@ -129,7 +129,7 @@ static void ScanArgs(int argc, char *argv[]) strcpy(headid, slash ? slash+1 : hfile); for (c = headid; *c != '\0'; c++) { if (*c == '.') *c = '_'; - else isascii(*c) && islower(*c) && (*c = toupper(*c)); + else if (isascii(*c) && islower(*c)) *c = toupper(*c); } break; case 'o': diff --git a/xc/config/pswrap/pswpriv.h b/xc/config/pswrap/pswpriv.h index 9c9392b71..59facb9f0 100644 --- a/xc/config/pswrap/pswpriv.h +++ b/xc/config/pswrap/pswpriv.h @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/config/pswrap/pswpriv.h,v 1.6 2000/06/07 21:58:25 tsi Exp $ */ +/* $XFree86: xc/config/pswrap/pswpriv.h,v 1.7 2001/08/18 02:47:10 dawes Exp $ */ #ifndef PSWPRIV_H #define PSWPRIV_H @@ -132,7 +132,6 @@ extern FILE *header; extern boolean noUserNames; /* -n flag */ extern char *currentPSWName; extern char *hfile; -extern char *ifile; extern char *ifile; /* input file name for error messages */ extern char *ofile; extern char *prog; @@ -141,7 +140,6 @@ extern char *string_temp; /* buffer of that size for scanning strings */ extern char headid[]; extern int bigFile; extern int doANSI; /* -a flag */ -extern int errorCount; extern int maxstring; /* max PS string length to scan (-s) */ extern int lexdebug; /* debug flag for lexer */ extern int errorCount; /* non-fatal errs */ diff --git a/xc/config/pswrap/pswtypes.h b/xc/config/pswrap/pswtypes.h index aa4bd0671..2cfc0cc19 100644 --- a/xc/config/pswrap/pswtypes.h +++ b/xc/config/pswrap/pswtypes.h @@ -35,13 +35,12 @@ * * Author: Adobe Systems Incorporated */ +/* $XFree86: xc/config/pswrap/pswtypes.h,v 1.3 2001/07/29 05:01:10 tsi Exp $ */ #ifndef PSWTYPES_H #define PSWTYPES_H -#ifndef NULL -#define NULL 0 -#endif +#include <stddef.h> #define false 0 #define true 1 diff --git a/xc/config/util/Imakefile b/xc/config/util/Imakefile index 3f5219737..51aac5fb3 100644 --- a/xc/config/util/Imakefile +++ b/xc/config/util/Imakefile @@ -2,7 +2,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ -XCOMM $XFree86: xc/config/util/Imakefile,v 3.36 2001/04/26 21:09:39 dawes Exp $ +XCOMM $XFree86: xc/config/util/Imakefile,v 3.37 2001/06/25 08:12:31 alanh Exp $ #if UseCCMakeDepend CCMDEP_PROG = ccmakedep @@ -18,8 +18,12 @@ CMKDIRHIER = mkdirhier.exe #ifndef OS2Architecture GCCMDEP_PROG = gccmakedep +#if CrossCompiling +LNDIR_PROG = HostProgramTargetName(lndir) +#else LNDIR_PROG = ProgramTargetName(lndir) #endif +#endif #if BuildRman RMAN_PROG = ProgramTargetName(rman) @@ -31,7 +35,7 @@ QNXCopyInstaller($(PROJECTROOT)/bin/install.qnx,./install.sh) PROGRAMS = xmkmf $(CCMDEP_PROG) $(GCCMDEP_PROG) mergelib $(LNDIR_PROG) \ $(RMAN_PROG) ProgramTargetName(revpath) \ - ProgramTargetName(makestrs) $(EXPORTLISTGEN) $(CMKDIRHIER) + HostProgramTargetName(makestrs) $(EXPORTLISTGEN) $(CMKDIRHIER) DEPLIBS = #ifndef Win32Architecture EXTRA_LIBRARIES = @@ -59,7 +63,11 @@ GCCCMD = $(CC) GCCCMD = gcc #endif +#if CrossCompiling +includes:: HostProgramTargetName(makestrs) +#else includes:: ProgramTargetName(makestrs) +#endif #ifdef ExportListGenSource CppScriptTarget(exportlistgen,ExportListGenSource,-DCXXFILT=$(CXXFILT),) @@ -89,8 +97,13 @@ AllTarget(ProgramTargetName(mkdirhier)) SimpleProgramTarget_3(mkdirhier) #endif +#if CrossCompiling +AllTarget(HostProgramTargetName(makestrs)) +SimpleHostProgramTarget(makestrs) +#else AllTarget(ProgramTargetName(makestrs)) SimpleProgramTarget_1(makestrs) +#endif AllTarget(ProgramTargetName(revpath)) SimpleProgramTarget_4(revpath) diff --git a/xc/config/util/checktree.c b/xc/config/util/checktree.c index 1f8036fe7..0cd579b86 100644 --- a/xc/config/util/checktree.c +++ b/xc/config/util/checktree.c @@ -20,6 +20,7 @@ Except as contained in this notice, the name of The Open Group shall 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. */ +/* $XFree86: xc/config/util/checktree.c,v 1.3 2001/07/29 05:01:10 tsi Exp $ */ #include <X11/Xos.h> #include <stdio.h> @@ -58,10 +59,6 @@ in this Software without prior written authorization from The Open Group. #define fmode_bits_write 0222 #define dmode_bits_minset 0775 -#ifdef X_NOT_STDC_ENV -extern int errno; -#endif - int dorcs = 1; /* check RCS file */ int do83 = 1; /* check for 8+3 clash */ int doro = 1; /* disallow writable (checked out) files */ diff --git a/xc/config/util/gccmdep.cpp b/xc/config/util/gccmdep.cpp index d8dac5cd6..43675a6f1 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.8.2.1 2001/05/22 21:25:40 dawes Exp $ +XCOMM $XFree86: xc/config/util/gccmdep.cpp,v 3.9 2001/05/22 13:29:17 dawes Exp $ XCOMM XCOMM Based on mdepend.cpp and code supplied by Hongjiu Lu <hjl@nynexst.com> XCOMM diff --git a/xc/config/util/lndir.c b/xc/config/util/lndir.c index 72eeae414..c157b0f79 100644 --- a/xc/config/util/lndir.c +++ b/xc/config/util/lndir.c @@ -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.13 2001/04/01 13:59:57 tsi Exp $ */ +/* $XFree86: xc/config/util/lndir.c,v 3.14 2001/07/25 15:04:41 dawes Exp $ */ /* From the original /bin/sh script: @@ -69,13 +69,8 @@ in this Software without prior written authorization from The Open Group. #define MAXPATHLEN 2048 #endif -#if NeedVarargsPrototypes #include <stdarg.h> -#endif -#ifdef X_NOT_STDC_ENV -extern int errno; -#endif int silent = 0; /* -silent */ int ignore_links = 0; /* -ignorelinks */ int with_revinfo = 0; /* -withrevinfo */ @@ -84,22 +79,12 @@ char *rcurdir; char *curdir; static void -quit ( -#if NeedVarargsPrototypes - int code, char * fmt, ...) -#else - code, fmt, a1, a2, a3) - char *fmt; -#endif +quit (int code, char * fmt, ...) { -#if NeedVarargsPrototypes va_list args; va_start(args, fmt); vfprintf (stderr, fmt, args); va_end(args); -#else - fprintf (stderr, fmt, a1, a2, a3); -#endif putc ('\n', stderr); exit (code); } @@ -112,28 +97,16 @@ quiterr (int code, char *s) } static void -msg ( -#if NeedVarargsPrototypes - char * fmt, ...) -#else - fmt, a1, a2, a3) - char *fmt; -#endif +msg (char * fmt, ...) { -#if NeedVarargsPrototypes va_list args; -#endif if (curdir) { fprintf (stderr, "%s:\n", curdir); curdir = 0; } -#if NeedVarargsPrototypes va_start(args, fmt); vfprintf (stderr, fmt, args); va_end(args); -#else - fprintf (stderr, fmt, a1, a2, a3); -#endif putc ('\n', stderr); } diff --git a/xc/config/util/makestrs.c b/xc/config/util/makestrs.c index 893bf88fc..492b77c2c 100644 --- a/xc/config/util/makestrs.c +++ b/xc/config/util/makestrs.c @@ -21,18 +21,14 @@ 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.5 2001/01/17 16:39:01 dawes Exp $ */ +/* $XFree86: xc/config/util/makestrs.c,v 3.6 2001/07/25 15:04:41 dawes Exp $ */ /* Constructs string definitions */ #include <stdio.h> #include <X11/Xos.h> -#ifndef X_NOT_STDC_ENV #include <stdlib.h> #include <unistd.h> -#else -char *malloc(); -#endif #if defined(macII) && !defined(__STDC__) /* stdlib.h fails to define these */ char *malloc(); #endif /* macII */ diff --git a/xc/config/util/mdepend.cpp b/xc/config/util/mdepend.cpp index 5aef89521..617051b62 100644 --- a/xc/config/util/mdepend.cpp +++ b/xc/config/util/mdepend.cpp @@ -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.9 2001/04/26 20:55:10 dawes Exp $ +XCOMM $XFree86: xc/config/util/mdepend.cpp,v 3.10 2001/08/17 13:27:50 dawes Exp $ XCOMM CC=PREPROC @@ -175,8 +175,15 @@ done \ | awk '{ if ($1 != $4 && $2 != "#ident" && $2 != "#pragma") { - ofile = substr ($1, 1, length ($1) - 2) "'"$objsuffix"'" - print ofile, $4 + numparts = split( $1, ofileparts, "\." ) + ofile = "" + for ( i = 1; i < numparts; i = i+1 ) + { + if (i != 1 ) + ofile = ofile "." + ofile = ofile ofileparts[i] + } + print ofile "'"$objsuffix"'", $4 } }' \ | sort -u \ diff --git a/xc/config/util/mkshadow/savedir.c b/xc/config/util/mkshadow/savedir.c index 27c6b1dd5..175397962 100644 --- a/xc/config/util/mkshadow/savedir.c +++ b/xc/config/util/mkshadow/savedir.c @@ -14,6 +14,8 @@ (The FSF has modified its usual distribution terms, for this file, as a courtesy to the X project.) */ +/* $XFree86: xc/config/util/mkshadow/savedir.c,v 1.2 2001/07/25 15:04:41 dawes Exp $ */ + /* Written by David MacKenzie <djm@ai.mit.edu>. Modified to use <dirent.h> by default. Per Bothner <bothner@cygnus.com>. */ @@ -43,17 +45,9 @@ #define CLOSEDIR(d) closedir (d) #endif -#ifdef STDC_HEADERS #include <stdlib.h> #include <string.h> -#else -char *malloc (); -char *realloc (); -int strlen (); -#ifndef NULL -#define NULL 0 -#endif -#endif +#include <stddef.h> char *stpcpy (); |