517. Add rules to generate post-processed and assembler source from C++ files

      (Marc La France).
 516. Change `make World` so that well it interrupts itself to build a utility
      (makedepend, pswrap, etc), it only builds that utility.  Some things were
      being built too early (Marc La France).

    + IRIX build fixes & whitespace cleanup.

13 files changed, 189 insertions, 151 deletions

diff --git a/Makefile b/Makefile
index 2eb0a7425..2e9829a06 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 
 
-# $XFree86: xc/Makefile,v 3.27 2003/02/26 09:21:31 dawes Exp $
+# $XFree86: xc/Makefile,v 3.28tsi Exp $
 
 # Luna users will need to either run make as "make MAKE=make"
 # or add "MAKE = make" to this file.
@@ -122,7 +122,7 @@ $(IMAKESRC)/Makefile.proto: depend.bootstrap
 imake.bootstrap: $(IMAKESRC)/Makefile.proto
 	cd $(IMAKESRC) && $(MAKE) -f Makefile.proto bootstrapdepend
 	cd $(IMAKESRC) && $(MAKE) $(FLAGS) bootstrap
-	cd $(IMAKESRC) && $(MAKE) -f Makefile.proto all
+	cd $(IMAKESRC) && $(MAKE) -f Makefile.proto imakeonly
 	-@if [ -f xmakefile ]; then set -x; \
 	  $(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak; \
 	  else exit 0; fi
@@ -178,7 +178,7 @@ World.OS2:
 	$(MAKE) $(MFLAGS) clean
 	$(MAKE) $(MFLAGS) includes
 	$(MAKE) $(MFLAGS) depend
-	$(MAKE) $(MFLAGS)  
+	$(MAKE) $(MFLAGS)
 	@echo :
 	@echo :
 	@echo Full build of XFree86 on OS/2 complete.
diff --git a/config/cf/Imake.rules b/config/cf/Imake.rules
index b63794975..bbea96be4 100644
--- a/config/cf/Imake.rules
+++ b/config/cf/Imake.rules
@@ -5,7 +5,7 @@ XCOMM
 XCOMM
 XCOMM
 XCOMM
-XCOMM rules:  $XFree86: xc/config/cf/Imake.rules,v 3.124 2003/10/11 09:40:01 herrb Exp $
+XCOMM rules:  $XFree86: xc/config/cf/Imake.rules,v 3.125tsi Exp $
 
 /*
  *		   MACHINE-INDEPENDENT RULES; DO NOT MODIFY
@@ -13,10 +13,10 @@ XCOMM rules:  $XFree86: xc/config/cf/Imake.rules,v 3.124 2003/10/11 09:40:01 her
  * Warning, when defining rules: make sure you do not include both a trailing
  * backslash and double ampersand backslash or else you will get an extra
  * backslash in the Makefile.
- * 
+ *
  * The following macros are defined for the various templates and Imakefiles
  * (for a list of the applicable make variables, see the template files):
- * 
+ *
  * Concat			(a,b)
  * Concat3			(a,b,c)
  * Concat4			(a,b,c,d)
@@ -197,7 +197,7 @@ XCOMM rules:  $XFree86: xc/config/cf/Imake.rules,v 3.124 2003/10/11 09:40:01 her
  * InstallSharedLibrary		(libname,rev,dest)
  * InstallSharedLibraryData	(libname,rev,dest)
  * SharedDepModuleTarget	(name,deps,solist)
- * 
+ *
  */
 
 #define NullParameter
@@ -402,7 +402,7 @@ clean clean.sentinel::							@@\
 #endif /* SentinelProgramTarget */
 
 /*
- * SentinelCplusplusProgramTarget - generate rules to make Sentinel image 
+ * SentinelCplusplusProgramTarget - generate rules to make Sentinel image
  */
 #ifndef SentinelCplusplusProgramTarget
 #if HasSentinel
@@ -620,7 +620,7 @@ $(CXXLINK) -o program options objects libraries $(EXTRA_LOAD_FLAGS)
 #endif /* CplusplusLinkRule */
 
 /*
- * NormalProgramTarget - generate rules to compile and link the indicated 
+ * NormalProgramTarget - generate rules to compile and link the indicated
  * program; since it does not use any default object files, it may be used for
  * multiple programs in the same Imakefile.
  */
@@ -674,7 +674,7 @@ NormalProgramTarget(program,objects,NullParameter,locallibs,syslibs)
 
 /*
  * SimpleProgramTarget - generate rules for compiling and linking programs
- * that only have one C source file.  It should only be used in Imakefiles 
+ * that only have one C source file.  It should only be used in Imakefiles
  * that describe a single program.
  */
 #ifndef SimpleProgramTarget
@@ -823,9 +823,9 @@ InstallProgram(program,$(BINDIR))					@@
 #endif /* CplusplusProgramTargetHelperNoMan */
 
 /*
- * ComplexProgramTarget - generate rules for compiling and linking the 
+ * ComplexProgramTarget - generate rules for compiling and linking the
  * program specified by $(OBJS) and $(SRCS), installing the program and its
- * man page, and generating dependencies.  It should only be used in 
+ * man page, and generating dependencies.  It should only be used in
  * Imakefiles that describe a single program.
  */
 #ifndef ComplexProgramTarget
@@ -860,7 +860,7 @@ clean::									@@\
 
 /*
  * ComplexProgramTargetNoMan - generate rules for compiling and linking
- * the program specified by $(OBJS) and $(SRCS), installing the program 
+ * the program specified by $(OBJS) and $(SRCS), installing the program
  * and generating dependencies.  It should only be used in Imakefiles
  * that describe a single program, and have no manual page.
  */
@@ -898,7 +898,7 @@ clean::									@@\
  * ComplexProgramTarget_1 - generate rules for compiling and linking the
  * program specified by $(OBJS1) and $(SRCS1), installing the program and its
  * man page, and generating dependencies for it and any programs described
- * by $(SRCS2) through $(SRCS10).  It should be used to build the primary 
+ * by $(SRCS2) through $(SRCS10).  It should be used to build the primary
  * program in Imakefiles that describe multiple programs.
  */
 #ifndef ComplexProgramTarget_1
@@ -940,7 +940,7 @@ clean::									@@\
 /*
  * ComplexProgramTarget_2 - generate rules for compiling and linking the
  * program specified by $(OBJS2) and $(SRCS2) and installing the program and
- * man page.  It should be used to build the second program in Imakefiles 
+ * man page.  It should be used to build the second program in Imakefiles
  * describing more than one program.
  */
 #ifndef ComplexProgramTarget_2
@@ -956,7 +956,7 @@ CplusplusProgramTargetHelper(program,SRCS2,OBJS2,DEPLIBS2,locallib,syslib)
 /*
  * ComplexProgramTarget_3 - generate rules for compiling and linking the
  * program specified by $(OBJS3) and $(SRCS3) and installing the program and
- * man page.  It should be used to build the third program in Imakefiles 
+ * man page.  It should be used to build the third program in Imakefiles
  * describing more than one program.
  */
 #ifndef ComplexProgramTarget_3
@@ -972,7 +972,7 @@ CplusplusProgramTargetHelper(program,SRCS3,OBJS3,DEPLIBS3,locallib,syslib)
 /*
  * ComplexProgramTarget_4 - generate rules for compiling and linking the
  * program specified by $(OBJS4) and $(SRCS4) and installing the program and
- * man page.  It should be used to build the third program in Imakefiles 
+ * man page.  It should be used to build the third program in Imakefiles
  * describing more than one program.
  */
 #ifndef ComplexProgramTarget_4
@@ -988,7 +988,7 @@ CplusplusProgramTargetHelper(program,SRCS4,OBJS4,DEPLIBS4,locallib,syslib)
 /*
  * ComplexProgramTarget_5 - generate rules for compiling and linking the
  * program specified by $(OBJS5) and $(SRCS5) and installing the program and
- * man page.  It should be used to build the third program in Imakefiles 
+ * man page.  It should be used to build the third program in Imakefiles
  * describing more than one program.
  */
 #ifndef ComplexProgramTarget_5
@@ -1004,7 +1004,7 @@ CplusplusProgramTargetHelper(program,SRCS5,OBJS5,DEPLIBS5,locallib,syslib)
 /*
  * ComplexProgramTarget_6 - generate rules for compiling and linking the
  * program specified by $(OBJS6) and $(SRCS6) and installing the program and
- * man page.  It should be used to build the third program in Imakefiles 
+ * man page.  It should be used to build the third program in Imakefiles
  * describing more than one program.
  */
 #ifndef ComplexProgramTarget_6
@@ -1020,7 +1020,7 @@ CplusplusProgramTargetHelper(program,SRCS6,OBJS6,DEPLIBS6,locallib,syslib)
 /*
  * ComplexProgramTarget_7 - generate rules for compiling and linking the
  * program specified by $(OBJS7) and $(SRCS7) and installing the program and
- * man page.  It should be used to build the third program in Imakefiles 
+ * man page.  It should be used to build the third program in Imakefiles
  * describing more than one program.
  */
 #ifndef ComplexProgramTarget_7
@@ -1036,7 +1036,7 @@ CplusplusProgramTargetHelper(program,SRCS7,OBJS7,DEPLIBS7,locallib,syslib)
 /*
  * ComplexProgramTarget_8 - generate rules for compiling and linking the
  * program specified by $(OBJS8) and $(SRCS8) and installing the program and
- * man page.  It should be used to build the third program in Imakefiles 
+ * man page.  It should be used to build the third program in Imakefiles
  * describing more than one program.
  */
 #ifndef ComplexProgramTarget_8
@@ -1052,7 +1052,7 @@ CplusplusProgramTargetHelper(program,SRCS8,OBJS8,DEPLIBS8,locallib,syslib)
 /*
  * ComplexProgramTarget_9 - generate rules for compiling and linking the
  * program specified by $(OBJS9) and $(SRCS9) and installing the program and
- * man page.  It should be used to build the third program in Imakefiles 
+ * man page.  It should be used to build the third program in Imakefiles
  * describing more than one program.
  */
 #ifndef ComplexProgramTarget_9
@@ -1068,7 +1068,7 @@ CplusplusProgramTargetHelper(program,SRCS9,OBJS9,DEPLIBS9,locallib,syslib)
 /*
  * ComplexProgramTarget_10 - generate rules for compiling and linking the
  * program specified by $(OBJS10) and $(SRCS10) and installing the program and
- * man page.  It should be used to build the third program in Imakefiles 
+ * man page.  It should be used to build the third program in Imakefiles
  * describing more than one program.
  */
 #ifndef ComplexProgramTarget_10
@@ -1260,7 +1260,7 @@ InstallTarget(install.ln,Concat(llib-l,libname.ln),$(INSTLIBFLAGS),dest)
  * InstallManPageLong - generate rules to install the indicated manual page,
  * giving it an alternate name.  This is used for installing man pages whose
  * base name without the .man suffix would normally be longer than 8 characters
- * (the limit for using source code control systems on files systems with 
+ * (the limit for using source code control systems on files systems with
  * short file names).
  */
 #ifndef InstallManPageLong
@@ -1424,19 +1424,19 @@ InstallGenManPageLong(file,destdir,file,suffix)
 
 
 /*
- * RmanDependency - generate rules to build the rman program if 
+ * RmanDependency - generate rules to build the rman program if
  * this Imakefile is within the source tree.
  */
 #ifndef RmanDependency
 #ifdef UseInstalled
 #define RmanDependency() /**/
 #else
-#define RmanDependency() 						@@\
+#define RmanDependency()						@@\
 NoCmpScript(ProgramTargetName($(RMAN)))					@@\
 									@@\
 ProgramTargetName($(RMAN)):						@@\
 	@echo "checking $(RMANBASENAME) over in $(TOP)/config/util first..."; \	@@\
-	cd $(TOP)/config/util && $(MAKE) $(RMANBASENAME); \		@@\
+	cd $(TOP)/config/util && $(MAKE) rmanonly; \			@@\
 	echo "okay, continuing in $(CURRENT_DIR)"
 
 #endif /* UseInstalled */
@@ -1464,7 +1464,7 @@ install.man:: dest.suffix.html						@@\
 	MakeDir($(DESTDIR)$(DOCHTMLDIR))				@@\
 	@(SUF=`expr suffix \: '\(.\)'`; \				@@\
 	 set -x; \							@@\
-	 $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) dest.suffix.html $(DESTDIR)$(DOCHTMLDIR)/dest.$$SUF.html)						@@\
+	 $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) dest.suffix.html $(DESTDIR)$(DOCHTMLDIR)/dest.$$SUF.html)	@@\
 									@@\
 clean::									@@\
 	RemoveFiles(dest.suffix.html dest.suffix-html)
