Implement new, simplified module selection. With GNU make it is now

sufficient to modify a single file, `modules.cfg', to control the
inclusion of modules and base extension files.

This change also fixes the creation of ftmodule.h; it now depends on
`modules.cfg' and thus is rebuilt only if necessary.

Finally, a version of `ftoption.h' in OBJ_DIR is preferred over the
default location.

* modules.cfg: New file.

* builds/freetype.mk: Don't include `modules.mk'.
Include all `rules.mk' files as specified in `modules.cfg'.
(FTOPTION_FLAG, FTOPTION_H): New variables.
(FT_CFLAGS): Add macro definition for FT_CONFIG_MODULES_H.
Add FTOPTION_FLAG.
($(FT_INIT_OBJ)): Don't use FT_MODULE_LIST.
(CONFIG_H): Add FTMODULE_H and FTOPTION_H.
(INCLUDES): Add DEVEL_DIR.
(INCLUDE_FLAGS, FTSYS_SRC, FTSYS_OBJ, FTDEBUG_SRC, FTDEBUG_OBJ,
OBJ_M, OBJ_S): Use `:=', not `='.
(remove_ftmodule_h): New phony target to delete `ftmodule.h'.
(distclean): Add remove_ftmodule_h.

* builds/modules.mk: (MODULE_LIST): Removed.
(make_module_list, clean_module_list): Replace targets
with...
(FTMODULE_H_INIT, FTMODULE_H_CREATE, FTMODULE_H_DONE): New
variables.  Reason for the change is that it is not possible to have
a phony prerequisite which is run only if the target file must be
rebuilt (phony prerequisites act like subroutines and are *always*
executed).  We only want to rebuild `ftmodule.h' if `module.cfg' is
changed.
Update all callers.
($FTMODULE_H)): Rule to create `ftmodule.h', depending on
`modules.cfg'.

* builds/toplevel.mk: Rewrite and simplify module handling.
(MODULES_CFG, FTMODULE_H): New variables.
Include MODULES_CFG.
(MODULES): New variable to include all `module.mk' and `rules.mk'
files.  We no longer use make's `wildcard' function for this.

* Makefile (USE_MODULES): Remove.  Update all users.
(OBJ_DIR): Define it here.

* src/*/module.mk: Change

    make_module_list: foo
    foo: ...

to

    FTMODULE_H_COMMANDS += FOO
    define FOO
    ...
    endef

in all files.  `FTMODULE_H_COMMANDS' is used in `FTMODULE_H_CREATE'.

* src/base/rules.mk (BASE_EXT_SRC): Use BASE_EXTENSIONS.

* builds/unix/detect.mk (setup): Always execute `configure' script.
(have_mk): Rename to...
(have_Makefile): This.
Don't use `strip' function.

* builds/unix/unix.mk: Include `install.mk' only if BUILD_PROJECT is
defined.
(have_mk): Don't use `strip' function.
Test for unix-def.mk in OBJ_DIR, not BUILD_DIR (and invert the test
accordingly).

* builds/unix/install.mk (install, uninstall): Handle `ftmodule.h'.

* builds/os2/os2-dev.mk, builds/unix/unix-dev.mk,
builds/win32/w32-bccd.mk, builds/win32/w32-dev.mk: Don't define
BUILD_DIR but DEVEL_DIR for development header files.

* builds/ansi/ansi-def.mk (TOP_DIR, OBJ_DIR),
builds/beos/beos-def.mk (TOP_DIR, OBJ_DIR), builds/unix/unix-def.in
(TOP_DIR, OBJ_DIR): Removed.  Defined elsewhere.

* builds/dos/dos-def.mk (OBJ_DIR), builds/os2/os2-def.mk (OBJ_DIR),
builds/win32/win32-def.mk (OBJ_DIR): Removed.  Defined elsewhere.

* builds/unix/unixddef.mk: Don't define BUILD_DIR but DEVEL_DIR for
development header files.
Don't define PLATFORM.

* configure: Copy `modules.cfg' to builddir if builddir != srcdir.
Update snippet taken from autoconf's m4sh.m4 to current CVS version.
Be more verbose.

* include/freetype/config/ftmodule.h: Add comments -- this file is
no longer used if FreeType is built with GNU make.

* docs/CHANGES, docs/CUSTOMIZE, docs/INSTALL, docs/INSTALL.ANY,
docs/INSTALL.GNU, docs/INSTALL.UNX: Document new build mechanism.
Other minor updates.

* modules.txt: Removed.  Contents included in `modules.cfg'.


* include/freetype/internal/ftmemory.h (FT_QAlloc_Debug,
FT_Free_Debug) [FT_STRICT_ALIASING]: Fix typos.

* src/base/ftdbgmem.c (FT_Alloc_Debug, FT_Realloc_Debug,
FT_QAlloc_Debug, FT_QRealloc_Debug, FT_Free_Debug)
[FT_STRICT_ALIASING]: Implement.

20 files changed, 213 insertions, 131 deletions

diff --git a/src/autofit/module.mk b/src/autofit/module.mk
index 37b64aa1..4a386ce6 100644
--- a/src/autofit/module.mk
+++ b/src/autofit/module.mk
@@ -13,12 +13,11 @@
 # fully.
 
 
-.PHONY: add_autofit_module
+FTMODULE_H_COMMANDS += AUTOFIT_MODULE
 
-make_module_list: add_autofit_module
-
-add_autofit_module:
-	$(OPEN_DRIVER)autofit_module_class$(CLOSE_DRIVER)
-	$(ECHO_DRIVER)autofit   $(ECHO_DRIVER_DESC)automatic hinting module$(ECHO_DRIVER_DONE)
+define AUTOFIT_MODULE
+$(OPEN_DRIVER)autofit_module_class$(CLOSE_DRIVER)
+$(ECHO_DRIVER)autofit   $(ECHO_DRIVER_DESC)automatic hinting module$(ECHO_DRIVER_DONE)
+endef
 
 # EOF
diff --git a/src/base/ftdbgmem.c b/src/base/ftdbgmem.c
index 4c1e68dd..557a05c2 100644
--- a/src/base/ftdbgmem.c
+++ b/src/base/ftdbgmem.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Memory debugger (body).                                              */
 /*                                                                         */
