[ft-cvs] freetype2 ./ChangeLog ./Makefile ./configure bu...

[Werner LEMBERG]

CVSROOT:        /cvsroot/freetype
Module name:    freetype2
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 06/01/31 20:17:42

Modified files:
        .              : ChangeLog Makefile configure 
        builds         : freetype.mk modules.mk toplevel.mk 
        builds/ansi    : ansi-def.mk 
        builds/beos    : beos-def.mk 
        builds/dos     : dos-def.mk 
        builds/os2     : os2-def.mk os2-dev.mk 
        builds/unix    : detect.mk install.mk unix-def.in unix-dev.mk 
                         unix.mk unixddef.mk 
        builds/win32   : w32-bccd.mk w32-dev.mk win32-def.mk 
        docs           : CHANGES CUSTOMIZE INSTALL INSTALL.ANY 
                         INSTALL.GNU INSTALL.UNX 
        include/freetype/config: ftmodule.h 
        include/freetype/internal: ftmemory.h 
        src/autofit    : module.mk 
        src/base       : ftdbgmem.c rules.mk 
        src/bdf        : module.mk 
        src/cff        : module.mk 
        src/cid        : module.mk 
        src/gxvalid    : module.mk 
        src/otvalid    : module.mk 
        src/pcf        : module.mk 
        src/pfr        : module.mk 
        src/psaux      : module.mk 
        src/pshinter   : module.mk 
        src/psnames    : module.mk 
        src/raster     : module.mk 
        src/sfnt       : module.mk 
        src/smooth     : module.mk 
        src/truetype   : module.mk 
        src/type1      : module.mk 
        src/type42     : module.mk 
        src/winfonts   : module.mk 
Added files:
        .              : modules.cfg 
Removed files:
        docs           : modules.txt 

Log message:
        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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/ChangeLog.diff?tr1=1.1201&tr2=1.1202&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/Makefile.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/configure.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/modules.cfg?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/builds/freetype.mk.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/builds/modules.mk.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/builds/toplevel.mk.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/builds/ansi/ansi-def.mk.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/builds/beos/beos-def.mk.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/builds/dos/dos-def.mk.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/builds/os2/os2-def.mk.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/builds/os2/os2-dev.mk.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/builds/unix/detect.mk.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/builds/unix/install.mk.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/builds/unix/unix-def.in.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/builds/unix/unix-dev.mk.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/builds/unix/unix.mk.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/builds/unix/unixddef.mk.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/builds/win32/w32-bccd.mk.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/builds/win32/w32-dev.mk.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/builds/win32/win32-def.mk.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/docs/CHANGES.diff?tr1=1.135&tr2=1.136&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/docs/CUSTOMIZE.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/docs/INSTALL.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/docs/INSTALL.ANY.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/docs/INSTALL.GNU.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/docs/INSTALL.UNX.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/include/freetype/config/ftmodule.h.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/include/freetype/internal/ftmemory.h.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/autofit/module.mk.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/base/ftdbgmem.c.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/base/rules.mk.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/bdf/module.mk.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/cff/module.mk.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/cid/module.mk.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/gxvalid/module.mk.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/otvalid/module.mk.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/pcf/module.mk.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/pfr/module.mk.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/psaux/module.mk.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/pshinter/module.mk.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/psnames/module.mk.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/raster/module.mk.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/sfnt/module.mk.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/smooth/module.mk.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/truetype/module.mk.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/type1/module.mk.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/type42/module.mk.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/winfonts/module.mk.diff?tr1=1.3&tr2=1.4&r1=text&r2=text