@@ -1664,7 +1664,7 @@ InstallNamedTargetNoClobber(install,srcname,$(INSTBINFLAGS),dest,dstname)
  */
 #ifndef LinkFileList
 #define LinkFileList(step,list,dir,sub)					@@\
-step:: 									@@\
+step::									@@\
 	@MakeFlagsToShellFlags(i,set +e); \				@@\
 	echo "	cd" dir; cd dir && \					@@\
 	for i in list; do (set -x; $(LN) -f sub/$$i .); done
@@ -1675,9 +1675,9 @@ step:: 									@@\
  * LinkConfDirectoryLong
  *
  * Make links from opath (usually <ProjectRoot>/lib/X11) to npath
- * For example /usr/X11R6/lib/X11/xdm ==> /etc/X11/xdm so that X 
+ * For example /usr/X11R6/lib/X11/xdm ==> /etc/X11/xdm so that X
  * binaries can be mounted from a read-only volume like a CD-ROM;
- * but files that may need to be edited can be stored locally on 
+ * but files that may need to be edited can be stored locally on
  * read-write media. If someone has an existing installation, be
  * careful and move existing files to the new location in /etc.
  * XXX Need to make the installation script do this when installing
@@ -1710,7 +1710,7 @@ install::								@@\
 	  RELPATH=`echo opath/cdir | \					@@\
 		sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ @@\
 	  cd Concat($(DESTDIR),opath/cdir); \				@@\
-	  if [ -d rdir -a ! -h rdir ]; then \ 				@@\
+	  if [ -d rdir -a ! -h rdir ]; then \				@@\
 	    (cd rdir; tar cf - . | \					@@\
 		(cd Concat($(DESTDIR),npath/mdir); \			@@\
 		 tar xf -; exit 0); exit 0); \				@@\
@@ -1737,7 +1737,7 @@ install::								@@\
  * Make links from opath (<ProjectRoot>/lib/X11) to npath
  * For example /usr/X11R6/lib/X11/xxx ==> /etc/X11/xxx so that X binaries
  * can be mounted from a read-only volume like a CD-ROM;
- * but files that may need to be edited can be stored locally on 
+ * but files that may need to be edited can be stored locally on
  * read-write media. If someone has an existing installation, be
  * careful and move existing files to the new location in /etc.
  * XXX Need to make the installation script do this when installing
@@ -1757,7 +1757,7 @@ install::								@@\
 	  RELPATH=`echo opath | \					@@\
 		sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \		@@\
 	  cd Concat($(DESTDIR),opath); \				@@\