-/*  Copyright 2001, 2002, 2003, 2004, 2005 by                              */
+/*  Copyright 2001, 2002, 2003, 2004, 2005, 2006 by                        */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -887,6 +887,115 @@
   }
 
 
+#ifdef FT_STRICT_ALIASING
+
+
+  FT_BASE_DEF( FT_Pointer )
+  FT_Alloc_Debug( FT_Memory    memory,
+                  FT_Long      size,
+                  FT_Error    *p_error,
+                  const char*  file_name,
+                  FT_Long      line_no )
+  {
+    FT_MemTable  table = (FT_MemTable)memory->user;
+
+
+    if ( table )
+    {
+      table->file_name = file_name;
+      table->line_no   = line_no;
+    }
+
+    return FT_Alloc( memory, size, p_error );
+  }
+
+
+  FT_BASE_DEF( FT_Pointer )
+  FT_Realloc_Debug( FT_Memory    memory,
+                    FT_Long      current,
+                    FT_Long      size,
+                    void*        block,
+                    FT_Error    *p_error,
+                    const char*  file_name,
+                    FT_Long      line_no )
+  {
+    FT_MemTable  table = (FT_MemTable)memory->user;
+
+
+    if ( table )
+    {
+      table->file_name = file_name;
+      table->line_no   = line_no;
+    }
+
+    return FT_Realloc( memory, current, size, block, p_error );
+  }
+
+
+  FT_BASE_DEF( FT_Pointer )
+  FT_QAlloc_Debug( FT_Memory    memory,
+                   FT_Long      size,
+                   FT_Error    *p_error,
+                   const char*  file_name,
+                   FT_Long      line_no )
+  {
+    FT_MemTable  table = (FT_MemTable)memory->user;
+
+
+    if ( table )
+    {
+      table->file_name = file_name;
+      table->line_no   = line_no;
+    }
+
+    return FT_QAlloc( memory, size, p_error );
+  }
+
+
+  FT_BASE_DEF( FT_Pointer )
+  FT_QRealloc_Debug( FT_Memory    memory,
+                     FT_Long      current,
+                     FT_Long      size,
+                     void*        block,
+                     FT_Error    *p_error,
+                     const char*  file_name,
+                     FT_Long      line_no )
+  {
+    FT_MemTable  table = (FT_MemTable)memory->user;
+
+
+    if ( table )
+    {
+      table->file_name = file_name;
+      table->line_no   = line_no;
+    }
+
+    return FT_QRealloc( memory, current, size, block, p_error );
+  }
+
+
+  FT_BASE_DEF( void )
+  FT_Free_Debug( FT_Memory    memory,
+                 const void  *P,
+                 const char*  file_name,
+                 FT_Long      line_no )
+  {
+    FT_MemTable  table = (FT_MemTable)memory->user;
+
+
+    if ( table )
+    {
+      table->file_name = file_name;
+      table->line_no   = line_no;
+    }
+
+    FT_Free( memory, (void *)P );
+  }
+
+
+#else /* !FT_STRICT_ALIASING */
+
+
   FT_BASE_DEF( FT_Error )
   FT_Alloc_Debug( FT_Memory    memory,
                   FT_Long      size,
@@ -988,6 +1097,8 @@
   }
 
 
