Formatting.

This commit is contained in:
Werner Lemberg 2008-10-01 04:41:46 +00:00
parent ef4a915e28
commit fce4e23998
2 changed files with 12 additions and 12 deletions

View File

@ -1,21 +1,21 @@
2008-09-30 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> 2008-09-30 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
* src/base/rules.mk: Add conditional source to BASE_SRC, for * src/base/rules.mk: Add conditional source to BASE_SRC, for `make
`make multi' on Mac OS X. If the macro $(ftmac_c) is defined, multi' on Mac OS X. If the macro $(ftmac_c) is defined,
$(BASE_DIR)/$(ftmac_c) is added to BASE_SRC. In normal build, $(BASE_DIR)/$(ftmac_c) is added to BASE_SRC. In a normal build, the
the lack of ftmac.c in BASE_SRC is not serious because ftbase.c lack of ftmac.c in BASE_SRC is not serious because ftbase.c includes
includes ftmac.c. ftmac.c.
* builds/unix/unix-def.in: Add a macro definition of $(ftmac_c). * builds/unix/unix-def.in: Add a macro definition of $(ftmac_c).
* builds/unix/configure.raw: Add procedure to set up appropriate * builds/unix/configure.raw: Add procedure to set up appropriate
value of $(ftmac_c) with the consideration of the availability value of $(ftmac_c) with the consideration of the availability of
of Carbon framework. Carbon framework.
2008-09-30 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> 2008-09-30 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
* src/base/Jamfile: Add target for multi build by jam on Mac OS X. * src/base/Jamfile: Add target for multi build by jam on Mac OS X.
* src/base/ftobjs.c (FT_New_Face): Fix the condition to include * src/base/ftobjs.c (FT_New_Face): Fix the condition to include this
this function for MPW building. It is synchronized the condition function for MPW building. It is synchronized the condition to
to include ftmac.c source into ftbase.c. include ftmac.c source into ftbase.c.
2008-09-22 Werner Lemberg <wl@gnu.org> 2008-09-22 Werner Lemberg <wl@gnu.org>

View File

@ -3,7 +3,7 @@
# #
# Copyright 1996-2000, 2002, 2004, 2006 by # Copyright 1996-2000, 2002, 2004, 2006, 2008 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,
@ -66,7 +66,7 @@ version_info := @version_info@
LIB_DIR := $(OBJ_DIR) LIB_DIR := $(OBJ_DIR)
# The BASE_SRC macro lists all source files that should be included in # The BASE_SRC macro lists all source files that should be included in
# src/base/ftbase.c. When configure sets up CFLAGS to build ftmac.c, # src/base/ftbase.c. When configure sets up CFLAGS to build ftmac.c,
# ftmac.c should be added to BASE_SRC. # ftmac.c should be added to BASE_SRC.
ftmac_c := @ftmac_c@ ftmac_c := @ftmac_c@