-	  if [ -f lfile -a ! -h lfile ]; then \ 			@@\
+	  if [ -f lfile -a ! -h lfile ]; then \				@@\
 	    cp -p lfile Concat($(DESTDIR),npath/cfile); \		@@\
 	  fi; \								@@\
 	  $(RM) -r lfile; \						@@\
@@ -1775,7 +1775,7 @@ install::								@@\
 
 /*
  * InstallMultipleDestFlags - generate rules to install multiple files at
- * once during a particular step in the build using a specific set of install 
+ * once during a particular step in the build using a specific set of install
  * flags.
  */
 #ifndef InstallMultipleDestFlags
@@ -1802,7 +1802,7 @@ step:: list								@@\
 
 /*
  * InstallMultipleDest - generate rules to install multiple files at once
- * during a particular step in the build using any install flags set in 
+ * during a particular step in the build using any install flags set in
  * $(INSTDATFLAGS).
  */
 #ifndef InstallMultipleDest
@@ -1811,8 +1811,8 @@ InstallMultipleDestFlags(step,list,dest,$(INSTDATFLAGS))
 #endif /* InstallMultipleDest */
 
 /*
- * InstallMultiple - generate rules to install multiple files at once 
- * during the install step of the build using any install flags set in 
+ * InstallMultiple - generate rules to install multiple files at once
+ * during the install step of the build using any install flags set in
  * $(INSTALLFLAGS).
  */
 #ifndef InstallMultiple
@@ -1892,21 +1892,21 @@ depend:: ProgramTargetName($(DEPEND))
 #endif
 
 /*
- * DependDependency - generate rules to build the makedepend program if 
+ * DependDependency - generate rules to build the makedepend program if
  * this Imakefile is within the source tree.
  */
 #ifndef DependDependency
 #ifdef UseInstalled
 #define DependDependency() /**/
 #else
-#define DependDependency() 						@@\
+#define DependDependency()						@@\
 DependDependencyStatement()						@@\
 									@@\
 NoCmpScript(ProgramTargetName($(DEPEND)))				@@\
 									@@\
 ProgramTargetName($(DEPEND)):						@@\
 	@echo "checking $@ over in $(DEPENDSRC) first..."; \		@@\
-	cd $(DEPENDSRC) && $(MAKE); \					@@\
+	cd $(DEPENDSRC) && $(MAKE) makedependonly; \			@@\
 	echo "okay, continuing in $(CURRENT_DIR)"
 
 #endif /* UseInstalled */
@@ -2001,7 +2001,7 @@ NoCmpScript(ProgramTargetName($(IMAKE)) $(IMAKE).Osuf)			@@\
 									@@\
 ProgramTargetName($(IMAKE)) $(IMAKE).Osuf:				@@\
 	-@(cd $(IMAKESRC) && if [ -f Makefile ]; then \			@@\
-	echo "checking $@ in $(IMAKESRC) first..."; $(MAKE) all; else \	@@\
+	echo "checking $@ in $(IMAKESRC) first..."; $(MAKE) imakeonly; else \	@@\
 	echo "bootstrapping $@ from Makefile.ini in $(IMAKESRC) first..."; \	@@\
 	$(MAKE) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; fi; \	@@\
 	echo "okay, continuing in $(CURRENT_DIR)")
@@ -2020,7 +2020,7 @@ ProgramTargetName($(IMAKE)) $(IMAKE).Osuf:				@@\
 #define	BuildMakefileTarget(notused,imakeflags)				@@\
 ImakeDependency(Makefile)						@@\
 									@@\
-Makefile:: 								@@\
+Makefile::								@@\
 	RMoveToBakFile(Makefile)					@@\
 	$(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) imakeflags
 
@@ -2121,7 +2121,7 @@ DEPFONTLIB = SharedLibDependencies(Xfont,$(FONTLIBSRC),SOFONTREV)	@@\
 FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont	@@\
 LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
 #endif
- 
+
 /*
  * SharedDSLibDependencies - shared library dependencies with data separation
  */
@@ -2179,6 +2179,16 @@ LintLibReferences(varname,libname,libsource)
 #endif
 
 
+/*
+ * CompileCplusplusToAsm - compile C++ file to assembler
+ */
+#ifndef CompileCplusplusToAsm
+#define CompileCplusplusToAsm(options) RemoveFile($@)			@@\
+	ClearmakeOSName \
+	$(CC) -S $(CFLAGS) options $*.cc
+#endif
+
+
 #ifndef ObjectCplusplusCompile
 #define ObjectCplusplusCompile(options) RemoveFile($@)			@@\
 	ClearmakeOSName \
@@ -2195,7 +2205,7 @@ LintLibReferences(varname,libname,libsource)
 #ifndef NormalRelocLibObjCompile
 # if !StaticNeedsPicForShared
 #  define NormalRelocLibObjCompile(options) NormalLibObjCompile(options)
-# else 
+# else
 #  define NormalRelocLibObjCompile(options) NormalLibObjCompile(options $(PICFLAGS))
 # endif
 #endif
@@ -2418,7 +2428,7 @@ depend:: src.S
 #define SwitchYYPrefix(in,out,prefix) \
 	sed 's/yy/prefix/g' in | sed 's/__REALLY_YY__/yy/' > out && RemoveFile(in)
 #endif
-	
+
 #ifndef LexFilePrefix
 #define LexFilePrefix(file,prefix)					@@\
 file.c: file.l								@@\
@@ -2461,7 +2471,7 @@ file: file.m4 includes							@@\
 	RemoveFile(file)						@@\
 	$(M4) $(M4FLAGS) file.m4 >file					@@\
 									@@\
-depend:: file 								@@\
+depend:: file								@@\
 									@@\
 clean::									@@\
 	RemoveFile(file)
@@ -2575,7 +2585,7 @@ clean::									@@\
 #endif /* _LinkBuildLibrary */
 
 #ifndef LinkBuildSonameLibrary
-#ifdef UseInstalled  
+#ifdef UseInstalled
 #define LinkBuildSonameLibrary(lib) true
 #else
 #define LinkBuildSonameLibrary(lib) MakeDirInline($(BUILDLIBDIR));\	@@\
@@ -2780,7 +2790,7 @@ clean::									@@\
 
 /*
  * NormalRelocatableTarget - generate rules to produce a relocatable object
- * file instead of a library.  
+ * file instead of a library.
  */
 #ifndef NormalRelocatableTarget
 #define	NormalRelocatableTarget(objname,objlist)			@@\
@@ -2794,7 +2804,7 @@ objname.Osuf: objlist $(EXTRALIBRARYDEPS)				@@\
 
 /*
  * NormalDepRelocatableTarget - generate rules to produce a relocatable object
- * file instead of a library.  
+ * file instead of a library.
  */
 #ifndef NormalDepRelocatableTarget
 #define	NormalDepRelocatableTarget(objname,deplist,objlist)		@@\
@@ -2822,7 +2832,7 @@ Concat(objname,_p.Osuf): objlist $(EXTRALIBRARYDEPS)			@@\
 
 
 /*
- * DebuggedRelocatableTarget - generate rules to produce a debuggable 
+ * DebuggedRelocatableTarget - generate rules to produce a debuggable
  * relocatable object file instead of a library.
  */
 #ifndef DebuggedRelocatableTarget
@@ -2949,7 +2959,7 @@ name::									@@\
  * NamedMakeSubdirs - generate rules to do makes in the given subdirectories.
  * If you want CDEBUGFLAGS passed along to subdirectories, provide a line like
  * the following in the appropriate Imakefile
- * 
+ *
  *         #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
  */
 #ifndef LangNamedMakeSubdirs
@@ -2983,7 +2993,7 @@ name::									@@\
  * NamedMakeSubdirs - generate rules to do makes in the given subdirectories.
  * If you want CDEBUGFLAGS passed along to subdirectories, provide a line like
  * the following in the appropriate Imakefile