+#endif /* !FT_STRICT_ALIASING */
+
   static int
   ft_mem_source_compare( const void*  p1,
                          const void*  p2 )
diff --git a/src/base/rules.mk b/src/base/rules.mk
index 32dadbdb..bbc6cb70 100644
--- a/src/base/rules.mk
+++ b/src/base/rules.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2002, 2003, 2004, 2005 by
+# Copyright 1996-2000, 2002, 2003, 2004, 2005, 2006 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -46,23 +46,11 @@ BASE_SRC := $(BASE_DIR)/ftapi.c    \
 
 # Base layer `extensions' sources
 #
-# An extension is added to the library file (.a or .lib) as a separate
-# object.  It will then be linked to the final executable only if one of its
-# symbols is used by the application.
-#
-BASE_EXT_SRC := $(BASE_DIR)/ftbitmap.c \
-                $(BASE_DIR)/ftbbox.c   \
-                $(BASE_DIR)/ftbdf.c    \
-                $(BASE_DIR)/ftglyph.c  \
-                $(BASE_DIR)/ftgxval.c  \
-                $(BASE_DIR)/ftmm.c     \
-                $(BASE_DIR)/ftotval.c  \
-                $(BASE_DIR)/ftpfr.c    \
-                $(BASE_DIR)/ftstroke.c \
-                $(BASE_DIR)/ftsynth.c  \
-                $(BASE_DIR)/fttype1.c  \
-                $(BASE_DIR)/ftwinfnt.c \
-                $(BASE_DIR)/ftxf86.c
+# An extension is added to the library file as a separate object.  It is
+# then linked to the final executable only if one of its symbols is used by
+# the application.
+#
+BASE_EXT_SRC := $(patsubst %,$(BASE_DIR)/%,$(BASE_EXTENSIONS))
 
 # Default extensions objects
 #
diff --git a/src/bdf/module.mk b/src/bdf/module.mk
index 3d56d73e..a9789736 100644
--- a/src/bdf/module.mk
+++ b/src/bdf/module.mk
@@ -24,12 +24,11 @@
 # THE SOFTWARE.
 
 
-.PHONY: add_bdf_driver
+FTMODULE_H_COMMANDS += BDF_DRIVER
 
-make_module_list: add_bdf_driver
-
-add_bdf_driver:
-	$(OPEN_DRIVER)bdf_driver_class$(CLOSE_DRIVER)
-	$(ECHO_DRIVER)bdf       $(ECHO_DRIVER_DESC)bdf bitmap fonts$(ECHO_DRIVER_DONE)
+define BDF_DRIVER
+$(OPEN_DRIVER)bdf_driver_class$(CLOSE_DRIVER)
+$(ECHO_DRIVER)bdf       $(ECHO_DRIVER_DESC)bdf bitmap fonts$(ECHO_DRIVER_DONE)
+endef
 
 # EOF
diff --git a/src/cff/module.mk b/src/cff/module.mk
index 121a50b6..0474e37b 100644
--- a/src/cff/module.mk
+++ b/src/cff/module.mk
@@ -13,12 +13,11 @@
 # fully.
 
 
-.PHONY: add_cff_driver
+FTMODULE_H_COMMANDS += CFF_DRIVER
 
