diff --git a/ChangeLog b/ChangeLog
index 14407f69a..36569f885 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-03  Werner Lemberg  <wl@gnu.org>
+
+	* Jamfile, src/Jamfile, src/*/Jamfile: Formatted.  Slight changes
+	to give files identical structure.
+
 2001-04-02  Werner Lemberg  <wl@gnu.org>
 
 	* CHANGES: Reformatted, minor fixes.
diff --git a/Jamfile b/Jamfile
index 3457a5ba9..764330385 100644
--- a/Jamfile
+++ b/Jamfile
@@ -1,13 +1,13 @@
-# FreeType 2 Jamfile (c) 2001 David Turner
+# FreeType 2 top Jamfile (c) 2001 David Turner
 #
 
-# we need to invoke a SubDir rule if the FT2 source directory top
-# is not the current directory. This allows us to build FreeType 2 as
-# part of a larger project easily..
+# We need to invoke a SubDir rule if the FT2 source directory top is not the
+# current directory.  This allows us to build FreeType 2 as part of a larger
+# project easily.
 #
 if $(FT2_TOP) != $(DOT)
 {
-  SubDir FT2_TOP ;
+  SubDir  FT2_TOP ;
 }
 
 FT2_INCLUDE = [ FT2_SubDir include ] ;
@@ -15,26 +15,26 @@ FT2_SRC     = [ FT2_SubDir src ] ;
 
 FT2_LIB     = $(LIBPREFIX)freetype ;
 
-# we need "freetype2/include" in the current include path in order to
-# compile any part of FreeType 2
+# We need "freetype2/include" in the current include path in order to
+# compile any part of FreeType 2.
 #
-SubDirHdr += $(FT2_INCLUDE) ;
+SubDirHdr  += $(FT2_INCLUDE) ;
 
-# uncomment the following line if you want to build individual source files
+# Uncomment the following line if you want to build individual source files
 # for each FreeType 2 module.
 #
 # FT2_MULTI = true ;
 
-# the file <freetype/config/ft2build.h> is used to define macros that are
-# later used in #include statements.. it needs to be parsed in order to
-# record these definitions..
+# The file <freetype/config/ft2build.h> is used to define macros that are
+# later used in #include statements.  It needs to be parsed in order to
+# record these definitions.
 #
-HDRMACRO [ FT2_SubDir  include freetype config ft2build.h ] ;
+HDRMACRO  [ FT2_SubDir  include freetype config ft2build.h ] ;
 
-# now include the Jamfile in "freetype2/src", used to drive the
-# compilation of each FreeType 2 component and/or module
+# Now include the Jamfile in "freetype2/src", used to drive the compilation
+# of each FreeType 2 component and/or module.
 #
 SubInclude  FT2_TOP src ;
 
 
-
+# end of top Jamfile
diff --git a/Jamrules b/Jamrules
index a98dd817f..7bb4f529a 100644
--- a/Jamrules
+++ b/Jamrules
@@ -1,13 +1,13 @@
 # FreeType 2 JamRules (c) 2001 David Turner
 #
-# This file contains the Jam rules needed to build the FreeType 2 library
-# it is shared by all Jamfiles and is included only once in the build
-# process
+# This file contains the Jam rules needed to build the FreeType 2 library.
+# It is shared by all Jamfiles and is included only once in the build
+# process.
 #
 
 
-# determine prefix of library file. We must use "libxxxxx" on Unix
-# systems, while all other simply use the real name..
+# Determine prefix of library file.  We must use "libxxxxx" on Unix systems,
+# while all other simply use the real name.
 #
 if $(UNIX)
 {
@@ -18,37 +18,36 @@ else
   LIBPREFIX ?= "" ;
 }
 
-# FT_TOP contains the location of the FreeType source directory. You can
-# set it to a specific value if you want to compile the library as part
-# of a larger project..
+# FT_TOP contains the location of the FreeType source directory.  You can
+# set it to a specific value if you want to compile the library as part of a
+# larger project.
 #
-FT2_TOP  ?= $(DOT) ;
+FT2_TOP ?= $(DOT) ;
 
-# define a new rule used to declare a sub directory of the Nirvana
-# source tree..
+# Define a new rule used to declare a sub directory of the Nirvana source
+# tree.
 #
 rule FT2_SubDir
 {
   if $(FT2_TOP) = $(DOT)
   {
-    return [ FDirName $(<) ] ;
+    return [ FDirName  $(<) ] ;
   }
   else
   {
-    return [ FDirName $(FT2_TOP) $(<) ] ;
+    return [ FDirName  $(FT2_TOP) $(<) ] ;
   }
 }
 
-
-
-# the directory "include" must be in the current include path
-# when compiling any part of FreeType. We thus update the HDRS variable there
+# The directory "include" must be in the current include path when compiling
+# any part of FreeType.  We thus update the HDRS variable there.
 #
-HDRS += [ FT2_SubDir include ] ;
+HDRS += [ FT2_SubDir  include ] ;
 
-# we also set ALL_LOCATE_TARGET in order to place all object and library
-# files in "objs"
+# We also set ALL_LOCATE_TARGET in order to place all object and library
+# files in "objs".
 #
-ALL_LOCATE_TARGET ?= [ FT2_SubDir objs ] ;
+ALL_LOCATE_TARGET ?= [ FT2_SubDir  objs ] ;
 
 
+# end of Jamrules
diff --git a/src/Jamfile b/src/Jamfile
index 89cd844b3..47248b441 100644
--- a/src/Jamfile
+++ b/src/Jamfile
@@ -1,15 +1,18 @@
-SubDir FT2_TOP src ;
+# FreeType 2 src Jamfile (c) 2001 David Turner
+#
 
-# we need to add "freetype/src" to the current includ path in order
-# to compile any part of FreeType 2..
+SubDir  FT2_TOP src ;
+
+# We need to add "freetype/src" to the current include path in order to
+# compile any part of FreeType 2.
 #
 SubDirHdrs  [ FT2_SubDir  src ] ;
 
-# the file <freetype/internal/internal.h> is used to define macros that are
-# later used in #include statements.. it needs to be parsed in order to
-# record these definitions..
+# The file <freetype/internal/internal.h> is used to define macros that are
+# later used in #include statements.  It needs to be parsed in order to
+# record these definitions.
 #
-HDRMACRO [ FT2_SubDir  include internal internal.h ] ;
+HDRMACRO  [ FT2_SubDir  include internal internal.h ] ;
 
 SubInclude  FT2_TOP src autohint ;
 SubInclude  FT2_TOP src base ;
@@ -26,3 +29,4 @@ SubInclude  FT2_TOP src truetype ;
 SubInclude  FT2_TOP src type1 ;
 SubInclude  FT2_TOP src winfonts ;
 
+# end of src Jamfile
diff --git a/src/autohint/Jamfile b/src/autohint/Jamfile
index 7fd35db10..f9ac82868 100644
--- a/src/autohint/Jamfile
+++ b/src/autohint/Jamfile
@@ -1,6 +1,9 @@
-SubDir FT2_TOP src autohint ;
+# FreeType 2 src/autohint Jamfile (c) 2001 David Turner
+#
 
-SubDirHdrs [ FT2_SubDir src autohint ] ;
+SubDir  FT2_TOP src autohint ;
+
+SubDirHdrs  [ FT2_SubDir  src autohint ] ;
 
 {
   local  _sources ;
@@ -14,8 +17,7 @@ SubDirHdrs [ FT2_SubDir src autohint ] ;
     _sources = autohint.c ;
   }
 
-  Library $(FT2_LIB) : $(_sources) ;
+  Library  $(FT2_LIB) : $(_sources) ;
 }
 
-
-
+# end of src/autohint Jamfile
diff --git a/src/base/Jamfile b/src/base/Jamfile
index 8a36d7653..7b6492e26 100644
--- a/src/base/Jamfile
+++ b/src/base/Jamfile
@@ -1,31 +1,36 @@
-SubDir FT2_TOP src base ;
-
-SubDirHdrs [ FT2_SubDir src base ] ;
-
-
-# First of all, which files form the core / base of FT2
+# FreeType 2 src/base Jamfile (c) 2001 David Turner
 #
-ft2_base_sources = ftcalc.c ftextend.c ftlist.c ftobjs.c ftstream.c
-                   ftoutln.c ftnames.c ;
 
-if $(FT2_MULTI)
+SubDir  FT2_TOP src base ;
+
+SubDirHdrs  [ FT2_SubDir  src base ] ;
+
 {
-  Library  $(FT2_LIB) : $(ft2_base_sources) ;
-}
-else
-{
-  Library  $(FT2_LIB) : ftbase.c ;
+  local  _sources ;
+
+  if $(FT2_MULTI)
+  {
+    _sources = ftcalc.c ftextend.c ftlist.c ftobjs.c ftstream.c
+               ftoutln.c ftnames.c ;
+  }
+  else
+  {
+    _sources = ftbase.c ;
+  }
+
+  Library  $(FT2_LIB) : $(_sources) ;
 }
 
-# Add the optional/replaceable files
+# Add the optional/replaceable files.
 #
-Library $(FT2_LIB) : ftsystem.c ftinit.c ftglyph.c ftmm.c ftbbox.c ftdebug.c ;
+Library  $(FT2_LIB) : ftsystem.c ftinit.c ftglyph.c ftmm.c
+                      ftbbox.c ftdebug.c ;
 
-# Add Macintosh-specific file to the library when necessary
+# Add Macintosh-specific file to the library when necessary.
 #
 if $(MAC)
 {
-  Library $(FT2_LIB) : ftmac.c ;
+  Library  $(FT2_LIB) : ftmac.c ;
 }
 
-
+# end of src/base Jamfile
diff --git a/src/cache/Jamfile b/src/cache/Jamfile
index 00559681a..4ed8e0d93 100644
--- a/src/cache/Jamfile
+++ b/src/cache/Jamfile
@@ -1,23 +1,33 @@
-SubDir FT2_TOP src cache ;
+# FreeType 2 src/cache Jamfile (c) 2001 David Turner
+#
 
-SubDirHdrs [ FT2_SubDir src cache ] ;
+SubDir  FT2_TOP src cache ;
+
+SubDirHdrs  [ FT2_SubDir  src cache ] ;
 
 ft2_cache_sources = ftlru.c ftcmanag.c ftcglyph.c ftcchunk.c
                     ftcsbits.c ftcimage.c ;
 
-# the file <freetype/ftcache.h> contains some macro definitions that are
-# later used in #include statements related to the cache sub-system.
-# it need to be parsed through a HDRMACRO rule for macro definitions
+# The file <freetype/ftcache.h> contains some macro definitions that are
+# later used in #include statements related to the cache sub-system.  It
+# needs to be parsed through a HDRMACRO rule for macro definitions.
 #
 HDRMACRO  [ FT2_SubDir  include ftcache.h ] ;
 
-if $(FT2_MULTI)
 {
-  Library $(FT2_LIB) : $(ft2_cache_sources) ;
-}
-else
-{
-  Library $(FT2_LIB) : ftcache.c ;
+  local  _sources ;
+
+  if $(FT2_MULTI)
+  {
+    _sources = ftlru.c ftcmanag.c ftcglyph.c ftcchunk.c
+               ftcsbits.c ftcimage.c ;
+  }
+  else
+  {
+    _sources = ftcache.c ;
+  }
+
+  Library  $(FT2_LIB) : $(_sources) ;
 }
 
-
+# end of src/cache Jamfile
diff --git a/src/cff/Jamfile b/src/cff/Jamfile
index dbb91ed9b..cf406f126 100644
--- a/src/cff/Jamfile
+++ b/src/cff/Jamfile
@@ -1,6 +1,9 @@
-SubDir FT2_TOP src cff ;
+# FreeType 2 src/cff Jamfile (c) 2001 David Turner
+#
 
-SubDirHdrs [ FT2_SubDir src cff ] ;
+SubDir  FT2_TOP src cff ;
+
+SubDirHdrs  [ FT2_SubDir  src cff ] ;
 
 {
   local  _sources ;
@@ -14,8 +17,7 @@ SubDirHdrs [ FT2_SubDir src cff ] ;
     _sources = cff.c ;
   }
 
-  Library $(FT2_LIB) : $(_sources) ;
+  Library  $(FT2_LIB) : $(_sources) ;
 }
 
-
-
+# end of src/cff Jamfile
diff --git a/src/cid/Jamfile b/src/cid/Jamfile
index 7db1f050a..12386f45e 100644
--- a/src/cid/Jamfile
+++ b/src/cid/Jamfile
@@ -1,6 +1,9 @@
-SubDir FT2_TOP src cid ;
+# FreeType 2 src/cid Jamfile (c) 2001 David Turner
+#
 
-SubDirHdrs [ FT2_SubDir src cid ] ;
+SubDir  FT2_TOP src cid ;
+
+SubDirHdrs  [ FT2_SubDir  src cid ] ;
 
 {
   local  _sources ;
@@ -14,8 +17,7 @@ SubDirHdrs [ FT2_SubDir src cid ] ;
     _sources = type1cid.c ;
   }
 
-  Library $(FT2_LIB) : $(_sources) ;
+  Library  $(FT2_LIB) : $(_sources) ;
 }
 
-
-
+# end of src/cid Jamfile
diff --git a/src/pcf/Jamfile b/src/pcf/Jamfile
index c9938e31a..0a80b773b 100644
--- a/src/pcf/Jamfile
+++ b/src/pcf/Jamfile
@@ -1,6 +1,9 @@
-SubDir FT2_TOP src pcf ;
+# FreeType 2 src/pcf Jamfile (c) 2001 David Turner
+#
 
-SubDirHdrs [ FT2_SubDir src pcf ] ;
+SubDir  FT2_TOP src pcf ;
+
+SubDirHdrs  [ FT2_SubDir  src pcf ] ;
 
 {
   local  _sources ;
@@ -14,8 +17,7 @@ SubDirHdrs [ FT2_SubDir src pcf ] ;
     _sources = pcf.c ;
   }
 
-  Library $(FT2_LIB) : $(_sources) ;
+  Library  $(FT2_LIB) : $(_sources) ;
 }
 
-
-
+# end of src/pcf Jamfile
diff --git a/src/psaux/Jamfile b/src/psaux/Jamfile
index 5be193e93..4c978c46a 100644
--- a/src/psaux/Jamfile
+++ b/src/psaux/Jamfile
@@ -1,16 +1,23 @@
-SubDir FT2_TOP src psaux ;
+# FreeType 2 src/psaux Jamfile (c) 2001 David Turner
+#
 
-SubDirHdrs [ FT2_SubDir src psaux ] ;
+SubDir  FT2_TOP src psaux ;
+
+SubDirHdrs  [ FT2_SubDir  src psaux ] ;
 
-ft2_psaux_sources = psauxmod.c psobjs.c t1decode.c ;
-                    
-if $(FT2_MULTI)
 {
-  Library $(FT2_LIB) : $(ft2_psaux_sources) ;
-}
-else
-{
-  Library $(FT2_LIB) : psaux.c ;
+  local  _sources ;
+
+  if $(FT2_MULTI)
+  {
+    _sources = psauxmod.c psobjs.c t1decode.c ;
+  }
+  else
+  {
+    _sources = psaux.c ;
+  }
+
+  Library  $(FT2_LIB) : $(_sources) ;
 }
 
-
+# end of src/psaux Jamfile
diff --git a/src/psnames/Jamfile b/src/psnames/Jamfile
index 7e15b5193..c5e76bba5 100644
--- a/src/psnames/Jamfile
+++ b/src/psnames/Jamfile
@@ -1,9 +1,12 @@
-SubDir FT2_TOP src psnames ;
+# FreeType 2 src/psnames Jamfile (c) 2001 David Turner
+#
 
-SubDirHdrs [ FT2_SubDir src psnames ] ;
+SubDir  FT2_TOP src psnames ;
+
+SubDirHdrs  [ FT2_SubDir  src psnames ] ;
 
 {
-  local _sources ;
+  local  _sources ;
   
   if $(FT2_MULTI)
   {
@@ -14,7 +17,7 @@ SubDirHdrs [ FT2_SubDir src psnames ] ;
     _sources = psnames.c ;
   }
   
-  Library $(FT2_LIB) : $(_sources) ;
+  Library  $(FT2_LIB) : $(_sources) ;
 }
 
-
+# end of src/psnames Jamfile
diff --git a/src/raster/Jamfile b/src/raster/Jamfile
index 06f6f94e3..b886cf469 100644
--- a/src/raster/Jamfile
+++ b/src/raster/Jamfile
@@ -1,6 +1,9 @@
-SubDir FT2_TOP src raster ;
+# FreeType 2 src/raster Jamfile (c) 2001 David Turner
+#
 
-SubDirHdrs [ FT2_SubDir src raster ] ;
+SubDir  FT2_TOP src raster ;
+
+SubDirHdrs  [ FT2_SubDir  src raster ] ;
 
 {
   local  _sources ;
@@ -14,8 +17,7 @@ SubDirHdrs [ FT2_SubDir src raster ] ;
     _sources = raster.c ;
   }
 
-  Library $(FT2_LIB) : $(_sources) ;
+  Library  $(FT2_LIB) : $(_sources) ;
 }
 
-
-
+# end of src/raster Jamfile
diff --git a/src/sfnt/Jamfile b/src/sfnt/Jamfile
index ba2d57926..c1980ba2d 100644
--- a/src/sfnt/Jamfile
+++ b/src/sfnt/Jamfile
@@ -1,6 +1,9 @@
-SubDir FT2_TOP src sfnt ;
+# FreeType 2 src/sfnt Jamfile (c) 2001 David Turner
+#
 
-SubDirHdrs [ FT2_SubDir src sfnt ] ;
+SubDir  FT2_TOP src sfnt ;
+
+SubDirHdrs  [ FT2_SubDir  src sfnt ] ;
 
 {
   local  _sources ;
@@ -14,8 +17,7 @@ SubDirHdrs [ FT2_SubDir src sfnt ] ;
     _sources = sfnt.c ;
   }
 
-  Library $(FT2_LIB) : $(_sources) ;
+  Library  $(FT2_LIB) : $(_sources) ;
 }
 
-
-
+# end of src/sfnt Jamfile
diff --git a/src/smooth/Jamfile b/src/smooth/Jamfile
index df154919e..f5eabc2c3 100644
--- a/src/smooth/Jamfile
+++ b/src/smooth/Jamfile
@@ -1,16 +1,23 @@
-SubDir FT2_TOP src smooth ;
+# FreeType 2 src/smooth Jamfile (c) 2001 David Turner
+#
 
-SubDirHdrs [ FT2_SubDir src smooth ] ;
+SubDir  FT2_TOP src smooth ;
 
-ft2_smooth_sources = ftgrays.c ftsmooth.c ;
+SubDirHdrs  [ FT2_SubDir  src smooth ] ;
 
-if $(FT2_MULTI)
 {
-  Library $(FT2_LIB) : $(ft2_smooth_sources) ;
-}
-else
-{
-  Library $(FT2_LIB) : smooth.c ;
+  local  _sources ;
+
+  if $(FT2_MULTI)
+  {
+    _sources = ftgrays.c ftsmooth.c ;
+  }
+  else
+  {
+    _sources = smooth.c ;
+  }
+
+  Library  $(FT2_LIB) : $(_sources) ;
 }
 
-
+# end of src/smooth Jamfile
diff --git a/src/truetype/Jamfile b/src/truetype/Jamfile
index 5012fba42..a438ab864 100644
--- a/src/truetype/Jamfile
+++ b/src/truetype/Jamfile
@@ -1,6 +1,9 @@
-SubDir FT2_TOP src truetype ;
+# FreeType 2 src/truetype Jamfile (c) 2001 David Turner
+#
 
-SubDirHdrs [ FT2_SubDir src truetype ] ;
+SubDir  FT2_TOP src truetype ;
+
+SubDirHdrs  [ FT2_SubDir  src truetype ] ;
 
 {
   local  _sources ;
@@ -14,8 +17,7 @@ SubDirHdrs [ FT2_SubDir src truetype ] ;
     _sources = truetype.c ;
   }
 
-  Library $(FT2_LIB) : $(_sources) ;
+  Library  $(FT2_LIB) : $(_sources) ;
 }
 
-
-
+# end of src/truetype Jamfile
diff --git a/src/type1/Jamfile b/src/type1/Jamfile
index e40ba2684..4d55e9920 100644
--- a/src/type1/Jamfile
+++ b/src/type1/Jamfile
@@ -1,17 +1,23 @@
-SubDir FT2_TOP src type1 ;
+# FreeType 2 src/type1 Jamfile (c) 2001 David Turner
+#
 
-SubDirHdrs [ FT2_SubDir src type1 ] ;
+SubDir  FT2_TOP src type1 ;
 
-ft2_type1_sources = t1afm.c t1driver.c t1objs.c t1load.c t1gload.c
-                    t1parse.c ;
+SubDirHdrs  [ FT2_SubDir  src type1 ] ;
 
-if $(FT2_MULTI)
 {
-  Library $(FT2_LIB) : $(ft2_type1_sources) ;
-}
-else
-{
-  Library $(FT2_LIB) : type1.c ;
+  local  _sources ;
+
+  if $(FT2_MULTI)
+  {
+    _sources = t1afm.c t1driver.c t1objs.c t1load.c t1gload.c t1parse.c ;
+  }
+  else
+  {
+    _sources = type1.c ;
+  }
+
+  Library  $(FT2_LIB) : $(_sources) ;
 }
 
-
+# end of src/type1 Jamfile
diff --git a/src/winfonts/Jamfile b/src/winfonts/Jamfile
index da223426f..c45e10782 100644
--- a/src/winfonts/Jamfile
+++ b/src/winfonts/Jamfile
@@ -1,8 +1,10 @@
-SubDir FT2_TOP src winfonts ;
+# FreeType 2 src/winfonts Jamfile (c) 2001 David Turner
+#
 
-SubDirHdrs [ FT2_SubDir src winfonts ] ;
-
-Library $(FT2_LIB) : winfnt.c ;
+SubDir  FT2_TOP src winfonts ;
 
+SubDirHdrs  [ FT2_SubDir  src winfonts ] ;
 
+Library  $(FT2_LIB) : winfnt.c ;
 
+# end of src/winfonts Jamfile