- * 
+ *
  *         #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
  */
 #ifndef NamedMakeSubdirs
@@ -3111,7 +3121,7 @@ NamedTagSubdirs(tags,dirs)
 #endif
 
 /*
- * MakeLintSubdirs - generate rules to recursively lint directories as part 
+ * MakeLintSubdirs - generate rules to recursively lint directories as part
  * of the named step.
  */
 #ifndef MakeLintSubdirs
@@ -3121,7 +3131,7 @@ NamedTargetSubdirs(target,dirs,"linting" for target and subtarget,DESTDIR=$(DEST
 
 
 /*
- * LintSubdirs - generate rules to recursively lint directories as part of 
+ * LintSubdirs - generate rules to recursively lint directories as part of
  * the make lint step.
  */
 #ifndef LintSubdirs
@@ -3141,8 +3151,8 @@ MakeLintSubdirs(dirs,lintlib,lintlib)
 
 /*
  * MakeMakeSubdirs - generate rules to recursively recreate Makefiles as part
- * of the specified step in the build.  If $(TOP) is set to an absolute path, 
- * do not prepend the ../ prefix.  This makes running things outside of the 
+ * of the specified step in the build.  If $(TOP) is set to an absolute path,
+ * do not prepend the ../ prefix.  This makes running things outside of the
  * source tree much easier.
  * $(ONESUBDIR)/Makefile exists as a separate, explicit target so that
  * clearmake will know what its goal is and do wink-in.
@@ -3170,7 +3180,7 @@ target::								@@\
 		curtmp="$(CURRENT_DIR)" \				@@\
 		toptmp=""; \						@@\
 		case "$$itmp" in \					@@\
-		    ../?*) \ 						@@\
+		    ../?*) \						@@\
 			while echo "$$itmp" | grep '^\.\./' > /dev/null;\	@@\
 			  do \						@@\
 			     toptmp="/`basename $$curtmp`$$toptmp"; \	@@\
diff --git a/config/cf/Imake.tmpl b/config/cf/Imake.tmpl
index 78ffc1051..40d2a96a6 100644
--- a/config/cf/Imake.tmpl
+++ b/config/cf/Imake.tmpl
@@ -5,7 +5,7 @@ XCOMM
 XCOMM
 XCOMM
 XCOMM
-XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.147 2003/10/19 01:02:18 dawes Exp $
+XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.148tsi Exp $
 XCOMM ----------------------------------------------------------------------
 
 /*
@@ -1056,10 +1056,10 @@ TCLIBDIR = TclLibDir
 #endif
 #ifndef CcCmd
 #if HasGcc2
-#define CcCmd gcc -fpcc-struct-return 
+#define CcCmd gcc -fpcc-struct-return
 #else
 #if HasGcc
-#define CcCmd gcc -fstrength-reduce -fpcc-struct-return 
+#define CcCmd gcc -fstrength-reduce -fpcc-struct-return
 #else
 #if HasCenterLineC
 #define CcCmd clcc
@@ -1095,7 +1095,7 @@ TCLIBDIR = TclLibDir
 #define CplusplusDependIncludes /**/
 #endif
 #ifndef CplusplusOptions
-#define CplusplusOptions /**/
+#define CplusplusOptions DefaultCplusplusOptions
 #endif
 #ifndef CplusplusSpecialOptions
 #define CplusplusSpecialOptions /**/
@@ -1590,7 +1590,7 @@ TCLIBDIR = TclLibDir
 #define DocFilesToClean /**/
 #endif
 #ifndef FilesToClean
-#define FilesToClean *.CKP *.ln *.BAK *.bak *.Osuf core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut 
+#define FilesToClean *.CKP *.ln *.BAK *.bak *.Osuf core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut
 #endif
 
 #ifdef CrossCompileDir
@@ -1691,7 +1691,7 @@ TCLIBDIR = TclLibDir
 #else
                AR = ArCmd
 #endif
-XCOMM Nice try but useless: make will inherit BOOTSTRAPCFLAGS 
+XCOMM Nice try but useless: make will inherit BOOTSTRAPCFLAGS
 XCOMM from  top Makefile
   BOOTSTRAPCFLAGS = BootstrapCFlags	/* set if cpp does not have uniq sym */
 #ifdef CrossCompileDir
@@ -1712,7 +1712,7 @@ XCOMM from  top Makefile
 #endif
 #if HasCplusplus
 
-.SUFFIXES: .CCsuf
+.SUFFIXES: Concat(.,CCsuf)
 
 #ifdef CrossCompileDir
               CXX = CrossCplusplusCmd
@@ -1727,7 +1727,7 @@ CXXDEPENDINCLUDES = CplusplusDependIncludes
 CXXEXTRA_INCLUDES = CplusplusExtraIncludes
    CXXSTD_DEFINES = CplusplusStandardDefines $(CXXPROJECT_DEFINES)
        CXXOPTIONS = CplusplusOptions
-      CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) 
+      CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
        CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES)
          CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
 #endif
@@ -1870,9 +1870,9 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
      SHLIBLDFLAGS = SharedLibraryLoadFlags $(SHLIBGLOBALSFLAGS)
 #endif
 /*
- * Here we set up flags needed to produce position-independent code 
+ * Here we set up flags needed to produce position-independent code
  * when doing C and C++ compilation.  The default if you specify C
- * PIC flags without also specifying C++ PIC flags is to assume that 
+ * PIC flags without also specifying C++ PIC flags is to assume that
  * the C flags work for both.  If your C++ compiler requires different
  * flags, specify them explicitly in PositionIndependentCplusplusFlags.
  */
@@ -1927,14 +1927,14 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
 #else
 #define _wideprotodef -DNARROWPROTO
 #endif
-    PROTO_DEFINES = _funcprotodef _wideprotodef 
+    PROTO_DEFINES = _funcprotodef _wideprotodef
 #undef _funcprotodef
 #undef _wideprotodef
 
 #if StripInstalledPrograms
      INSTPGMFLAGS = InstPgmFlags	/* install flags for stripping */
 #else
-     INSTPGMFLAGS = 
+     INSTPGMFLAGS =
 #endif
      INSTBINFLAGS = InstBinFlags	/* install flags for programs */
      INSTUIDFLAGS = InstUidFlags	/* install flags for setuid programs */
@@ -2092,11 +2092,19 @@ XCOMM common rules for all Makefiles - do not edit
 .c.i:
 	CPPOnlyCompile($*.c,$(_NOOP_))
 
+.SUFFIXES: .ii
+
+.cc.ii:
+	CPPOnlyCompile($*.cc,$(_NOOP_))
+
 .SUFFIXES: .s
 
 .c.s:
 	CompileCToAsm($(_NOOP_))
 
+.cc.s:
+	CompileCplusplusToAsm($(_NOOP_))
+
 /*
  * These need to be here so that rules in Imakefile occur first;  the blank
  * emptyrule is to make sure that an empty Imakefile does not default to make
diff --git a/config/cf/Library.tmpl b/config/cf/Library.tmpl
index 24d5e9955..f3e4d0dec 100644
--- a/config/cf/Library.tmpl
+++ b/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.22 2003/03/04 16:25:04 tsi Exp $
+XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.23tsi Exp $
 
 #ifndef DoNormalLib
 #define DoNormalLib NO
@@ -81,7 +81,7 @@ SHLIBGLOBALSFLAGS = ShlibGlobalsFlags
 # ifndef StripPath
 #  define StripPath(x) `echo x|sed "s%.*/%%"`
 # endif
-#endif 
+#endif
 
 #ifndef CplusplusSource
 # ifndef LibraryCcCmd