-make_module_list: add_cff_driver
-
-add_cff_driver:
-	$(OPEN_DRIVER)cff_driver_class$(CLOSE_DRIVER)
-	$(ECHO_DRIVER)cff       $(ECHO_DRIVER_DESC)OpenType fonts with extension *.otf$(ECHO_DRIVER_DONE)
+define CFF_DRIVER
+$(OPEN_DRIVER)cff_driver_class$(CLOSE_DRIVER)
+$(ECHO_DRIVER)cff       $(ECHO_DRIVER_DESC)OpenType fonts with extension *.otf$(ECHO_DRIVER_DONE)
+endef
 
 # EOF
diff --git a/src/cid/module.mk b/src/cid/module.mk
index 84a81401..41e5a68e 100644
--- a/src/cid/module.mk
+++ b/src/cid/module.mk
@@ -13,12 +13,11 @@
 # fully.
 
 
-.PHONY: add_type1cid_driver
+FTMODULE_H_COMMANDS += TYPE1CID_DRIVER
 
-make_module_list: add_type1cid_driver
-
-add_type1cid_driver:
-	$(OPEN_DRIVER)t1cid_driver_class$(CLOSE_DRIVER)
-	$(ECHO_DRIVER)cid       $(ECHO_DRIVER_DESC)Postscript CID-keyed fonts, no known extension$(ECHO_DRIVER_DONE)
+define TYPE1CID_DRIVER
+$(OPEN_DRIVER)t1cid_driver_class$(CLOSE_DRIVER)
+$(ECHO_DRIVER)cid       $(ECHO_DRIVER_DESC)Postscript CID-keyed fonts, no known extension$(ECHO_DRIVER_DONE)
+endef
 
 # EOF
diff --git a/src/gxvalid/module.mk b/src/gxvalid/module.mk
index 41b33a7c..3e1d7d92 100644
--- a/src/gxvalid/module.mk
+++ b/src/gxvalid/module.mk
@@ -13,12 +13,11 @@
 # fully.
 
 
-.PHONY: add_gxvalid_module
+FTMODULE_H_COMMANDS += GXVALID_MODULE
 
-make_module_list: add_gxvalid_module
-
-add_gxvalid_module:
-	$(OPEN_DRIVER)gxvalid_module_class$(CLOSE_DRIVER)
-	$(ECHO_DRIVER)gxvalid     $(ECHO_DRIVER_DESC)TrueTypeGX/AAT validation module$(ECHO_DRIVER_DONE)
+define GXVALID_MODULE
+$(OPEN_DRIVER)gxvalid_module_class$(CLOSE_DRIVER)
+$(ECHO_DRIVER)gxvalid     $(ECHO_DRIVER_DESC)TrueTypeGX/AAT validation module$(ECHO_DRIVER_DONE)
+endef
 
 # EOF
diff --git a/src/otvalid/module.mk b/src/otvalid/module.mk
index 966fece7..4ef4387c 100644
--- a/src/otvalid/module.mk
+++ b/src/otvalid/module.mk
@@ -13,12 +13,11 @@
 # fully.
 
 
-.PHONY: add_otvalid_module
+FTMODULE_H_COMMANDS += OTVALID_MODULE
 
-make_module_list: add_otvalid_module
-
-add_otvalid_module:
-	$(OPEN_DRIVER)otvalid_module_class$(CLOSE_DRIVER)
-	$(ECHO_DRIVER)otvalid     $(ECHO_DRIVER_DESC)OpenType validation module$(ECHO_DRIVER_DONE)
+define OTVALID_MODULE
+$(OPEN_DRIVER)otvalid_module_class$(CLOSE_DRIVER)
+$(ECHO_DRIVER)otvalid     $(ECHO_DRIVER_DESC)OpenType validation module$(ECHO_DRIVER_DONE)
+endef
 
 # EOF
diff --git a/src/pcf/module.mk b/src/pcf/module.mk
index e2da8d42..5bc7ce3c 100644
--- a/src/pcf/module.mk
+++ b/src/pcf/module.mk
@@ -24,12 +24,11 @@
 # THE SOFTWARE.
 
 
-.PHONY: add_pcf_driver
+FTMODULE_H_COMMANDS += PCF_DRIVER
 
-make_module_list: add_pcf_driver
-
-add_pcf_driver:
-	$(OPEN_DRIVER)pcf_driver_class$(CLOSE_DRIVER)
-	$(ECHO_DRIVER)pcf       $(ECHO_DRIVER_DESC)pcf bitmap fonts$(ECHO_DRIVER_DONE)
+define PCF_DRIVER
+$(OPEN_DRIVER)pcf_driver_class$(CLOSE_DRIVER)
+$(ECHO_DRIVER)pcf       $(ECHO_DRIVER_DESC)pcf bitmap fonts$(ECHO_DRIVER_DONE)
+endef
 
 # EOF
