59939244ad
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.
80 lines
2.0 KiB
Makefile
80 lines
2.0 KiB
Makefile
#
|
|
# FreeType 2 modules sub-Makefile
|
|
#
|
|
|
|
|
|
# Copyright 1996-2000, 2003, 2006 by
|
|
# David Turner, Robert Wilhelm, and Werner Lemberg.
|
|
#
|
|
# This file is part of the FreeType project, and may only be used, modified,
|
|
# and distributed under the terms of the FreeType project license,
|
|
# LICENSE.TXT. By continuing to use, modify, or distribute this file you
|
|
# indicate that you have read the license and understand and accept it
|
|
# fully.
|
|
|
|
|
|
# DO NOT INVOKE THIS MAKEFILE DIRECTLY! IT IS MEANT TO BE INCLUDED BY
|
|
# OTHER MAKEFILES.
|
|
|
|
|
|
# This file is in charge of handling the generation of the modules list
|
|
# file.
|
|
|
|
|
|
# Build the modules list.
|
|
#
|
|
$(FTMODULE_H): $(MODULES_CFG)
|
|
$(FTMODULE_H_INIT)
|
|
$(FTMODULE_H_CREATE)
|
|
$(FTMODULE_H_DONE)
|
|
|
|
ifneq ($(findstring $(PLATFORM),dos win32 win16 os2),)
|
|
OPEN_MODULE := @echo$(space)
|
|
CLOSE_MODULE := >> $(subst /,\,$(FTMODULE_H))
|
|
REMOVE_MODULE := @-$(DELETE) $(subst /,\,$(FTMODULE_H))
|
|
else
|
|
OPEN_MODULE := @echo "
|
|
CLOSE_MODULE := " >> $(FTMODULE_H)
|
|
REMOVE_MODULE := @-$(DELETE) $(FTMODULE_H)
|
|
endif
|
|
|
|
|
|
define FTMODULE_H_INIT
|
|
$(REMOVE_MODULE)
|
|
@-echo Generating modules list in $(FTMODULE_H)...
|
|
$(OPEN_MODULE)/* This is a generated file. */$(CLOSE_MODULE)
|
|
endef
|
|
|
|
# It is no mistake that the final closing parenthesis is on the
|
|
# next line -- it produces proper newlines during the expansion
|
|
# of `foreach'.
|
|
#
|
|
define FTMODULE_H_CREATE
|
|
$(foreach COMMAND,$(FTMODULE_H_COMMANDS),$($(COMMAND))
|
|
)
|
|
endef
|
|
|
|
define FTMODULE_H_DONE
|
|
$(OPEN_MODULE)/* EOF */$(CLOSE_MODULE)
|
|
@echo done.
|
|
endef
|
|
|
|
|
|
# $(OPEN_DRIVER) & $(CLOSE_DRIVER) are used to specify a given font driver
|
|
# in the `module.mk' rules file.
|
|
#
|
|
OPEN_DRIVER := $(OPEN_MODULE)FT_USE_MODULE(
|
|
CLOSE_DRIVER := )$(CLOSE_MODULE)
|
|
|
|
ECHO_DRIVER := @echo "* module:$(space)
|
|
ECHO_DRIVER_DESC := (
|
|
ECHO_DRIVER_DONE := )"
|
|
|
|
# Each `module.mk' in the `src/*' subdirectories adds a variable with
|
|
# commands to $(FTMODULE_H_COMMANDS). Note that we can't use SRC_DIR here.
|
|
#
|
|
-include $(patsubst %,$(TOP_DIR)/src/%/module.mk,$(MODULES))
|
|
|
|
|
|
# EOF
|