@@ -127,7 +127,7 @@ CLIBDEBUGFLAGS = LibraryDebugOpt
 #    define LibraryCplusplusCmd CplusplusCmd
 #   endif
 #  endif
-# else 
+# else
 #  ifndef CrossLibraryCplusplusCmd
 #   if DoSharedLib && defined(SharedLibraryCplusplusCmd)
 #    define CrossLibraryCplusplusCmd Concat3(CrossCompileDir,/,StripPath(SharedLibraryCplusplusCmd))
@@ -252,10 +252,12 @@ LIB_MT_DEFINES = LibraryMTDefines
 
 #ifndef CplusplusSource
 # define SRCsuf c
+# define Isuf i
 #else
 # define SRCsuf CCsuf
+# define Isuf ii
 # ifdef SunArchitecture
-.SUFFIXES: .CCsuf
+.SUFFIXES: Concat(.,CCsuf)
 # endif
 #endif
 
@@ -277,7 +279,7 @@ target									@@\
 	_ProfiledObjCompile(staticopts)					@@\
 	_NormalObjCompile(staticopts)					@@\
 	_ExtraObjCompile(staticopts)					@@\
-	_SharedObjCompile(sharedopts)	
+	_SharedObjCompile(sharedopts)
 #endif
 
 #ifdef CplusplusSource
@@ -326,7 +328,7 @@ _CompileObj(objs: depends,options)
 # define SpecialCLibObjectRule(basename,depends,options)		@@\
 _CompileObj(basename.Osuf: basename.SRCsuf depends,options)		@@\
 									@@\
-basename.i: basename.SRCsuf depends					@@\
+basename.Isuf: basename.SRCsuf depends					@@\
 	CPPOnlyCompile(basename.SRCsuf,options)				@@\
 									@@\
 CenterLoadTarget(debug_src,basename.SRCsuf,NullParameter,$(ALLDEFINES) options)
@@ -336,7 +338,7 @@ CenterLoadTarget(debug_src,basename.SRCsuf,NullParameter,$(ALLDEFINES) options)
 # define SpecialCLibObjectRuleSeparateOpts(basename,depends,staticopts,shopts) @@\
 _CompileObjSeparateOpts(basename.Osuf: basename.SRCsuf depends,staticopts,shopts)	@@\
 									@@\
-basename.i: basename.SRCsuf depends					@@\
+basename.Isuf: basename.SRCsuf depends					@@\
 	CPPOnlyCompile(basename.SRCsuf,sharedopts)			@@\
 									@@\
 CenterLoadTarget(debug_src,basename.SRCsuf,NullParameter,$(ALLDEFINES) options)
diff --git a/config/cf/ServerLib.tmpl b/config/cf/ServerLib.tmpl
index 8ad6c7fa3..18a76746d 100644
--- a/config/cf/ServerLib.tmpl
+++ b/config/cf/ServerLib.tmpl
@@ -1,7 +1,7 @@
-XCOMM $XFree86$
+XCOMM $XFree86: xc/config/cf/ServerLib.tmpl,v 3.0tsi Exp $
 /*
  * Server Library imakefile info - this contains any special
- * redefinitions, etc. that Imakefiles in the various server library 
+ * redefinitions, etc. that Imakefiles in the various server library
  * subtrees will need.
  *
  * Before including this, you must set the following boolean variables:
@@ -10,7 +10,7 @@ XCOMM $XFree86$
  */
 
 #ifndef DoNormalLib
-#define DoNormalLib 	YES
+#define DoNormalLib	YES
 #endif
 
 #ifndef LibraryDefines
@@ -88,6 +88,7 @@ XCOMM $XFree86$
 #endif
 
 #define SRCsuf c
+#define Isuf i
 
 #ifndef LibraryObjectRule
 #define LibraryObjectRule()						@@\
@@ -128,7 +129,7 @@ objs: depends								@@\
 #define SpecialCLibObjectRule(basename,depends,options)			@@\
 SpecialLibObjectRule(basename.Osuf,basename.SRCsuf depends,options)	@@\
 									@@\
-basename.i: basename.SRCsuf depends					@@\
+basename.Isuf: basename.SRCsuf depends					@@\
 	CPPOnlyCompile(basename.SRCsuf,options)				@@\
 									@@\
 CenterLoadTarget(debug_src,basename.SRCsuf,NullParameter,$(ALLDEFINES) options)
diff --git a/config/cf/X11.tmpl b/config/cf/X11.tmpl
index 8f6aeb9e4..8753f6724 100644
--- a/config/cf/X11.tmpl
+++ b/config/cf/X11.tmpl
@@ -5,7 +5,7 @@ XCOMM
 XCOMM
 XCOMM
 XCOMM
-XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.226 2003/10/18 02:14:21 dawes Exp $
+XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.227tsi Exp $
 
 /***************************************************************************
  *                                                                         *
@@ -471,7 +471,7 @@ VENDORMANVERSION = XVendorManVersionString
 #define BuildXF86DGALibrary	(BuildXF86DGA && !BuildServersOnly)
 #endif
 #ifndef BuildXResExt
-#define BuildXResExt            NO 
+#define BuildXResExt            NO
 #endif
 #ifndef BuildXResLibrary
 #define BuildXResLibrary        (BuildXResExt && !BuildServersOnly)
@@ -1250,14 +1250,14 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
 #ifndef HasBlindFaithInUnicode
 #define HasBlindFaithInUnicode YES
 #endif
-#ifndef XTrueTypeCConvModule  
+#ifndef XTrueTypeCConvModule
 #if DoLoadableServer
 #define XTrueTypeCConvModule YES
 #else
 #define XTrueTypeCConvModule NO
 #endif
 #endif
-#ifndef XTrueTypeUseOptEncodings  
+#ifndef XTrueTypeUseOptEncodings
 #define XTrueTypeUseOptEncodings YES
 #endif
 #ifndef XTrueTypeCConvIncDir
@@ -1489,11 +1489,11 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
 #define PsWrap $(PSWRAPSRC)/pswrap
 #endif
 
-#ifndef ResourceConfigurationManagement 
+#ifndef ResourceConfigurationManagement
 #define ResourceConfigurationManagement YES
 #endif
 
-#ifndef XtPopdownConformance 
+#ifndef XtPopdownConformance
 #define XtPopdownConformance YES
 #endif
 
@@ -1547,7 +1547,7 @@ XCOMM X Window System make variables; these need to be coordinated with rules
            XSMDIR = XsmDir		/* xsm config files */
            NLSDIR = NlsDir		/* nls files */
        XLOCALEDIR = XLocaleDir		/* locale files */
-      LBXPROXYDIR = LbxproxyDir	        /* lbxproxy files */
+      LBXPROXYDIR = LbxproxyDir		/* lbxproxy files */
   PROXYMANAGERDIR = ProxyManagerDir	/* proxy manager config files */
         XPRINTDIR = XPrintDir		/* print config file root */
       XAPPLOADDIR = XAppLoadDir		/* application default resource dir */
@@ -1570,7 +1570,7 @@ XCOMM X Window System make variables; these need to be coordinated with rules
 # if !CrossCompiling
             FONTC = $(CLIENTENVSETUP) $(PRELOADFONTSETUP) $(XBUILDBINDIR)/bdftopcf
   MKFONTSCALE_DIR = $(PRELOADFREETYPESETUP) $(XBUILDBINDIR)/mkfontscale -b -s -l
-        MKFONTDIR = $(CLIENTENVSETUP) $(MKFONTSCALE_DIR)  
+        MKFONTDIR = $(CLIENTENVSETUP) $(MKFONTSCALE_DIR)
        XCURSORGEN = $(CLIENTENVSETUP) $(PRELOADSETUP) $(XBUILDBINDIR)/xcursorgen
 # elif UseInstalledOnCrossCompile
         MKFONTDIR = $(BINDIR)/mkfontdir