diff --git a/src/pfr/module.mk b/src/pfr/module.mk
index d93b6315..53ab34aa 100644
--- a/src/pfr/module.mk
+++ b/src/pfr/module.mk
@@ -13,12 +13,11 @@
 # fully.
 
 
-.PHONY: add_pfr_driver
+FTMODULE_H_COMMANDS += PFR_DRIVER
 
-make_module_list: add_pfr_driver
-
-add_pfr_driver:
-	$(OPEN_DRIVER)pfr_driver_class$(CLOSE_DRIVER)
-	$(ECHO_DRIVER)pfr       $(ECHO_DRIVER_DESC)PFR/TrueDoc font files with extension *.pfr$(ECHO_DRIVER_DONE)
+define PFR_DRIVER
+$(OPEN_DRIVER)pfr_driver_class$(CLOSE_DRIVER)
+$(ECHO_DRIVER)pfr       $(ECHO_DRIVER_DESC)PFR/TrueDoc font files with extension *.pfr$(ECHO_DRIVER_DONE)
+endef
 
 # EOF
diff --git a/src/psaux/module.mk b/src/psaux/module.mk
index 9abd5250..54315220 100644
--- a/src/psaux/module.mk
+++ b/src/psaux/module.mk
@@ -13,12 +13,11 @@
 # fully.
 
 
-.PHONY: add_psaux_module
+FTMODULE_H_COMMANDS += PSAUX_MODULE
 
-make_module_list: add_psaux_module
-
-add_psaux_module:
-	$(OPEN_DRIVER)psaux_module_class$(CLOSE_DRIVER)
-	$(ECHO_DRIVER)psaux     $(ECHO_DRIVER_DESC)Postscript Type 1 & Type 2 helper module$(ECHO_DRIVER_DONE)
+define PSAUX_MODULE
+$(OPEN_DRIVER)psaux_module_class$(CLOSE_DRIVER)
+$(ECHO_DRIVER)psaux     $(ECHO_DRIVER_DESC)Postscript Type 1 & Type 2 helper module$(ECHO_DRIVER_DONE)
+endef
 
 # EOF
diff --git a/src/pshinter/module.mk b/src/pshinter/module.mk
index 42ed7b7a..cd171d03 100644
--- a/src/pshinter/module.mk
+++ b/src/pshinter/module.mk
@@ -13,12 +13,11 @@
 # fully.
 
 
-.PHONY: add_pshinter_module
+FTMODULE_H_COMMANDS += PSHINTER_MODULE
 
-make_module_list: add_pshinter_module
-
-add_pshinter_module:
-	$(OPEN_DRIVER)pshinter_module_class$(CLOSE_DRIVER)
-	$(ECHO_DRIVER)pshinter  $(ECHO_DRIVER_DESC)Postscript hinter module$(ECHO_DRIVER_DONE)
+define PSHINTER_MODULE
+$(OPEN_DRIVER)pshinter_module_class$(CLOSE_DRIVER)
+$(ECHO_DRIVER)pshinter  $(ECHO_DRIVER_DESC)Postscript hinter module$(ECHO_DRIVER_DONE)
+endef
 
 # EOF
diff --git a/src/psnames/module.mk b/src/psnames/module.mk
index 255a0e0d..a93063b9 100644
--- a/src/psnames/module.mk
+++ b/src/psnames/module.mk
@@ -13,12 +13,11 @@
 # fully.
 
 
-.PHONY: add_psnames_module
+FTMODULE_H_COMMANDS += PSNAMES_MODULE
 
-make_module_list: add_psnames_module
-
-add_psnames_module:
-	$(OPEN_DRIVER)psnames_module_class$(CLOSE_DRIVER)
-	$(ECHO_DRIVER)psnames   $(ECHO_DRIVER_DESC)Postscript & Unicode Glyph name handling$(ECHO_DRIVER_DONE)
+define PSNAMES_MODULE
+$(OPEN_DRIVER)psnames_module_class$(CLOSE_DRIVER)
+$(ECHO_DRIVER)psnames   $(ECHO_DRIVER_DESC)Postscript & Unicode Glyph name handling$(ECHO_DRIVER_DONE)
+endef
 
 # EOF
