ReceiveTempSMS
/
Al-Qurtas-Islamic-bank-The-Best-Bank-in-Iraq
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fix make rules for multi build on Mac OS X

This commit is contained in:
Suzuki, Toshiya (鈴木俊哉) 2008-09-30 16:21:07 +00:00
parent c6bdee5f27
commit ef4a915e28
4 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

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

4
builds/unix/configure.raw
View File

@ -263,6 +263,8 @@ esac
# Whether to use Mac OS resource-based fonts.
ftmac_c="" # src/base/ftmac.c should not be included in makefiles by default
# don't quote AS_HELP_STRING!
AC_ARG_WITH([old-mac-fonts],
AS_HELP_STRING([--with-old-mac-fonts],
@ -293,6 +295,7 @@ if test x$with_old_mac_fonts = xyes; then
])],
[AC_MSG_RESULT([ok])
ftmac_c='ftmac.c'
AC_MSG_CHECKING([OS_INLINE macro is ANSI compatible])
orig_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $XX_CFLAGS $XX_ANSIFLAGS"
@ -626,6 +629,7 @@ case "$CFLAGS" in
esac
AC_SUBST([ftmac_c])
AC_SUBST([LIBZ])
AC_SUBST([CFLAGS])
AC_SUBST([LDFLAGS])

4
builds/unix/unix-def.in
View File

@ -65,6 +65,10 @@ version_info := @version_info@
#
LIB_DIR := $(OBJ_DIR)
# 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,
# ftmac.c should be added to BASE_SRC.
ftmac_c := @ftmac_c@
# The SYSTEM_ZLIB macro is defined if the user wishes to link dynamically
# with its system wide zlib. If SYSTEM_ZLIB is 'yes', the zlib part of the

4
src/base/rules.mk
View File

@ -47,6 +47,10 @@ BASE_SRC := $(BASE_DIR)/ftcalc.c \
$(BASE_DIR)/ftutil.c \
$(BASE_DIR)/ftadvanc.c
ifneq ($(ftmac_c),)
BASE_SRC += $(BASE_DIR)/$(ftmac_c)
endif
# Base layer `extensions' sources
#
# An extension is added to the library file as a separate object. It is