@@ -1637,9 +1637,9 @@ XCOMM X Window System make variables; these need to be coordinated with rules
   SYSTEMENVLIBDIR = SystemBuildLibPath
 # endif
        XENVLIBDIR = X11BuildLibPath
-   CLIENTENVSETUP = BuildLibPathVar=BuildLibPath
+   CLIENTENVSETUP = Concat3(BuildLibPathVar,=,BuildLibPath)
 #else
-   CLIENTENVSETUP = 
+   CLIENTENVSETUP =
 #endif
 
 #ifdef PreloadSetup
@@ -2454,7 +2454,7 @@ ProjectUnsharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),XBuildLib
 #endif
 
 #ifndef SharedLibXau
-#define SharedLibXau 		NO
+#define SharedLibXau		NO
 #endif
 #ifndef NormalLibXau
 #define NormalLibXau (!SharedLibXau | ForceNormalLib)
@@ -2480,7 +2480,7 @@ ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),$(USRLIBDIR))
 #endif
 
 #ifndef SharedLibXdmcp
-#define SharedLibXdmcp 		NO
+#define SharedLibXdmcp		NO
 #endif
 #ifndef NormalLibXdmcp
 #define NormalLibXdmcp (!SharedLibXdmcp | ForceNormalLib)
@@ -2531,7 +2531,7 @@ ProjectUnsharedLibReferences(XMU,Xmu,$(XMUSRC),XBuildLibDir)
 #define SharedLibXmuu HasSharedLibraries
 #endif
 #ifndef NormalLibXmuu
-#define NormalLibXmuu 		(!SharedLibXmuu | ForceNormalLib)
+#define NormalLibXmuu		(!SharedLibXmuu | ForceNormalLib)
 #endif
 #ifndef DebugLibXmuu
 #define DebugLibXmuu		NO	/* debugged Xmuu library */
@@ -3124,7 +3124,7 @@ EXPATDEFINES = -DEXPAT
 #define SharedLibXft1 HasSharedLibraries
 #endif
 #ifndef NormalLibXft1
-#define NormalLibXft1 		NO
+#define NormalLibXft1		NO
 #endif
 #ifndef DebugLibXft1
 #define DebugLibXft1		NO
@@ -3229,7 +3229,7 @@ FCCACHE = $(BINDIR)/fc-cache
 #else
 FCCACHE = set -x; $(CLIENTENVSETUP) $(PRELOADXFTSETUP) FONTCONFIG_PATH=$(FONTCONFIGLIBSRC) $(XBUILDBINDIR)/fc-cache
 #endif
-	  
+
 #else /* BuildFontconfigLibrary */
 
 #if HasFontconfig
@@ -3699,7 +3699,7 @@ InstallFontObjs($(OBJS),dest)
 
 
 /*
- * InstallFontAliases - generate rules to install font aliases databases. 
+ * InstallFontAliases - generate rules to install font aliases databases.
  */
 #ifndef InstallFontAliases
 #define InstallFontAliases(dest)					@@\
@@ -4120,10 +4120,10 @@ clean::									@@\
 
 #ifndef MakeLatexDoc
 #if HasLatex
-#define MakeLatexDoc(file,src)	 					@@\
+#define MakeLatexDoc(file,src)						@@\
 all:: file.ps PdfLatexTarget(file)					@@\
 									@@\
-file.dvi: src	  							@@\
+file.dvi: src								@@\
 	$(LATEX) src							@@\
 									@@\
 file.ps: file.dvi							@@\
@@ -4131,12 +4131,12 @@ file.ps: file.dvi							@@\
 									@@\
 LatexToPdf(file)							@@\
 									@@\
-clean:: 								@@\
+clean::									@@\
 	RemoveFiles(file.nps file.ps file.dvi file.log)			@@\
 	RemoveFiles(file.aux file.toc file.lof file.lot)		@@\
 	$(RM) PdfLatexClean(file)
 #else /* HasLatex */
-#define MakeLatexDoc(file,src)	 					@@\
+#define MakeLatexDoc(file,src)						@@\
 all::									@@\
 file.ps: src								@@\
 	@echo "cannot make file.ps: no latex on this system"; exit 1
diff --git a/config/cf/cygwin.rules b/config/cf/cygwin.rules
index 54024de36..aa4bf9ffc 100644
--- a/config/cf/cygwin.rules
+++ b/config/cf/cygwin.rules
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.23 2002/12/28 17:32:00 alanh Exp $
+XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.24tsi Exp $
 
 /*
  * Cygwin shared library rules (DLL versions)
@@ -52,13 +52,13 @@ XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.23 2002/12/28 17:32:00 alanh Exp $
 #endif
 
 #define SharedLibraryName(libname, rev) \
-Concat3(cyg,libname,-$(shell echo rev|sed s=\\..*==).dll)    
+Concat3(cyg,libname,-$(shell echo rev|sed s=\\..*==).dll)
 
 #define ImportLibraryName(libname, rev) \
-Concat3(lib,libname,-$(shell echo rev|sed s=\\..*==).dll.a)    
+Concat3(lib,libname,-$(shell echo rev|sed s=\\..*==).dll.a)
 
 #define ShortImportLibraryName(libname, rev) \
-Concat3(lib,libname,.dll.a)    
+Concat3(lib,libname,.dll.a)
 
 /*
  * SharedDepLibraryTarget - generate rules to create a shared library.
@@ -88,10 +88,10 @@ CppFileTarget(libname.def,libname-def.cpp,-DLIBRARY_VERSION=rev,$(ICONFIGFILES))
 									@@\
                                                                         @@\
 									@@\
-SharedLibraryName(libname,rev): deplist libname.def		        @@\
+SharedLibraryName(libname,rev): deplist libname.def			@@\
 	RemoveFile(ImportLibraryName(libname,rev))			@@\
 	RemoveFile(SharedLibraryName(libname,rev))			@@\
-	MakeDLL(libname,solist,rev)	                		@@\
+	MakeDLL(libname,solist,rev)					@@\
 	LinkBuildLibrary(ImportLibraryName(libname,rev))		@@\
 	LinkImportLibrary(ImportLibraryName(libname,rev),LibraryTargetName(libname))	@@\
 	LinkBuildDLL(SharedLibraryName(libname,rev))			@@\
@@ -144,7 +144,7 @@ clean::                                                                 @@\
 
 #endif /* SharedDepCplusplusLibraryTarget */
 
-    
+
 /*
  * SharedDepModuleTarget
  */
@@ -180,11 +180,11 @@ clean::									@@\
 
 /*
  * MakeDllProg
- */ 
-    
-#define MakeDLLProg(libname,solist,prog,rev)			        @@\
+ */
+
+#define MakeDLLProg(libname,solist,prog,rev)				@@\
 	prog -shared -Wl,--out-implib=ImportLibraryName(libname,rev) -Wl,--enable-auto-import --def libname.def -Wl,--exclude-libs,ALL -o SharedLibraryName(libname,rev) solist $(REQUIREDLIBS)
-    
+
 /*
  * MakeDll
  */
@@ -206,34 +206,34 @@ clean::									@@\
  */
 
 #define SharedLibraryTarget(libname,rev,solist,down,up)                 @@\
-AllTarget(SharedLibraryName(libname,rev))                             @@\
+AllTarget(SharedLibraryName(libname,rev))				@@\
 									@@\
 CppFileTarget(libname.def,libname-def.cpp,-DLIBRARY_VERSION=rev,$(ICONFIGFILES)) @@\
 									@@\
                                                                         @@\
