Commit d5935687 authored by alanh's avatar alanh
Browse files

XFree86 4.3.0 merge

parent 2ff36509
......@@ -3,12 +3,17 @@ XCOMM $Xorg: Imakefile,v 1.5 2000/08/17 19:41:44 cpqbld Exp $
XCOMM $XFree86: xc/Imakefile,v 3.26 2002/05/31 18:45:38 dawes Exp $
XCOMM $XFree86: xc/Imakefile,v 3.29 2003/02/26 09:21:31 dawes Exp $
#define IHaveSubdirs
#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
RELEASE = XOrgReleaseString
#ifdef XFree86VersionString
VERSTRING = " "version XFree86VersionString "("XFree86DateString")"
#endif
#ifndef OSName
#define OSName Unknown Operating System!
#endif
......@@ -46,6 +51,11 @@ DependSubdirs($(SUBDIRS))
#define IHaveSpecialMakefileTarget
#ifndef Win32Architecture
#ifdef XFree86VersionString
VerifyOS::
@echo ""
@echo Building XFree86 version XFree86VersionString "("XFree86DateString")."
#endif
VerifyOS::
@echo ""
@echo Building on OSName "("OSMajorVersion"."OSMinorVersion"."OSTeenyVersion")."
......@@ -63,18 +73,18 @@ VerifyOS::
@echo ""
#endif
#ifdef XFree86Version
#ifndef OS2Architecture
version.def::
$(RM) $(IRULESRC)/version.def
$(RM) $(IRULESRC)/date.def
$(LN) ../../$(XF86SRC)/xf86Version.h $(IRULESRC)/version.def
$(LN) ../../$(XF86SRC)/xf86Date.h $(IRULESRC)/date.def
#else /*OS2Architecture*/
version.def::
$(RM) $(IRULESRC)/version.def
$(RM) $(IRULESRC)/date.def
$(CP) $(XF86SRC)/xf86Version.h $(IRULESRC)/version.def
#endif
#else
version.def::
$(CP) $(XF86SRC)/xf86Date.h $(IRULESRC)/date.def
#endif
includes::
......@@ -96,7 +106,7 @@ World::
Everything::
@echo ""
@echo Rebuilding $(RELEASE) of the X Window System.
@echo Rebuilding XFree86$(VERSTRING).
@echo ""
@date
@echo ""
......@@ -114,7 +124,7 @@ Everything::
@echo ""
@date
@echo ""
@echo Rebuild of $(RELEASE) of the X Window System complete.
@echo Rebuild of XFree86$(VERSTRING) complete.
@echo ""
XCOMM clean out link tree looking for stuff that should get checked in
......@@ -141,7 +151,7 @@ clean::
Everything::
@echo :
@echo Rebuilding $(RELEASE) of the X Window System.
@echo Rebuilding XFree86$(VERSTRING).
@echo :
@echo :
cd $(IMAKESRC)
......@@ -155,7 +165,7 @@ Everything::
$(MAKE) $(MFLAGS) $(MAKE_OPTS) $(WORLDOPTS)
@echo :
@echo :
@echo Rebuild of $(RELEASE) of the X Window System complete.
@echo Rebuild of XFree86$(VERSTRING) complete.
@echo :
#ifdef ProjectRoot
......
......@@ -2,7 +2,7 @@
# $XFree86: xc/Makefile,v 3.22 2001/12/19 21:37:26 dawes Exp $
# $XFree86: xc/Makefile,v 3.27 2003/02/26 09:21:31 dawes Exp $
# Luna users will need to either run make as "make MAKE=make"
# or add "MAKE = make" to this file.
......@@ -26,6 +26,9 @@ IMAKE_CMD = $(IMAKE) -I$(IRULESRC) $(IMAKE_DEFINES)
MAKE_OPTS = -f xmakefile
MAKE_CMD = $(MAKE) $(MAKE_OPTS)
FLAGS = $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)" CC="$(CC)"
VERSINC = -Iprograms/Xserver/hw/xfree86
VERSSRC = $(CONFIGSRC)/util/printver.c
VERSPROG = $(CONFIGSRC)/util/printver.exe
all:
@$(MAKE_CMD) xmakefile-exists || $(MAKE) all-initial
......@@ -39,9 +42,12 @@ all-initial:
@echo Do not name your log file make.log or it will be deleted.
World:
@$(RM) $(VERSPROG)
@$(CC) $(VERSINC) -o $(VERSPROG) $(VERSSRC)
@echo ""
@echo Building $(RELEASE) of the X Window System.
@echo Building XFree86`$(VERSPROG)`.
@echo ""
@$(RM) $(VERSPROG)
@case "x$(BOOTSTRAPCFLAGS)" in x) \
echo I hope you checked the configuration parameters in $(IRULESRC) ; \
echo to see if you need to pass BOOTSTRAPCFLAGS. ; \
......@@ -68,10 +74,14 @@ World:
@if [ ! -f $(IRULESRC)/version.def ]; then \
echo "" > $(IRULESRC)/version.def; \
fi
@if [ ! -f $(IRULESRC)/date.def ]; then \
echo "" > $(IRULESRC)/date.def; \
fi
cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean
$(MAKE) $(MFLAGS) Makefile.boot
$(MAKE_CMD) $(MFLAGS) VerifyOS
$(MAKE_CMD) $(MFLAGS) version.def
$(MAKE) $(MFLAGS) Makefile.boot
$(MAKE_CMD) $(MFLAGS) VerifyOS
$(MAKE_CMD) $(MFLAGS) Makefiles
$(MAKE_CMD) $(MFLAGS) BOOTSTRAPSUBDIRS= clean
$(MAKE_CMD) $(MFLAGS) includes
......@@ -80,7 +90,10 @@ World:
@echo ""
@date
@echo ""
@echo Full build of $(RELEASE) of the X Window System complete.
@$(RM) $(VERSPROG)
@$(CC) $(VERSINC) -o $(VERSPROG) $(VERSSRC)
@echo Full build of XFree86`$(VERSPROG)` complete.
@$(RM) $(VERSPROG)
@echo ""
.PRECIOUS: Makefile
......@@ -124,7 +137,7 @@ xmakefile: Imakefile
World.Win32:
@echo :
@echo Building $(RELEASE) of the X Window System.
@echo Building XFree86.
@echo :
@echo :
-@if not exist $(IRULESRC)\host.def echo > $(IRULESRC)\host.def
......@@ -146,12 +159,12 @@ World.Win32:
$(MAKE_CMD) $(MFLAGS) $(WIN32WORLDOPTS)
@echo :
@echo :
@echo Full build of $(RELEASE) of the X Window System complete.
@echo Full build of XFree86 complete.
@echo :
World.OS2:
@echo :
@echo Building $(RELEASE) of the X Window System on OS/2.
@echo Building XFree86 on OS/2.
@echo :
@echo :
-@if not exist $(IRULESRC)\host.def echo > $(IRULESRC)\host.def
......@@ -168,7 +181,7 @@ World.OS2:
$(MAKE) $(MFLAGS)
@echo :
@echo :
@echo Full build of $(RELEASE) of the X Window System complete.
@echo Full build of XFree86 on OS/2 complete.
@echo :
# don't allow any default rules in this Makefile
......@@ -184,7 +197,7 @@ dangerous_strip_clean:
$(MAKE_CMD) $@
distclean:
$(MAKE_CMD) $@
$(RM) xmakefile $(IRULESRC)/version.def
$(RM) xmakefile $(IRULESRC)/version.def $(IRULESRC)/date.def
depend:
$(MAKE_CMD) $@
Everything:
......
This diff is collapsed.
XCOMM platform: $Xorg: Amoeba.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $
XCOMM platform: $XFree86: xc/config/cf/Amoeba.cf,v 3.10 2001/01/17 16:22:29 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/Amoeba.cf,v 3.11 2002/11/14 21:01:13 tsi Exp $
/* The presence of this configuration file in the X distribution
* does not imply full support for the system it describes.
......@@ -253,7 +253,7 @@ ComplexHostProgramTarget(program)
#ifndef Concat
#if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp)
#if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp)
#define Concat(a,b)a##b
#else
#define Concat(a,b)a/**/b
......
......@@ -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.121 2002/09/12 17:23:53 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.128 2003/01/15 02:52:12 dawes Exp $
#ifndef UseElfFormat
#define UseElfFormat DefaultToElfFormat
......@@ -43,7 +43,6 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define GccUsesGas YES
#define UseGas YES
#define GnuCpp YES
#define HasPoll YES
#define HasNdbm YES
#define HasPutenv YES
#define HasSnprintf YES
......@@ -66,6 +65,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#if (OSMajorVersion >= 3)
#define HasIssetugid YES
#define HasPoll YES
#endif
#if OSMajorVersion >= 4
......@@ -98,8 +98,13 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
# if HasLibPthread
# define ThreadsLibraries -lpthread
# else
# if OSRelVersion >= 500043
# define BuildThreadStubLibrary NO
# define NeedUIThrStubs NO
# else
# define BuildThreadStubLibrary YES
# define NeedUIThrStubs YES
# endif
# if (OSRelVersion >= 500016)
# define ThreadsLibraries -lc_r
# else
......@@ -156,7 +161,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
*
* ld: warning: libXThrStub.so.6, needed by libX11.so, not found
*/
#if BuildThreadStubLibrary && !UseInstalledX11
#if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11)
# define CcCmd $(CLIENTENVSETUP) cc
# define CplusplusCmd $(CLIENTENVSETUP) c++
#else
......@@ -233,18 +238,20 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#endif
/*
* Katmai (SSE) and 3DNow will be autodetected, so binutils is the only
* SSE and 3DNow will be autodetected, so binutils is the only
* requirement for enabling this. By 4.2 they were all supported.
*/
#ifdef i386Architecture && \
(OSMajorVersion >= 5) || (OSMajorVersion == 4 && OSMinorVersion >= 2))
#if defined(i386Architecture) && \
(OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 2))
# define HasX86Support YES
# define HasMMXSupport YES
# define Has3DNowSupport YES
# define HasKatmaiSupport YES
# define HasSSESupport YES
#else
# define HasX86Support NO
# define HasMMXSupport NO
# define Has3DNowSupport NO
# define HasKatmaiSupport NO
# define HasSSESupport NO
#endif
/*
......@@ -451,6 +458,9 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#ifdef AlphaArchitecture
#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
#endif
#ifdef Sparc64Architecture
#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
#endif
#define StandardDefines -DCSRG_BASED
......@@ -538,6 +548,10 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define PamLibraries -lpam DlLibrary
#endif
#ifndef SharedLibXdmGreet
# define SharedLibXdmGreet NO
#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
......@@ -569,7 +583,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#endif
/*
* A hack to work around an optimization problem with gcc 2.95.2
* A hack to work around an optimization problem with gcc 2.95.2 - 2.95.4
*/
#if OSMajorVersion == 4
#define GccOptBug295
......
......@@ -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.78 2002/08/06 13:32:08 herrb Exp $
XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.81 2003/02/18 16:51:45 tsi Exp $
#if defined(__APPLE__)
# undef __APPLE__
......@@ -129,9 +129,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.78 2002/08/06 13:32:08 herrb Exp $
# endif
# undef mips
# endif
# ifdef __alpha__
# if defined(__alpha__) || defined(alpha)
# define AlphaArchitecture
# undef __alpha__
# undef alpha
# endif
# ifdef mc68020
# define Mc68020Architecture
......@@ -160,6 +161,8 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.78 2002/08/06 13:32:08 herrb Exp $
# ifdef __powerpc__
# define PpcArchitecture
# undef __powerpc__
# undef __macppc__
# undef macppc
# endif
#endif /* OpenBSD */
......@@ -225,6 +228,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.78 2002/08/06 13:32:08 herrb Exp $
# define AlphaArchitecture
# undef __alpha__
# endif
# ifdef __sparc64__
# define Sparc64Architecture
# undef __sparc64__
# endif
#endif /* __FreeBSD__ */
#ifdef AMOEBA
......@@ -710,7 +717,7 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
# endif
# undef __k6
# endif /* __k6 */
XCOMM Keep this order! s390x has also __s390__ defined.
/* Keep this order! s390x has also __s390__ defined */
# if defined(__s390x__)
# define s390xArchitecture
# undef __s390x__
......@@ -817,7 +824,7 @@ XCOMM Keep this order! s390x has also __s390__ defined.
# endif
# undef __SH4__
# endif /* __SH4__ */
XCOMM for compatibility with 3.3.x
/* for compatibility with 3.3.x */
# ifdef PpcArchitecture
# define PowerPCArchitecture
# endif
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.110 2002/10/16 01:45:28 dawes Exp $
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.113 2002/12/09 23:00:42 dawes Exp $
/*
* MACHINE-INDEPENDENT RULES; DO NOT MODIFY
......@@ -235,7 +235,7 @@ XCOMM special target for clearmake @@\
* Concat - concatenates two strings.
*/
#ifndef Concat
#if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp)
#if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp)
#define Concat(a,b)a##b
#else
#define Concat(a,b)a/**/b
......@@ -246,7 +246,7 @@ XCOMM special target for clearmake @@\
* Concat3 - concatenates three strings.
*/
#ifndef Concat3
#if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp)
#if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp)
#define Concat3(a,b,c)a##b##c
#else
#define Concat3(a,b,c)a/**/b/**/c
......@@ -257,7 +257,7 @@ XCOMM special target for clearmake @@\
* Concat4 - concatenates four strings.
*/
#ifndef Concat4
#if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp)
#if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp)
#define Concat4(a,b,c,d)a##b##c##d
#else
#define Concat4(a,b,c,d)a/**/b/**/c/**/d
......@@ -287,7 +287,7 @@ XCOMM special target for clearmake @@\
* exists to avoid problems with some preprocessors
*/
#ifndef _XUseCat
# if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp)
# if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp)
# if defined(UseInstalled) || UseInstalledX11
# define _XUseCat(a,b,c) a##c
# else
......@@ -1677,6 +1677,10 @@ step:: @@\
#if UseSeparateConfDir && HasSymLinks
#define LinkConfDirectoryLong(mdir,cdir,rdir,ldir,opath,npath) @@\
install:: @@\
@MakeFlagsToShellFlags(i,set +e); \ @@\
if [ -h Concat($(DESTDIR),npath/mdir) ]; then \ @@\
$(RM) Concat($(DESTDIR),npath/mdir); \ @@\
fi @@\
MakeDir(Concat($(DESTDIR),opath/cdir)) @@\
MakeDir(Concat($(DESTDIR),npath/mdir)) @@\
@MakeFlagsToShellFlags(i,set +e); \ @@\
......@@ -3123,7 +3127,8 @@ target:: @@\
#ifdef UseInstalled
#define ImakeSubCmdHelper $(IMAKE_CMD)
#else
#define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) $(IMAKE_DEFINES)
#define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \
$(IMAKE_DEFINES) $(IMAKE_WARNINGS)
#endif
#endif /* MakeMakeSubdirs */
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.130 2002/10/12 16:06:38 herrb Exp $
XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.139 2003/01/28 22:06:08 alanh Exp $
XCOMM ----------------------------------------------------------------------
/*
......@@ -52,6 +52,13 @@ XCOMM the platform-specific parameters - edit site.def to change
# define HasGcc HasGcc2
#endif
#ifndef HasCenterLineC
#define HasCenterLineC NO
#endif
#ifndef HasCenterLineCplusplus
#define HasCenterLineCplusplus NO
#endif
#ifndef HasClearmake
# define HasClearmake NO
#endif
......@@ -119,6 +126,13 @@ XCOMM the platform-specific parameters - edit site.def to change
#ifndef UseEtcX11
#define UseEtcX11 YES
#endif
#ifndef UseInstalledX11
# define UseInstalledX11 NO
#endif
#ifdef UseInstalled
# undef UseInstalledX11
# define UseInstalledX11 YES
#endif
#if NothingOutsideProjectRoot
#undef UseEtcX11
#define UseEtcX11 NO
......@@ -258,6 +272,10 @@ XCOMM the platform-specific parameters - edit site.def to change
#endif
#endif
#ifndef CompressManPages
#define CompressManPages NO
#endif
#ifndef HasGroff
#define HasGroff NO
#endif
......@@ -266,6 +284,19 @@ XCOMM the platform-specific parameters - edit site.def to change
#define HasCookieMaker NO
#endif
#ifndef DoLoadableServer
#define DoLoadableServer NO
#endif
#ifndef MakeDllModules
#define MakeDllModules NO
#endif
#ifndef StripInstalledPrograms
#define StripInstalledPrograms NO /* leave symbol table just in case */
#endif
#ifndef StaticNeedsPicForShared
#define StaticNeedsPicForShared NO
#endif
#include <Imake.rules>
#ifndef HasSharedLibraries
......@@ -325,6 +356,13 @@ XCOMM the platform-specific parameters - edit site.def to change
#define HasLargeTmp NO /* be paranoid */
#endif
#ifndef HasMotif
#define HasMotif NO
#endif
#ifndef HasBSDAuth
#define HasBSDAuth NO
#endif
#ifndef HasBSD44Sockets
#define HasBSD44Sockets NO
#endif
......@@ -409,6 +447,9 @@ XCOMM the platform-specific parameters - edit site.def to change
#ifndef HasGetpeereid
#define HasGetpeereid NO
#endif
#ifndef NoStrstr
#define NoStrstr NO
#endif
/* byte-order defaults */
#ifndef ByteOrder
#if defined(VaxArchitecture)
......@@ -452,6 +493,9 @@ XCOMM the platform-specific parameters - edit site.def to change
#ifndef HasFortran
#define HasFortran NO
#endif
#ifndef HasGcc2ForCplusplus
#define HasGcc2ForCplusplus NO
#endif
#ifndef HasCplusplus
#if HasGcc2ForCplusplus
#define HasCplusplus YES
......@@ -510,10 +554,6 @@ XCOMM the platform-specific parameters - edit site.def to change
#ifndef HasFontconfig
#define HasFontconfig NO
#endif
/* If the system has the libxml2 library */
#ifndef HasLibxml2
#define HasLibxml2 NO
#endif
#ifndef HasLibpng
#define HasLibpng NO
#endif
......@@ -673,6 +713,9 @@ TCLIBDIR = TclLibDir
#define TclLibrary
#endif
#endif
#ifndef HasTsLib
#define HasTsLib NO
#endif
/*
* Libtool has two different behaviours for version numbers.
* On platforms which support a minor number, the library
......@@ -700,9 +743,6 @@ TCLIBDIR = TclLibDir
#define NeedWidePrototypes YES /* mix and match ANSI-C, non-ANSI */
#endif
#ifndef StripInstalledPrograms
#define StripInstalledPrograms NO /* leave symbol table just in case */
#endif
#ifndef UseCCMakeDepend /* use slow cc -E script */
#define UseCCMakeDepend NO
#endif
......@@ -759,7 +799,7 @@ TCLIBDIR = TclLibDir
* various standards (e.g., Linux/OpenGL).
*/
#ifndef SystemUsrLibDir
#define SystemUsrLibDir /usr/lib
#define SystemUsrLibDir /usr/LibDirName
#endif
#ifndef SystemUsrIncDir
#define SystemUsrIncDir /usr/include
......@@ -842,11 +882,6 @@ TCLIBDIR = TclLibDir
#define ProjectManDefs -D__projectroot__=$(PROJECTROOT)
#endif
#ifndef CompressManPages
#define CompressManPages NO
#endif
#ifndef CompressManCmd
#define CompressManCmd gzip -n
#endif
......@@ -997,18 +1032,9 @@ TCLIBDIR = TclLibDir
#ifndef HasGcc
#define HasGcc HasGcc2
#endif
#ifndef HasGcc2ForCplusplus
#define HasGcc2ForCplusplus NO
#endif
#ifndef HasBrokenCCForLink
#define HasBrokenCCForLink NO
#endif
#ifndef HasCenterLineC
#define HasCenterLineC NO
#endif
#ifndef HasCenterLineCplusplus
#define HasCenterLineCplusplus NO
#endif
#ifndef CcCmd
#if HasGcc2
#define CcCmd gcc -fpcc-struct-return
......@@ -1079,7 +1105,7 @@ TCLIBDIR = TclLibDir
#define GzipCmd gzip
#endif
#ifndef CppCmd
#define CppCmd /lib/cpp
#define CppCmd /LibDirName/cpp
#endif
#ifndef RawCppCmd
#define RawCppCmd CppCmd -undef
......@@ -1254,13 +1280,12 @@ TCLIBDIR = TclLibDir
#define NdbmDefines /**/
#endif
#endif
#ifndef HasLdRunPath
#define HasLdRunPath NO
#endif
#ifndef LdPreLib
# if !defined(UseInstalled)
# if !BuildLibraries && AlternateUsrLibDir
# define LdPreLib -L$(BUILDLIBDIR) -L$(USRLIBDIR)
# else
# define LdPreLib -L$(BUILDLIBDIR)
# endif
# else
# if AlternateUsrLibDir
# define LdPreLib -L$(USRLIBDIR)
......@@ -1325,6 +1350,9 @@ TCLIBDIR = TclLibDir
#define ImakeCmd $(IMAKESRC)/imake
#endif
#endif
#ifndef ImakeWarningFlags
#define ImakeWarningFlags /* Nothing */
#endif
#ifndef DependCmd
#if UseGccMakeDepend
#ifdef UseInstalled /* assume BINDIR in path */
......@@ -1347,7 +1375,7 @@ TCLIBDIR = TclLibDir
#endif
#endif
#ifndef DependDefines
# if UseCCMakedepend || UseGccMakedepend
# if UseCCMakeDepend || UseGccMakeDepend
# define DependDefines /**/
# else
# define DependDefines -DUSE_MAKEDEPEND
......@@ -1782,7 +1810,7 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
SHAREDCODEDEF = SharedCodeDef
SHLIBDEF = SharedLibraryDef
#ifdef SharedLibraryLoadFlags
SHLIBLDFLAGS = SharedLibraryLoadFlags
SHLIBLDFLAGS = SharedLibraryLoadFlags $(SHLIBGLOBALSFLAGS)
#endif
/*
* Here we set up flags needed to produce position-independent code
......@@ -1871,6 +1899,7 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
#else
# define TopInclude -I$(TOP)
#endif
CDEBUGFLAGS = DefaultCDebugFlags
CCOPTIONS = DefaultCCOptions /* to distinguish from param flags */
/*
......@@ -1884,7 +1913,7 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
LDPRELIB = LdPreLib
LDPRELIB = LdPreLib $(INSTALLED_LIBS)
LDPOSTLIB = LdPostLib
LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
......@@ -1925,12 +1954,14 @@ XCOMM Not sure this belongs here
RM_CMD = $(RM)
IMAKE_DEFINES = /* leave blank, for command line use only */
IMAKE_WARNINGS = ImakeWarningFlags
#ifdef UseInstalled
IRULESRC = $(CONFIGDIR) /* used in rules file */
IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES)
IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) \
$(IMAKE_WARNIN