diff --git a/src/raster/module.mk b/src/raster/module.mk
index 2f5682f2..59c737b9 100644
--- a/src/raster/module.mk
+++ b/src/raster/module.mk
@@ -13,12 +13,11 @@
 # fully.
 
 
-.PHONY: add_raster_module
+FTMODULE_H_COMMANDS += RASTER_MODULE
 
-make_module_list: add_raster_module
-
-add_raster_module:
-	$(OPEN_DRIVER)ft_raster1_renderer_class$(CLOSE_DRIVER)
-	$(ECHO_DRIVER)raster    $(ECHO_DRIVER_DESC)monochrome bitmap renderer$(ECHO_DRIVER_DONE)
+define RASTER_MODULE
+$(OPEN_DRIVER)ft_raster1_renderer_class$(CLOSE_DRIVER)
+$(ECHO_DRIVER)raster    $(ECHO_DRIVER_DESC)monochrome bitmap renderer$(ECHO_DRIVER_DONE)
+endef
 
 # EOF
diff --git a/src/sfnt/module.mk b/src/sfnt/module.mk
index 00a2d776..d3391380 100644
--- a/src/sfnt/module.mk
+++ b/src/sfnt/module.mk
@@ -13,12 +13,11 @@
 # fully.
 
 
-.PHONY: add_sfnt_module
+FTMODULE_H_COMMANDS += SFNT_MODULE
 
-make_module_list: add_sfnt_module
-
-add_sfnt_module:
-	$(OPEN_DRIVER)sfnt_module_class$(CLOSE_DRIVER)
-	$(ECHO_DRIVER)sfnt      $(ECHO_DRIVER_DESC)helper module for TrueType & OpenType formats$(ECHO_DRIVER_DONE)
+define SFNT_MODULE
+$(OPEN_DRIVER)sfnt_module_class$(CLOSE_DRIVER)
+$(ECHO_DRIVER)sfnt      $(ECHO_DRIVER_DESC)helper module for TrueType & OpenType formats$(ECHO_DRIVER_DONE)
+endef
 
 # EOF
diff --git a/src/smooth/module.mk b/src/smooth/module.mk
index bc2f7ff9..05ad4ba0 100644
--- a/src/smooth/module.mk
+++ b/src/smooth/module.mk
@@ -13,16 +13,15 @@
 # fully.
 
 
-.PHONY: add_smooth_renderer
+FTMODULE_H_COMMANDS += SMOOTH_RENDERER
 
-make_module_list: add_smooth_renderer
-
-add_smooth_renderer:
-	$(OPEN_DRIVER)ft_smooth_renderer_class$(CLOSE_DRIVER)
-	$(ECHO_DRIVER)smooth    $(ECHO_DRIVER_DESC)anti-aliased bitmap renderer$(ECHO_DRIVER_DONE)
-	$(OPEN_DRIVER)ft_smooth_lcd_renderer_class$(CLOSE_DRIVER)
-	$(ECHO_DRIVER)smooth    $(ECHO_DRIVER_DESC)anti-aliased bitmap renderer for LCDs$(ECHO_DRIVER_DONE)
-	$(OPEN_DRIVER)ft_smooth_lcdv_renderer_class$(CLOSE_DRIVER)
-	$(ECHO_DRIVER)smooth    $(ECHO_DRIVER_DESC)anti-aliased bitmap renderer for vertical LCDs$(ECHO_DRIVER_DONE)
+define SMOOTH_RENDERER
+$(OPEN_DRIVER)ft_smooth_renderer_class$(CLOSE_DRIVER)
+$(ECHO_DRIVER)smooth    $(ECHO_DRIVER_DESC)anti-aliased bitmap renderer$(ECHO_DRIVER_DONE)
+$(OPEN_DRIVER)ft_smooth_lcd_renderer_class$(CLOSE_DRIVER)
+$(ECHO_DRIVER)smooth    $(ECHO_DRIVER_DESC)anti-aliased bitmap renderer for LCDs$(ECHO_DRIVER_DONE)
+$(OPEN_DRIVER)ft_smooth_lcdv_renderer_class$(CLOSE_DRIVER)
+$(ECHO_DRIVER)smooth    $(ECHO_DRIVER_DESC)anti-aliased bitmap renderer for vertical LCDs$(ECHO_DRIVER_DONE)
+endef
 
 # EOF