-SharedLibraryName(libname,rev): solist libname.def	        	@@\
-	RemoveFile(ImportLibraryName(libname,rev))	               	@@\
-	RemoveFile(SharedLibraryName(libname,rev))	            	@@\
-	MakeDLL(libname,solist,rev)		        		@@\
-	LinkBuildLibrary(ImportLibraryName(libname,rev))       		@@\
+SharedLibraryName(libname,rev): solist libname.def			@@\
+	RemoveFile(ImportLibraryName(libname,rev))			@@\
+	RemoveFile(SharedLibraryName(libname,rev))			@@\
+	MakeDLL(libname,solist,rev)					@@\
+	LinkBuildLibrary(ImportLibraryName(libname,rev))		@@\
 	LinkImportLibrary(ImportLibraryName(libname,rev),LibraryTargetName(libname))	@@\
-	LinkBuildDLL(SharedLibraryName(libname,rev))	      		@@\
-clean::							              	@@\
-	RemoveFile(ImportLibraryName(libname,rev))	                @@\
-	RemoveFile(SharedLibraryName(libname,rev))	                @@\
+	LinkBuildDLL(SharedLibraryName(libname,rev))			@@\
+clean::									@@\
+	RemoveFile(ImportLibraryName(libname,rev))			@@\
+	RemoveFile(SharedLibraryName(libname,rev))			@@\
 
 
 /*
  * InstallLink
  */
-    
+
 #ifndef InstallLink
 #define InstallLink(step, file, link, dest)                             @@\
 step::                                                                  @@\
 	MakeDir($(DESTDIR)dest)                                         @@\
 	$(LN) -sf file $(DESTDIR)dest/link
-#endif   
-    
+#endif
+
 /*
  * InstallSharedLibrary
  */
@@ -241,7 +241,7 @@ step::                                                                  @@\
 #define InstallSharedLibrary(libname,rev,dest)                          @@\
 InstallTarget(install,ImportLibraryName(libname,rev),$(INSTLIBFLAGS),$(USRLIBDIR)) @@\
 InstallTarget(install,SharedLibraryName(libname,rev),$(INSTBINFLAGS),$(BINDIR)) @@\
-InstallLink(install,ImportLibraryName(libname,rev),ShortImportLibraryName(libname,rev),$(USRLIBDIR))    
+InstallLink(install,ImportLibraryName(libname,rev),ShortImportLibraryName(libname,rev),$(USRLIBDIR))
 
 
 /*
@@ -274,7 +274,7 @@ InstallLink(install,ImportLibraryName(libname,rev),ShortImportLibraryName(libnam
 /*
  * 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 
+ * linking doesn't work, the executables (e.g. xkbcomp) will report
  * that they cannot find DLLs (e.g. libX11.dll).
  */
 
