Commit d5935687 authored by alanh's avatar alanh
Browse files

XFree86 4.3.0 merge

parent 2ff36509

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
...@@ -3,12 +3,17 @@ XCOMM $Xorg: Imakefile,v 1.5 2000/08/17 19:41:44 cpqbld Exp $ ...@@ -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 IHaveSubdirs
#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
RELEASE = XOrgReleaseString RELEASE = XOrgReleaseString
#ifdef XFree86VersionString
VERSTRING = " "version XFree86VersionString "("XFree86DateString")"
#endif
#ifndef OSName #ifndef OSName
#define OSName Unknown Operating System! #define OSName Unknown Operating System!
#endif #endif
...@@ -46,6 +51,11 @@ DependSubdirs($(SUBDIRS)) ...@@ -46,6 +51,11 @@ DependSubdirs($(SUBDIRS))
#define IHaveSpecialMakefileTarget #define IHaveSpecialMakefileTarget
#ifndef Win32Architecture #ifndef Win32Architecture
#ifdef XFree86VersionString
VerifyOS::
@echo ""
@echo Building XFree86 version XFree86VersionString "("XFree86DateString")."
#endif
VerifyOS:: VerifyOS::
@echo "" @echo ""
@echo Building on OSName "("OSMajorVersion"."OSMinorVersion"."OSTeenyVersion")." @echo Building on OSName "("OSMajorVersion"."OSMinorVersion"."OSTeenyVersion")."
...@@ -63,18 +73,18 @@ VerifyOS:: ...@@ -63,18 +73,18 @@ VerifyOS::
@echo "" @echo ""
#endif #endif
#ifdef XFree86Version
#ifndef OS2Architecture #ifndef OS2Architecture
version.def:: version.def::
$(RM) $(IRULESRC)/version.def $(RM) $(IRULESRC)/version.def
$(RM) $(IRULESRC)/date.def
$(LN) ../../$(XF86SRC)/xf86Version.h $(IRULESRC)/version.def $(LN) ../../$(XF86SRC)/xf86Version.h $(IRULESRC)/version.def
$(LN) ../../$(XF86SRC)/xf86Date.h $(IRULESRC)/date.def
#else /*OS2Architecture*/ #else /*OS2Architecture*/
version.def:: version.def::
$(RM) $(IRULESRC)/version.def $(RM) $(IRULESRC)/version.def
$(RM) $(IRULESRC)/date.def
$(CP) $(XF86SRC)/xf86Version.h $(IRULESRC)/version.def $(CP) $(XF86SRC)/xf86Version.h $(IRULESRC)/version.def
#endif $(CP) $(XF86SRC)/xf86Date.h $(IRULESRC)/date.def
#else
version.def::
#endif #endif
includes:: includes::
...@@ -96,7 +106,7 @@ World:: ...@@ -96,7 +106,7 @@ World::
Everything:: Everything::
@echo "" @echo ""
@echo Rebuilding $(RELEASE) of the X Window System. @echo Rebuilding XFree86$(VERSTRING).
@echo "" @echo ""
@date @date
@echo "" @echo ""
...@@ -114,7 +124,7 @@ Everything:: ...@@ -114,7 +124,7 @@ Everything::
@echo "" @echo ""
@date @date
@echo "" @echo ""
@echo Rebuild of $(RELEASE) of the X Window System complete. @echo Rebuild of XFree86$(VERSTRING) complete.
@echo "" @echo ""
XCOMM clean out link tree looking for stuff that should get checked in XCOMM clean out link tree looking for stuff that should get checked in
...@@ -141,7 +151,7 @@ clean:: ...@@ -141,7 +151,7 @@ clean::
Everything:: Everything::
@echo : @echo :
@echo Rebuilding $(RELEASE) of the X Window System. @echo Rebuilding XFree86$(VERSTRING).
@echo : @echo :
@echo : @echo :
cd $(IMAKESRC) cd $(IMAKESRC)
...@@ -155,7 +165,7 @@ Everything:: ...@@ -155,7 +165,7 @@ Everything::
$(MAKE) $(MFLAGS) $(MAKE_OPTS) $(WORLDOPTS) $(MAKE) $(MFLAGS) $(MAKE_OPTS) $(WORLDOPTS)
@echo : @echo :
@echo : @echo :
@echo Rebuild of $(RELEASE) of the X Window System complete. @echo Rebuild of XFree86$(VERSTRING) complete.
@echo : @echo :
#ifdef ProjectRoot #ifdef ProjectRoot
......
...@@ -2,7 +2,7 @@ ...@@ -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" # Luna users will need to either run make as "make MAKE=make"
# or add "MAKE = make" to this file. # or add "MAKE = make" to this file.
...@@ -26,6 +26,9 @@ IMAKE_CMD = $(IMAKE) -I$(IRULESRC) $(IMAKE_DEFINES) ...@@ -26,6 +26,9 @@ IMAKE_CMD = $(IMAKE) -I$(IRULESRC) $(IMAKE_DEFINES)
MAKE_OPTS = -f xmakefile MAKE_OPTS = -f xmakefile
MAKE_CMD = $(MAKE) $(MAKE_OPTS) MAKE_CMD = $(MAKE) $(MAKE_OPTS)
FLAGS = $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)" CC="$(CC)" 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: all:
@$(MAKE_CMD) xmakefile-exists || $(MAKE) all-initial @$(MAKE_CMD) xmakefile-exists || $(MAKE) all-initial
...@@ -39,9 +42,12 @@ all-initial: ...@@ -39,9 +42,12 @@ all-initial:
@echo Do not name your log file make.log or it will be deleted. @echo Do not name your log file make.log or it will be deleted.
World: World:
@$(RM) $(VERSPROG)
@$(CC) $(VERSINC) -o $(VERSPROG) $(VERSSRC)
@echo "" @echo ""
@echo Building $(RELEASE) of the X Window System. @echo Building XFree86`$(VERSPROG)`.
@echo "" @echo ""
@$(RM) $(VERSPROG)
@case "x$(BOOTSTRAPCFLAGS)" in x) \ @case "x$(BOOTSTRAPCFLAGS)" in x) \
echo I hope you checked the configuration parameters in $(IRULESRC) ; \ echo I hope you checked the configuration parameters in $(IRULESRC) ; \
echo to see if you need to pass BOOTSTRAPCFLAGS. ; \ echo to see if you need to pass BOOTSTRAPCFLAGS. ; \
...@@ -68,10 +74,14 @@ World: ...@@ -68,10 +74,14 @@ World:
@if [ ! -f $(IRULESRC)/version.def ]; then \ @if [ ! -f $(IRULESRC)/version.def ]; then \
echo "" > $(IRULESRC)/version.def; \ echo "" > $(IRULESRC)/version.def; \
fi fi
@if [ ! -f $(IRULESRC)/date.def ]; then \
echo "" > $(IRULESRC)/date.def; \
fi
cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean
$(MAKE) $(MFLAGS) Makefile.boot $(MAKE) $(MFLAGS) Makefile.boot
$(MAKE_CMD) $(MFLAGS) VerifyOS
$(MAKE_CMD) $(MFLAGS) version.def $(MAKE_CMD) $(MFLAGS) version.def
$(MAKE) $(MFLAGS) Makefile.boot
$(MAKE_CMD) $(MFLAGS) VerifyOS
$(MAKE_CMD) $(MFLAGS) Makefiles $(MAKE_CMD) $(MFLAGS) Makefiles
$(MAKE_CMD) $(MFLAGS) BOOTSTRAPSUBDIRS= clean $(MAKE_CMD) $(MFLAGS) BOOTSTRAPSUBDIRS= clean
$(MAKE_CMD) $(MFLAGS) includes $(MAKE_CMD) $(MFLAGS) includes
...@@ -80,7 +90,10 @@ World: ...@@ -80,7 +90,10 @@ World:
@echo "" @echo ""
@date @date
@echo "" @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 "" @echo ""
.PRECIOUS: Makefile .PRECIOUS: Makefile
...@@ -124,7 +137,7 @@ xmakefile: Imakefile ...@@ -124,7 +137,7 @@ xmakefile: Imakefile
World.Win32: World.Win32:
@echo : @echo :
@echo Building $(RELEASE) of the X Window System. @echo Building XFree86.
@echo : @echo :
@echo : @echo :
-@if not exist $(IRULESRC)\host.def echo > $(IRULESRC)\host.def -@if not exist $(IRULESRC)\host.def echo > $(IRULESRC)\host.def
...@@ -146,12 +159,12 @@ World.Win32: ...@@ -146,12 +159,12 @@ World.Win32:
$(MAKE_CMD) $(MFLAGS) $(WIN32WORLDOPTS) $(MAKE_CMD) $(MFLAGS) $(WIN32WORLDOPTS)
@echo : @echo :
@echo : @echo :
@echo Full build of $(RELEASE) of the X Window System complete. @echo Full build of XFree86 complete.
@echo : @echo :
World.OS2: World.OS2:
@echo : @echo :
@echo Building $(RELEASE) of the X Window System on OS/2. @echo Building XFree86 on OS/2.
@echo : @echo :
@echo : @echo :
-@if not exist $(IRULESRC)\host.def echo > $(IRULESRC)\host.def -@if not exist $(IRULESRC)\host.def echo > $(IRULESRC)\host.def
...@@ -168,7 +181,7 @@ World.OS2: ...@@ -168,7 +181,7 @@ World.OS2:
$(MAKE) $(MFLAGS) $(MAKE) $(MFLAGS)
@echo : @echo :
@echo : @echo :
@echo Full build of $(RELEASE) of the X Window System complete. @echo Full build of XFree86 on OS/2 complete.
@echo : @echo :
# don't allow any default rules in this Makefile # don't allow any default rules in this Makefile
...@@ -184,7 +197,7 @@ dangerous_strip_clean: ...@@ -184,7 +197,7 @@ dangerous_strip_clean:
$(MAKE_CMD) $@ $(MAKE_CMD) $@
distclean: distclean:
$(MAKE_CMD) $@ $(MAKE_CMD) $@
$(RM) xmakefile $(IRULESRC)/version.def $(RM) xmakefile $(IRULESRC)/version.def $(IRULESRC)/date.def
depend: depend:
$(MAKE_CMD) $@ $(MAKE_CMD) $@
Everything: Everything:
......
This diff is collapsed.
XCOMM platform: $Xorg: Amoeba.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $ XCOMM platform: $Xorg: Amoeba.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $
XCOMM platform: $XFree86: xc/config/cf/Amoeba.cf,v 3.10 2001/01/17 16:22:29 dawes Exp $ 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 /* The presence of this configuration file in the X distribution
* does not imply full support for the system it describes. * does not imply full support for the system it describes.
...@@ -253,7 +253,7 @@ ComplexHostProgramTarget(program) ...@@ -253,7 +253,7 @@ ComplexHostProgramTarget(program)
#ifndef Concat #ifndef Concat
#if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp) #if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp)
#define Concat(a,b)a##b #define Concat(a,b)a##b
#else #else
#define Concat(a,b)a/**/b #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 $ ...@@ -2,7 +2,7 @@ XCOMM platform: $Xorg: FreeBSD.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $
XCOMM XCOMM
XCOMM 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 #ifndef UseElfFormat
#define UseElfFormat DefaultToElfFormat #define UseElfFormat DefaultToElfFormat
...@@ -43,7 +43,6 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe ...@@ -43,7 +43,6 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define GccUsesGas YES #define GccUsesGas YES
#define UseGas YES #define UseGas YES
#define GnuCpp YES #define GnuCpp YES
#define HasPoll YES
#define HasNdbm YES #define HasNdbm YES
#define HasPutenv YES #define HasPutenv YES
#define HasSnprintf YES #define HasSnprintf YES
...@@ -66,6 +65,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe ...@@ -66,6 +65,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#if (OSMajorVersion >= 3) #if (OSMajorVersion >= 3)
#define HasIssetugid YES #define HasIssetugid YES
#define HasPoll YES
#endif #endif
#if OSMajorVersion >= 4 #if OSMajorVersion >= 4
...@@ -98,8 +98,13 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe ...@@ -98,8 +98,13 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
# if HasLibPthread # if HasLibPthread
# define ThreadsLibraries -lpthread # define ThreadsLibraries -lpthread
# else # else
# define BuildThreadStubLibrary YES # if OSRelVersion >= 500043
# define NeedUIThrStubs YES # define BuildThreadStubLibrary NO
# define NeedUIThrStubs NO
# else
# define BuildThreadStubLibrary YES
# define NeedUIThrStubs YES
# endif
# if (OSRelVersion >= 500016) # if (OSRelVersion >= 500016)
# define ThreadsLibraries -lc_r # define ThreadsLibraries -lc_r
# else # else
...@@ -156,7 +161,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe ...@@ -156,7 +161,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
* *
* ld: warning: libXThrStub.so.6, needed by libX11.so, not found * ld: warning: libXThrStub.so.6, needed by libX11.so, not found
*/ */
#if BuildThreadStubLibrary && !UseInstalledX11 #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11)
# define CcCmd $(CLIENTENVSETUP) cc # define CcCmd $(CLIENTENVSETUP) cc
# define CplusplusCmd $(CLIENTENVSETUP) c++ # define CplusplusCmd $(CLIENTENVSETUP) c++
#else #else
...@@ -233,18 +238,20 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe ...@@ -233,18 +238,20 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#endif #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. * requirement for enabling this. By 4.2 they were all supported.
*/ */
#ifdef i386Architecture && \ #if defined(i386Architecture) && \
(OSMajorVersion >= 5) || (OSMajorVersion == 4 && OSMinorVersion >= 2)) (OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 2))
# define HasX86Support YES
# define HasMMXSupport YES # define HasMMXSupport YES
# define Has3DNowSupport YES # define Has3DNowSupport YES
# define HasKatmaiSupport YES # define HasSSESupport YES
#else #else
# define HasX86Support NO
# define HasMMXSupport NO # define HasMMXSupport NO
# define Has3DNowSupport NO # define Has3DNowSupport NO
# define HasKatmaiSupport NO # define HasSSESupport NO
#endif #endif
/* /*
...@@ -451,6 +458,9 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe ...@@ -451,6 +458,9 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#ifdef AlphaArchitecture #ifdef AlphaArchitecture
#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 #define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
#endif #endif
#ifdef Sparc64Architecture
#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
#endif
#define StandardDefines -DCSRG_BASED #define StandardDefines -DCSRG_BASED
...@@ -538,6 +548,10 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe ...@@ -538,6 +548,10 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define PamLibraries -lpam DlLibrary #define PamLibraries -lpam DlLibrary
#endif #endif
#ifndef SharedLibXdmGreet
# define SharedLibXdmGreet NO
#endif
/* /*
* On FreeBSD, the run-time loader will use the built-in "rpath" before * On FreeBSD, the run-time loader will use the built-in "rpath" before
* LD_LIBRARY_PATH. This means that utilities like mkfontdir will load * LD_LIBRARY_PATH. This means that utilities like mkfontdir will load
...@@ -569,7 +583,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe ...@@ -569,7 +583,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#endif #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 #if OSMajorVersion == 4
#define GccOptBug295 #define GccOptBug295
......
...@@ -17,7 +17,7 @@ XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $ ...@@ -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. * 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__) #if defined(__APPLE__)
# undef __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 $ ...@@ -129,9 +129,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.78 2002/08/06 13:32:08 herrb Exp $
# endif # endif
# undef mips # undef mips
# endif # endif
# ifdef __alpha__ # if defined(__alpha__) || defined(alpha)
# define AlphaArchitecture # define AlphaArchitecture
# undef __alpha__ # undef __alpha__
# undef alpha
# endif # endif
# ifdef mc68020 # ifdef mc68020
# define Mc68020Architecture # define Mc68020Architecture
...@@ -160,6 +161,8 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.78 2002/08/06 13:32:08 herrb Exp $ ...@@ -160,6 +161,8 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.78 2002/08/06 13:32:08 herrb Exp $
# ifdef __powerpc__ # ifdef __powerpc__
# define PpcArchitecture # define PpcArchitecture
# undef __powerpc__ # undef __powerpc__
# undef __macppc__
# undef macppc
# endif # endif
#endif /* OpenBSD */ #endif /* OpenBSD */
...@@ -225,6 +228,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.78 2002/08/06 13:32:08 herrb Exp $ ...@@ -225,6 +228,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.78 2002/08/06 13:32:08 herrb Exp $
# define AlphaArchitecture # define AlphaArchitecture
# undef __alpha__ # undef __alpha__
# endif # endif
# ifdef __sparc64__
# define Sparc64Architecture
# undef __sparc64__
# endif
#endif /* __FreeBSD__ */ #endif /* __FreeBSD__ */
#ifdef AMOEBA #ifdef AMOEBA
...@@ -710,7 +717,7 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686 ...@@ -710,7 +717,7 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
# endif # endif
# undef __k6 # undef __k6
# endif /* __k6 */ # endif /* __k6 */
XCOMM Keep this order! s390x has also __s390__ defined. /* Keep this order! s390x has also __s390__ defined */
# if defined(__s390x__) # if defined(__s390x__)
# define s390xArchitecture # define s390xArchitecture
# undef __s390x__ # undef __s390x__
...@@ -817,7 +824,7 @@ XCOMM Keep this order! s390x has also __s390__ defined. ...@@ -817,7 +824,7 @@ XCOMM Keep this order! s390x has also __s390__ defined.
# endif # endif
# undef __SH4__ # undef __SH4__
# endif /* __SH4__ */ # endif /* __SH4__ */
XCOMM for compatibility with 3.3.x /* for compatibility with 3.3.x */
# ifdef PpcArchitecture # ifdef PpcArchitecture
# define PowerPCArchitecture # define PowerPCArchitecture
# endif # endif
......
...@@ -5,7 +5,7 @@ XCOMM ...@@ -5,7 +5,7 @@ XCOMM
XCOMM XCOMM
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 * MACHINE-INDEPENDENT RULES; DO NOT MODIFY
...@@ -235,7 +235,7 @@ XCOMM special target for clearmake @@\ ...@@ -235,7 +235,7 @@ XCOMM special target for clearmake @@\
* Concat - concatenates two strings. * Concat - concatenates two strings.
*/ */
#ifndef Concat #ifndef Concat
#if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp) #if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp)
#define Concat(a,b)a##b #define Concat(a,b)a##b
#else #else
#define Concat(a,b)a/**/b #define Concat(a,b)a/**/b
...@@ -246,7 +246,7 @@ XCOMM special target for clearmake @@\ ...@@ -246,7 +246,7 @@ XCOMM special target for clearmake @@\
* Concat3 - concatenates three strings. * Concat3 - concatenates three strings.
*/ */
#ifndef Concat3 #ifndef Concat3
#if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp) #if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp)
#define Concat3(a,b,c)a##b##c #define Concat3(a,b,c)a##b##c
#else #else
#define Concat3(a,b,c)a/**/b/**/c #define Concat3(a,b,c)a/**/b/**/c
...@@ -257,7 +257,7 @@ XCOMM special target for clearmake @@\ ...@@ -257,7 +257,7 @@ XCOMM special target for clearmake @@\
* Concat4 - concatenates four strings. * Concat4 - concatenates four strings.
*/ */
#ifndef Concat4 #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 #define Concat4(a,b,c,d)a##b##c##d
#else #else
#define Concat4(a,b,c,d)a/**/b/**/c/**/d #define Concat4(a,b,c,d)a/**/b/**/c/**/d
...@@ -287,7 +287,7 @@ XCOMM special target for clearmake @@\ ...@@ -287,7 +287,7 @@ XCOMM special target for clearmake @@\
* exists to avoid problems with some preprocessors * exists to avoid problems with some preprocessors
*/ */
#ifndef _XUseCat #ifndef _XUseCat
# if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp) # if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp)
# if defined(UseInstalled) || UseInstalledX11 # if defined(UseInstalled) || UseInstalledX11
# define _XUseCat(a,b,c) a##c # define _XUseCat(a,b,c) a##c
# else # else
...@@ -1677,6 +1677,10 @@ step:: @@\ ...@@ -1677,6 +1677,10 @@ step:: @@\
#if UseSeparateConfDir && HasSymLinks #if UseSeparateConfDir && HasSymLinks
#define LinkConfDirectoryLong(mdir,cdir,rdir,ldir,opath,npath) @@\ #define LinkConfDirectoryLong(mdir,cdir,rdir,ldir,opath,npath) @@\
install:: @@\ 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),opath/cdir)) @@\
MakeDir(Concat($(DESTDIR),npath/mdir)) @@\ MakeDir(Concat($(DESTDIR),npath/mdir)) @@\
@MakeFlagsToShellFlags(i,set +e); \ @@\ @MakeFlagsToShellFlags(i,set +e); \ @@\
...@@ -3123,7 +3127,8 @@ target:: @@\ ...@@ -3123,7 +3127,8 @@ target:: @@\
#ifdef UseInstalled #ifdef UseInstalled
#define ImakeSubCmdHelper $(IMAKE_CMD) #define ImakeSubCmdHelper $(IMAKE_CMD)
#else #else
#define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) $(IMAKE_DEFINES) #define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \
$(IMAKE_DEFINES) $(IMAKE_WARNINGS)
#endif #endif
#endif /* MakeMakeSubdirs */ #endif /* MakeMakeSubdirs */
......
...@@ -5,7 +5,7 @@ XCOMM ...@@ -5,7 +5,7 @@ XCOMM
XCOMM XCOMM
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 ---------------------------------------------------------------------- XCOMM ----------------------------------------------------------------------
/* /*