diff --git a/src/truetype/module.mk b/src/truetype/module.mk
index 2f2d853a..3b05afc7 100644
--- a/src/truetype/module.mk
+++ b/src/truetype/module.mk
@@ -13,12 +13,11 @@
 # fully.
 
 
-.PHONY: add_truetype_driver
+FTMODULE_H_COMMANDS += TRUETYPE_DRIVER
 
-make_module_list: add_truetype_driver
-
-add_truetype_driver:
-	$(OPEN_DRIVER)tt_driver_class$(CLOSE_DRIVER)
-	$(ECHO_DRIVER)truetype  $(ECHO_DRIVER_DESC)Windows/Mac font files with extension *.ttf or *.ttc$(ECHO_DRIVER_DONE)
+define TRUETYPE_DRIVER
+$(OPEN_DRIVER)tt_driver_class$(CLOSE_DRIVER)
+$(ECHO_DRIVER)truetype  $(ECHO_DRIVER_DESC)Windows/Mac font files with extension *.ttf or *.ttc$(ECHO_DRIVER_DONE)
+endef
 
 # EOF
diff --git a/src/type1/module.mk b/src/type1/module.mk
index cbcd8c7a..baf98c00 100644
--- a/src/type1/module.mk
+++ b/src/type1/module.mk
@@ -13,12 +13,11 @@
 # fully.
 
 
-.PHONY: add_type1_driver
+FTMODULE_H_COMMANDS += TYPE1_DRIVER
 
-make_module_list: add_type1_driver
-
-add_type1_driver:
-	$(OPEN_DRIVER)t1_driver_class$(CLOSE_DRIVER)
-	$(ECHO_DRIVER)type1     $(ECHO_DRIVER_DESC)Postscript font files with extension *.pfa or *.pfb$(ECHO_DRIVER_DONE)
+define TYPE1_DRIVER
+$(OPEN_DRIVER)t1_driver_class$(CLOSE_DRIVER)
+$(ECHO_DRIVER)type1     $(ECHO_DRIVER_DESC)Postscript font files with extension *.pfa or *.pfb$(ECHO_DRIVER_DONE)
+endef
 
 # EOF
diff --git a/src/type42/module.mk b/src/type42/module.mk
index 35c7010a..8bd40a5c 100644
--- a/src/type42/module.mk
+++ b/src/type42/module.mk
@@ -13,12 +13,11 @@
 # fully.
 
 
-.PHONY: add_type42_driver
+FTMODULE_H_COMMANDS += TYPE42_DRIVER
 
-make_module_list: add_type42_driver
-
-add_type42_driver:
-	$(OPEN_DRIVER)t42_driver_class$(CLOSE_DRIVER)
-	$(ECHO_DRIVER)type42    $(ECHO_DRIVER_DESC)Type 42 font files with no known extension$(ECHO_DRIVER_DONE)
+define TYPE42_DRIVER
+$(OPEN_DRIVER)t42_driver_class$(CLOSE_DRIVER)
+$(ECHO_DRIVER)type42    $(ECHO_DRIVER_DESC)Type 42 font files with no known extension$(ECHO_DRIVER_DONE)
+endef
 
 # EOF
diff --git a/src/winfonts/module.mk b/src/winfonts/module.mk
index fec93546..0ace3ae6 100644
--- a/src/winfonts/module.mk
+++ b/src/winfonts/module.mk
@@ -13,11 +13,11 @@
 # fully.
 
 
-.PHONY: add_windows_driver
+FTMODULE_H_COMMANDS += WINDOWS_DRIVER
 
-make_module_list: add_windows_driver
-
-add_windows_driver:
-	$(OPEN_DRIVER)winfnt_driver_class$(CLOSE_DRIVER)
-	$(ECHO_DRIVER)winfnt    $(ECHO_DRIVER_DESC)Windows bitmap fonts with extension *.fnt or *.fon$(ECHO_DRIVER_DONE)
+define WINDOWS_DRIVER
+$(OPEN_DRIVER)winfnt_driver_class$(CLOSE_DRIVER)
+$(ECHO_DRIVER)winfnt    $(ECHO_DRIVER_DESC)Windows bitmap fonts with extension *.fnt or *.fon$(ECHO_DRIVER_DONE)
+endef
 
+# EOF