@@ -287,7 +287,7 @@ InstallLink(install,ImportLibraryName(libname,rev),ShortImportLibraryName(libnam
 #endif
 
 #ifndef LinkImportLibrary
-#ifdef UseInstalled 
+#ifdef UseInstalled
 #define LinkImportLibrary(lib, importlib) $(_NULLCMD_)
 #else
 #define LinkImportLibrary(lib, importlib) MakeDir($(BUILDLIBDIR))     @@\
@@ -307,7 +307,7 @@ InstallLink(install,ImportLibraryName(libname,rev),ShortImportLibraryName(libnam
  *
  * 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.
@@ -380,7 +380,7 @@ Concat(objname,_p.Osuf): objlist $(EXTRALIBRARYDEPS)			@@\
 
 
 /*
- * DebuggedRelocatableTarget - generate rules to produce a debuggable 
+ * DebuggedRelocatableTarget - generate rules to produce a debuggable
  * relocatable object file instead of a library.  Differs from Imake.rules
  * by passing '--oformat pe-i386' to ld.
  */
@@ -425,14 +425,14 @@ depend:: $(DEPEND)
 #ifdef UseInstalled
 #define DependDependency() /**/
 #else
-#define DependDependency() 						@@\
+#define DependDependency()						@@\
 DependDependencyStatement()						@@\
 									@@\
 NoCmpScript($(DEPEND))							@@\
 									@@\
 $(DEPEND):								@@\
 	@echo "checking $@ over in $(DEPENDSRC) first..."; \		@@\
-	cd $(DEPENDSRC) && $(MAKE); \					@@\
+	cd $(DEPENDSRC) && $(MAKE) makedependonly; \			@@\
 	echo "okay, continuing in $(CURRENT_DIR)"
 
 #endif /* UseInstalled */
@@ -457,7 +457,7 @@ NoCmpScript($(IMAKE) $(IMAKE).Osuf)					@@\
 									@@\
 $(IMAKE) $(IMAKE).Osuf:							@@\
 	-@(cd $(IMAKESRC) && if [ -f Makefile ]; then \			@@\
-	echo "checking $@ in $(IMAKESRC) first..."; $(MAKE) all; else \	@@\
+	echo "checking $@ in $(IMAKESRC) first..."; $(MAKE) imakeonly; else \	@@\
 	echo "bootstrapping $@ from Makefile.ini in $(IMAKESRC) first..."; \	@@\
 	$(MAKE) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; fi; \	@@\
 	echo "okay, continuing in $(CURRENT_DIR)")
@@ -472,7 +472,7 @@ $(IMAKE) $(IMAKE).Osuf:							@@\
  */
 
 #ifndef ResourceObjectRule
-#define ResourceObjectRule(basename,depends,options) 			@@\
+#define ResourceObjectRule(basename,depends,options)			@@\
 AllTarget(basename.RESsuf)						@@\
 basename.RESsuf: basename.RCsuf depends					@@\
 	RemoveFile($@)							@@\
diff --git a/config/imake/Imakefile b/config/imake/Imakefile
index 50af04d73..c269a55b2 100644
--- a/config/imake/Imakefile
+++ b/config/imake/Imakefile
@@ -3,14 +3,14 @@ XCOMM
 XCOMM
 XCOMM
 XCOMM
-XCOMM $XFree86: Imakefile,v 3.16 2002/07/01 04:23:15 tsi Exp $
+XCOMM $XFree86: xc/config/imake/Imakefile,v 3.17tsi Exp $
 
 XCOMM Some compilers generate fatal errors if an -L directory does
 XCOMM not exist.  Since BUILDLIBDIR may not exist yet suppress its use.
          LDPRELIB =
         LDPRELIBS =
 
-DEPLIBS = 
+DEPLIBS =
 
 INCLUDES = -I$(TOP)/include $(TOP_X_INCLUDES)/X11
 CPP_PROGRAM = CppCmd
@@ -29,7 +29,8 @@ BOOTSTRAPDEFINES =
 
 DEFINES = $(SIGNAL_DEFINES) $(BOOTSTRAPCFLAGS) $(CPP_DEFINES) $(GCC_DEFINES) \
 	 $(CROSSCOMPILEDEFINES)
-EXTRAMANDEFS = -D__cpp__=CppCmd
+
+EXTRAMANDEFS = -D__cpp__="\"$(CPP_PROGRAM)\""
 
 #if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture)
 XBSDLIB = /**/
@@ -37,7 +38,7 @@ XBSDLIB = /**/
 
 #ifdef CrossCompileDir
 # ifdef TargetPreProcessCmd
-CPP = TargetPreProcessCmd 
+CPP = TargetPreProcessCmd
 # else
 CPP = CrossCompileDir/cc -E -
 # endif
@@ -56,6 +57,9 @@ SimpleHostProgramTarget(imake)
 #else
 SimpleProgramTarget(imake)
 #endif
+
+imakeonly:: $(PROGRAM)
+
 InstallDriverSDKNamedProg(imake,imake,$(DRIVERSDKDIR)/config/imake)
 
 #if HasClearmake
diff --git a/config/makedepend/Imakefile b/config/makedepend/Imakefile
index a29f2a8b5..717714928 100644
--- a/config/makedepend/Imakefile
+++ b/config/makedepend/Imakefile
@@ -3,10 +3,10 @@ XCOMM
 XCOMM
 XCOMM
 XCOMM
-XCOMM $XFree86: xc/config/makedepend/Imakefile,v 3.11 2001/10/09 21:40:21 alanh Exp $
+XCOMM $XFree86: xc/config/makedepend/Imakefile,v 3.12tsi 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 
+    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
 
 XCOMM Some compilers generate fatal errors if an -L directory does
 XCOMM not exist.  Since BUILDLIBDIR may not exist yet suppress its use.
@@ -35,7 +35,7 @@ EXTRAINC_DEFINES = -DEXTRAINCDIR=\"$(EXTRAINCDIR)\"
 #endif
 INC_DEFINES = $(PREINC_DEFINES) $(STDINC_DEFINES) $(POSTINC_DEFINES) \
 	      $(EXTRAINC_DEFINES)
-OSUF = .Osuf
+OSUF = Concat(.,Osuf)
 OSUF_DEFINES = -DOBJSUFFIX=\"$(OSUF)\"
 MAIN_DEFINES = $(INC_DEFINES) $(SIGNAL_DEFINES) $(OSUF_DEFINES)
 INCLUDES = -I$(IMAKESRC) -I$(TOP)/include $(TOP_X_INCLUDES)/X11
@@ -48,6 +48,8 @@ INCLUDES = -I$(IMAKESRC) -I$(TOP)/include $(TOP_X_INCLUDES)/X11
 
 AllTarget(HostProgramTargetName(makedepend))
 
+makedependonly:: HostProgramTargetName(makedepend)
+
 /*
  * bootstrapping: want to build the real makedepend
  * only after we've run "make depend" here.  That way
diff --git a/config/pswrap/Imakefile b/config/pswrap/Imakefile
index 98909381a..98f845d62 100644
--- a/config/pswrap/Imakefile
+++ b/config/pswrap/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/pswrap/Imakefile,v 1.7 2001/03/01 01:23:55 dawes Exp $
+XCOMM $XFree86: xc/config/pswrap/Imakefile,v 1.8tsi Exp $
 
      FRIENDSDEF = -DFRIENDSFILE='"<DPS/dpsfriends.h>"'
         DEFINES = -DXENVIRONMENT
@@ -18,6 +18,8 @@ ComplexHostProgramTarget(pswrap)
 ComplexProgramTarget(pswrap)
 #endif
 
+pswraponly:: $(PROGRAM)
+
 SpecialObjectRule(pswfile.o,pswfile.c,$(FRIENDSDEF))
 
 LexFile(lexer)
diff --git a/config/util/Imakefile b/config/util/Imakefile
index a5ef0ede5..ad5f4eced 100644
--- a/config/util/Imakefile
+++ b/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.47tsi Exp $
+XCOMM $XFree86: xc/config/util/Imakefile,v 3.48tsi Exp $
 
 CCMDEP_PROG = ccmakedep
 
@@ -46,11 +46,13 @@ XCOMM not exist.  Since BUILDLIBDIR may not exist yet suppress its use.
         LDPRELIBS =
 #if CrossCompiling
        LDPOSTLIBS =
-        LDPOSTLIB = 
+        LDPOSTLIB =
 #endif
 
 all:: xmkmf mergelib $(CCMDEP_PROG) $(GCCMDEP_PROG) $(PROGRAMS)
 
+makedependonly:: $(CCMDEP_PROG) $(GCCMDEP_PROG)
+
 #if HasGcc
 GCCCMD = $(CC)
 #else
@@ -102,6 +104,8 @@ SimpleProgramTarget_4(revpath)
 #endif
 
 #if BuildRman
+rmanonly:: $(RMAN_PROG)
+
 VOLLIST="1:2:3:4:5:6:7:8:9:o:l:n:p"
 MANTITLEPRINTF="%s(%s) manual page"
 MANREFPRINTF="%s.%s.html"
diff --git a/lib/dps/Imakefile b/lib/dps/Imakefile
index e4615ae47..5f84428b2 100644
--- a/lib/dps/Imakefile
+++ b/lib/dps/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/lib/dps/Imakefile,v 1.15 2002/06/06 01:40:21 dawes Exp $
+XCOMM $XFree86: xc/lib/dps/Imakefile,v 1.16tsi Exp $
 
 #define DoNormalLib NormalLibDps
 #define DoSharedLib SharedLibDps
@@ -192,7 +192,7 @@ PSOPSCFILES = \
     psl2ops.c
 
 /*
- * hv: HEADERS must be here, otherwise IncSubdir-triggered BuildIncludes 
+ * hv: HEADERS must be here, otherwise IncSubdir-triggered BuildIncludes
  * will fail on systems without ln cmd
  */
 HEADERS = psops.h dpsops.h
@@ -232,7 +232,7 @@ DERIVED_FILES = $(DPSOPSHEADERFILES) $(PSOPSHEADERFILES) \
 
 HostProgramTargetName($(PSWRAP)):
 	@echo "checking $@ over in $(PSWRAPSRC) first..."; \
-	cd $(PSWRAPSRC) && $(MAKE); \
+	cd $(PSWRAPSRC) && $(MAKE) pswraponly; \
 	echo "okay, continuing in $(CURRENT_DIR)"
 
 includes :: $(HEADERS)
@@ -242,7 +242,7 @@ psops.h : $(PSOPSHEADERFILES)
 	RemoveFile($@)
 	${CAT} $(PSOPSHEADERFILES) |\
 	    ${SED} -e '/^$$/D' -e '/#/D' -e '/^\//D'\
-	        -e '/^   gener/D' -e '/^.\//D' |\
+		-e '/^   gener/D' -e '/^.\//D' |\
 	    ${SORT} > .sort
 	${AWK} '/;/ {print; printf("\n");}' .sort > .ttt
 	${CAT} psname.txt header.txt psifdef.txt .ttt psendif.txt > psops.h
@@ -252,7 +252,7 @@ dpsops.h : psops.h $(DPSOPSHEADERFILES)
 	RemoveFile($@)
 	${CAT} $(DPSOPSHEADERFILES) |\
 	    ${SED} -e '/^$$/D' -e '/#/D' -e '/^\//D'\
-	        -e '/^   gener/D' -e '/^.\//D' |\
+		-e '/^   gener/D' -e '/^.\//D' |\
 	    ${SORT} > .sort
 	${AWK} '/;/ {print; printf("\n");}' .sort > .ttt
 	${CAT} dpsname.txt header.txt dpsifdef.txt .ttt dpsendif.txt > dpsops.h
diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG
index 9b7ed2f12..b182189d9 100644
--- a/programs/Xserver/hw/xfree86/CHANGELOG
+++ b/programs/Xserver/hw/xfree86/CHANGELOG
@@ -1,4 +1,9 @@
 XFree86 4.3.99.15 (xx October 2003)
+ 517. Add rules to generate post-processed and assembler source from C++ files
+      (Marc La France).
+ 516. Change `make World` so that well it interrupts itself to build a utility
+      (makedepend, pswrap, etc), it only builds that utility.  Some things were
+      being built too early (Marc La France).
  515. When the i830 driver's checks for sufficient memory for tiled mode
       fail, don't later try to allocate with tiling enabled (David Dawes).
  514. Enable I845G_VBE_WORKAROUND in the i830 driver for all platforms, since
@@ -18010,7 +18015,7 @@ XFree86 3.0a (28 April 1994)
 XFree86 3.0 (26 April 1994)
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.2895 2003/10/21 01:45:46 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.2896 2003/10/21 04:13:37 dawes Exp $