* Makefile, configure, */*.mk, builds/unix/unix-def.in,

docs/CHANGES, docs/INSTALL: s/TOP/TOP_DIR/.
This commit is contained in:
Werner Lemberg 2002-06-14 08:09:25 +00:00
parent 96be66c86f
commit 2f3bdf9158
38 changed files with 149 additions and 144 deletions

View File

@ -1,3 +1,8 @@
2002-06-14 Werner Lemberg <wl@gnu.org>
* Makefile, configure, */*.mk, builds/unix/unix-def.in,
docs/CHANGES, docs/INSTALL: s/TOP/TOP_DIR/.
2002-06-12 Werner Lemberg <wl@gnu.org>
* src/bdf/bdflib.c: s/FT_Short/short/ for consistency.

View File

@ -20,13 +20,13 @@ PROJECT_TITLE := FreeType
USE_MODULES := 1
# The variable TOP holds the path to the topmost directory in the project
# The variable TOP_DIR holds the path to the topmost directory in the project
# engine source hierarchy. If it is not defined, default it to `.'.
#
ifndef TOP
TOP := .
ifndef TOP_DIR
TOP_DIR := .
endif
include $(TOP)/builds/toplevel.mk
include $(TOP_DIR)/builds/toplevel.mk
# EOF

View File

@ -13,14 +13,14 @@
# fully.
ifndef TOP
TOP := .
ifndef TOP_DIR
TOP_DIR := .
endif
DELETE := rm -f
SEP := /
HOSTSEP := $(SEP)
BUILD := $(TOP)/builds/ansi
BUILD := $(TOP_DIR)/builds/ansi
PLATFORM := ansi
@ -28,13 +28,13 @@ PLATFORM := ansi
#
# This lets you build the library in your own directory with something like
#
# set TOP=.../path/to/freetype2/top/dir...
# set TOP_DIR=.../path/to/freetype2/top/dir...
# set OBJ_DIR=.../path/to/obj/dir
# make -f $TOP/Makefile setup [options]
# make -f $TOP/Makefile
# make -f $TOP_DIR/Makefile setup [options]
# make -f $TOP_DIR/Makefile
#
ifndef OBJ_DIR
OBJ_DIR := $(TOP)$(SEP)objs
OBJ_DIR := $(TOP_DIR)$(SEP)objs
endif

View File

@ -13,8 +13,8 @@
# fully.
include $(TOP)/builds/ansi/ansi-def.mk
include $(TOP)/builds/compiler/ansi-cc.mk
include $(TOP)/builds/link_std.mk
include $(TOP_DIR)/builds/ansi/ansi-def.mk
include $(TOP_DIR)/builds/compiler/ansi-cc.mk
include $(TOP_DIR)/builds/link_std.mk
# EOF

View File

@ -15,14 +15,14 @@
# fully.
ifndef TOP
TOP := .
ifndef TOP_DIR
TOP_DIR := .
endif
DELETE := rm -f
SEP := /
HOSTSEP := $(SEP)
BUILD := $(TOP)/builds/neos
BUILD := $(TOP_DIR)/builds/neos
PLATFORM := beos
@ -30,13 +30,13 @@ PLATFORM := beos
#
# This lets you build the library in your own directory with something like
#
# set TOP=.../path/to/freetype2/top/dir...
# set TOP_DIR=.../path/to/freetype2/top/dir...
# set OBJ_DIR=.../path/to/obj/dir
# make -f $TOP/Makefile setup [options]
# make -f $TOP/Makefile
# make -f $TOP_DIR/Makefile setup [options]
# make -f $TOP_DIR/Makefile
#
ifndef OBJ_DIR
OBJ_DIR := $(TOP)$(SEP)objs
OBJ_DIR := $(TOP_DIR)$(SEP)objs
endif

View File

@ -11,9 +11,9 @@
# indicate that you have read the license and understand and accept it
# fully.
include $(TOP)/builds/compiler/ansi-cc.mk
include $(TOP)/builds/beos/beos-def.mk
include $(TOP)/builds/link_std.mk
include $(TOP_DIR)/builds/compiler/ansi-cc.mk
include $(TOP_DIR)/builds/beos/beos-def.mk
include $(TOP_DIR)/builds/link_std.mk
# EOF

View File

@ -30,7 +30,7 @@ ifeq ($(PLATFORM),beos)
DELETE := rm -f
SEP := /
HOSTSEP := $(SEP)
BUILD := $(TOP)/builds/beos
BUILD := $(TOP_DIR)/builds/beos
CONFIG_FILE := beos.mk
setup: std_setup

View File

@ -34,13 +34,13 @@
#
# You need to set the following variable(s) before calling it:
#
# TOP The top-most directory in the FreeType library source
# TOP_DIR The top-most directory in the FreeType library source
# hierarchy. If not defined, it will default to `.'.
# If TOP is not defined, default it to `.'
# If TOP_DIR is not defined, default it to `.'
#
ifndef TOP
TOP := .
ifndef TOP_DIR
TOP_DIR := .
endif
# Set auto-detection default to `ansi' resp. UNIX-like operating systems.
@ -52,7 +52,7 @@ DELETE := $(RM)
COPY := cp
SEP := /
BUILD_CONFIG_ = $(TOP)$(SEP)builds$(SEP)
BUILD_CONFIG_ = $(TOP_DIR)$(SEP)builds$(SEP)
BUILD = $(BUILD_CONFIG_)$(PLATFORM)
CONFIG_RULES = $(BUILD)$(SEP)$(CONFIG_FILE)

View File

@ -15,7 +15,7 @@
DELETE := del
HOSTSEP := $(strip \ )
BUILD := $(TOP)$(SEP)builds$(SEP)dos
BUILD := $(TOP_DIR)$(SEP)builds$(SEP)dos
PLATFORM := dos
# except for DJGPP/GCC on Dos
@ -28,13 +28,13 @@ endif
#
# This lets you build the library in your own directory with something like
#
# set TOP=.../path/to/freetype2/top/dir...
# set TOP_DIR=.../path/to/freetype2/top/dir...
# set OBJ_DIR=.../path/to/obj/dir
# make -f %TOP%/Makefile setup [options]
# make -f %TOP%/Makefile
# make -f %TOP_DIR%/Makefile setup [options]
# make -f %TOP_DIR%/Makefile
#
ifndef OBJ_DIR
OBJ_DIR := $(TOP)$(SEP)objs
OBJ_DIR := $(TOP_DIR)$(SEP)objs
endif

View File

@ -15,8 +15,8 @@
SEP := /
include $(TOP)/builds/dos/dos-def.mk
include $(TOP)/builds/compiler/gcc.mk
include $(TOP)/builds/link_dos.mk
include $(TOP_DIR)/builds/dos/dos-def.mk
include $(TOP_DIR)/builds/compiler/gcc.mk
include $(TOP_DIR)/builds/link_dos.mk
# EOF

View File

@ -21,7 +21,7 @@
# environment, or on the command line) are used:
#
# BUILD The architecture dependent directory,
# e.g. `$(TOP)/builds/unix'.
# e.g. `$(TOP_DIR)/builds/unix'.
#
# OBJ_DIR The directory in which object files are created.
#
@ -62,7 +62,7 @@
# variables which is to be removed for the `clean' resp.
# `distclean' target.
#
# TOP, SEP,
# TOP_DIR, SEP,
# LIBRARY, CC,
# A, I, O, T Check `config.mk' for details.
@ -83,7 +83,7 @@ multi: objects library
# The FreeType source directory, usually `./src'.
#
SRC := $(TOP)$(SEP)src
SRC := $(TOP_DIR)$(SEP)src
# The directory where the base layer components are placed, usually
@ -95,7 +95,7 @@ BASE_DIR := $(SRC)$(SEP)base
# as macro.
#
ifndef FT_BUILD_H
FT_BUILD_H := $(TOP)$(SEP)include$(SEP)ft2build.h
FT_BUILD_H := $(TOP_DIR)$(SEP)include$(SEP)ft2build.h
FTBUILD_CMD :=
else
FTBUILD_CMD = $(D)FT_BUILD_H=$(FT_BUILD_H)
@ -104,14 +104,14 @@ endif
# A few short-cuts in order to avoid typing $(SEP) all the time for the
# directory separator.
#
# For example: $(SRC_) equals to `./src/' where `.' is $(TOP).
# For example: $(SRC_) equals to `./src/' where `.' is $(TOP_DIR).
#
#
SRC_ := $(SRC)$(SEP)
BASE_ := $(BASE_DIR)$(SEP)
OBJ_ := $(OBJ_DIR)$(SEP)
LIB_ := $(LIB_DIR)$(SEP)
PUBLIC_ := $(TOP)$(SEP)include$(SEP)freetype$(SEP)
PUBLIC_ := $(TOP_DIR)$(SEP)include$(SEP)freetype$(SEP)
INTERNAL_ := $(PUBLIC_)internal$(SEP)
CONFIG_ := $(PUBLIC_)config$(SEP)
CACHE_ := $(PUBLIC_)cache$(SEP)
@ -130,7 +130,7 @@ PROJECT_LIBRARY := $(LIB_)$(LIBRARY).$A
# in the `freetype/builds/<system>' directory, as these
# files will override the default sources.
#
INCLUDES := $(OBJ_DIR) $(BUILD) $(TOP)$(SEP)include
INCLUDES := $(OBJ_DIR) $(BUILD) $(TOP_DIR)$(SEP)include
INCLUDE_FLAGS = $(INCLUDES:%=$I%)
@ -149,7 +149,7 @@ FT_COMPILE = $(CC) $(ANSIFLAGS) $(FT_CFLAGS)
# Include the `modules' rules file.
#
include $(TOP)/builds/modules.mk
include $(TOP_DIR)/builds/modules.mk
# Initialize the list of objects.
@ -158,7 +158,7 @@ OBJECTS_LIST :=
# Define $(PUBLIC_H) as the list of all public header files located in
# `$(TOP)/include/freetype'. $(BASE_H), $(CACHE_H), and $(CONFIG_H) are
# `$(TOP_DIR)/include/freetype'. $(BASE_H), $(CACHE_H), and $(CONFIG_H) are
# defined similarly.
#
# This is used to simplify the dependency rules -- if one of these files

View File

@ -20,7 +20,7 @@ ifdef BUILD_PROJECT
# Now include the main sub-makefile. It contains all the rules used to
# build the library with the previous variables defined.
#
include $(TOP)/builds/$(PROJECT).mk
include $(TOP_DIR)/builds/$(PROJECT).mk
# The cleanup targets.
#

View File

@ -20,7 +20,7 @@ ifdef BUILD_PROJECT
# Now include the main sub-makefile. It contains all the rules used to
# build the library with the previous variables defined.
#
include $(TOP)/builds/$(PROJECT).mk
include $(TOP_DIR)/builds/$(PROJECT).mk
# The cleanup targets.
#

View File

@ -26,7 +26,7 @@
# resides. For now, it is in `include/freetype/config/ftmodule.h'.
#
ifndef MODULE_LIST
MODULE_LIST := $(TOP)$(SEP)include$(SEP)$(PROJECT)$(SEP)config$(SEP)ftmodule.h
MODULE_LIST := $(TOP_DIR)$(SEP)include$(SEP)$(PROJECT)$(SEP)config$(SEP)ftmodule.h
endif
# To build the modules list, we invoke the `make_module_list' target.
@ -71,6 +71,6 @@ ECHO_DRIVER_DONE := )"
# Each `module.mk' in the `src' sub-dirs is used to add one rule to the
# target `make_module_list'.
#
include $(wildcard $(TOP)/src/*/module.mk)
include $(wildcard $(TOP_DIR)/src/*/module.mk)
# EOF

View File

@ -15,7 +15,7 @@
DELETE := del
HOSTSEP := $(strip \ )
BUILD := $(TOP)$(SEP)builds$(SEP)os2
BUILD := $(TOP_DIR)$(SEP)builds$(SEP)os2
PLATFORM := os2
# except for GCC+emx on OS/2
@ -28,13 +28,13 @@ endif
#
# This lets you build the library in your own directory with something like
#
# set TOP=.../path/to/freetype2/top/dir...
# set TOP_DIR=.../path/to/freetype2/top/dir...
# set OBJ_DIR=.../path/to/obj/dir
# make -f %TOP%/Makefile setup [options]
# make -f %TOP%/Makefile
# make -f %TOP_DIR%/Makefile setup [options]
# make -f %TOP_DIR%/Makefile
#
ifndef OBJ_DIR
OBJ_DIR := $(TOP)$(SEP)objs
OBJ_DIR := $(TOP_DIR)$(SEP)objs
endif

View File

@ -15,19 +15,19 @@
# fully.
ifndef TOP
TOP := .
ifndef TOP_DIR
TOP_DIR := .
endif
SEP := /
include $(TOP)/builds/os2/os2-def.mk
BUILD := $(TOP)/builds/devel
include $(TOP_DIR)/builds/os2/os2-def.mk
BUILD := $(TOP_DIR)/builds/devel
include $(TOP)/builds/compiler/gcc-dev.mk
include $(TOP_DIR)/builds/compiler/gcc-dev.mk
# include linking instructions
include $(TOP)/builds/link_dos.mk
include $(TOP_DIR)/builds/link_dos.mk
# EOF

View File

@ -16,12 +16,12 @@
SEP := /
# include OS/2-specific definitions
include $(TOP)/builds/os2/os2-def.mk
include $(TOP_DIR)/builds/os2/os2-def.mk
# include gcc-specific definitions
include $(TOP)/builds/compiler/gcc.mk
include $(TOP_DIR)/builds/compiler/gcc.mk
# include linking instructions
include $(TOP)/builds/link_dos.mk
include $(TOP_DIR)/builds/link_dos.mk
# EOF

View File

@ -52,7 +52,7 @@ endif
# configuration rules file to use.
#
# Note that the configuration file is put in the current directory, which is
# not necessarily $(TOP).
# not necessarily $(TOP_DIR).
# If `config.mk' is not present, set `check_platform'.
#
@ -81,10 +81,10 @@ ifdef check_platform
#modules: make_module_list setup
endif
include $(TOP)/builds/detect.mk
include $(TOP_DIR)/builds/detect.mk
ifdef USE_MODULES
include $(TOP)/builds/modules.mk
include $(TOP_DIR)/builds/modules.mk
ifeq ($(wildcard $(MODULE_LIST)),)
setup: make_module_list

View File

@ -75,10 +75,10 @@ ifeq ($(PLATFORM),unix)
have_mk := $(strip $(wildcard $(OBJ_DIR)/Makefile))
ifneq ($(have_mk),)
# we are building FT2 not in the src tree
unix-def.mk: $(TOP)/builds/unix/unix-def.in
$(TOP)/builds/unix/configure $(CFG)
unix-def.mk: $(TOP_DIR)/builds/unix/unix-def.in
$(TOP_DIR)/builds/unix/configure $(CFG)
else
unix-def.mk: $(TOP)/builds/unix/unix-def.in
unix-def.mk: $(TOP_DIR)/builds/unix/unix-def.in
cd builds/unix; ./configure $(CFG)
endif

View File

@ -13,16 +13,16 @@
# fully.
ifndef TOP
TOP := .
ifndef TOP_DIR
TOP_DIR := .
endif
TOP := $(shell cd $(TOP); pwd)
TOP_DIR := $(shell cd $(TOP_DIR); pwd)
DELETE := @RMF@
DELDIR := @RMDIR@
SEP := /
HOSTSEP := $(SEP)
BUILD := $(TOP)/builds/unix
BUILD := $(TOP_DIR)/builds/unix
PLATFORM := unix
# this is used for `make distclean' and `make install'
@ -66,13 +66,13 @@ version_info := @version_info@
#
# This lets you build the library in your own directory with something like
#
# set TOP=.../path/to/freetype2/top/dir...
# set TOP_DIR=.../path/to/freetype2/top/dir...
# set OBJ_DIR=.../path/to/obj/dir
# make -f $TOP/Makefile setup [options]
# make -f $TOP/Makefile
# make -f $TOP_DIR/Makefile setup [options]
# make -f $TOP_DIR/Makefile
#
ifndef OBJ_DIR
OBJ_DIR := $(shell cd $(TOP)/objs; pwd)
OBJ_DIR := $(shell cd $(TOP_DIR)/objs; pwd)
endif

View File

@ -16,10 +16,10 @@
# fully.
include $(TOP)/builds/unix/unixddef.mk
BUILD := $(TOP)/builds/devel
include $(TOP_DIR)/builds/unix/unixddef.mk
BUILD := $(TOP_DIR)/builds/devel
include $(TOP)/builds/compiler/gcc-dev.mk
include $(TOP)/builds/link_std.mk
include $(TOP_DIR)/builds/compiler/gcc-dev.mk
include $(TOP_DIR)/builds/link_std.mk
# EOF

View File

@ -16,8 +16,8 @@
# fully.
include $(TOP)/builds/unix/unixddef.mk
include $(TOP)/builds/compiler/unix-lcc.mk
include $(TOP)/builds/link_std.mk
include $(TOP_DIR)/builds/unix/unixddef.mk
include $(TOP_DIR)/builds/compiler/unix-lcc.mk
include $(TOP_DIR)/builds/link_std.mk
# EOF

View File

@ -12,10 +12,10 @@
# indicate that you have read the license and understand and accept it
# fully.
have_mk := $(strip $(wildcard $(TOP)/builds/unix/unix-def.mk))
have_mk := $(strip $(wildcard $(TOP_DIR)/builds/unix/unix-def.mk))
ifneq ($(have_mk),)
include $(TOP)/builds/unix/unix-def.mk
include $(TOP)/builds/unix/unix-cc.mk
include $(TOP_DIR)/builds/unix/unix-def.mk
include $(TOP_DIR)/builds/unix/unix-cc.mk
else
# we are building FT2 not in the src tree
include $(OBJ_DIR)/unix-def.mk
@ -29,7 +29,7 @@ ifdef BUILD_PROJECT
# Now include the main sub-makefile. It contains all the rules used to
# build the library with the previous variables defined.
#
include $(TOP)/builds/$(PROJECT).mk
include $(TOP_DIR)/builds/$(PROJECT).mk
# The cleanup targets.
@ -52,6 +52,6 @@ endif
endif
include $(TOP)/builds/unix/install.mk
include $(TOP_DIR)/builds/unix/install.mk
# EOF

View File

@ -14,17 +14,17 @@
# fully.
ifndef TOP
TOP := .
ifndef TOP_DIR
TOP_DIR := .
endif
TOP := $(shell cd $(TOP); pwd)
TOP_DIR := $(shell cd $(TOP_DIR); pwd)
DELETE := rm -f
SEP := /
HOSTSEP := $(SEP)
# we use a special devel ftoption.h
BUILD := $(TOP)/builds/devel
BUILD := $(TOP_DIR)/builds/devel
# do not set the platform to `unix', or libtool will trick you
PLATFORM := unixdev
@ -33,7 +33,7 @@ PLATFORM := unixdev
# The directory where all object files are placed.
#
ifndef OBJ_DIR
OBJ_DIR := $(shell cd $(TOP)/objs; pwd)
OBJ_DIR := $(shell cd $(TOP_DIR)/objs; pwd)
endif

View File

@ -14,10 +14,10 @@
SEP := /
include $(TOP)/builds/win32/win32-def.mk
include $(TOP)/builds/compiler/bcc.mk
include $(TOP_DIR)/builds/win32/win32-def.mk
include $(TOP_DIR)/builds/compiler/bcc.mk
# include linking instructions
include $(TOP)/builds/link_dos.mk
include $(TOP_DIR)/builds/link_dos.mk
# EOF

View File

@ -15,12 +15,12 @@
SEP := /
include $(TOP)/builds/win32/win32-def.mk
BUILD := $(TOP)/builds/devel
include $(TOP_DIR)/builds/win32/win32-def.mk
BUILD := $(TOP_DIR)/builds/devel
include $(TOP)/builds/compiler/bcc-dev.mk
include $(TOP_DIR)/builds/compiler/bcc-dev.mk
# include linking instructions
include $(TOP)/builds/link_dos.mk
include $(TOP_DIR)/builds/link_dos.mk
# EOF

View File

@ -19,19 +19,19 @@
# Shell (_not_ Cygwin BASH)!
#
ifndef TOP
TOP := .
ifndef TOP_DIR
TOP_DIR := .
endif
SEP := /
include $(TOP)/builds/win32/win32-def.mk
BUILD := $(TOP)/builds/devel
include $(TOP_DIR)/builds/win32/win32-def.mk
BUILD := $(TOP_DIR)/builds/devel
include $(TOP)/builds/compiler/gcc-dev.mk
include $(TOP_DIR)/builds/compiler/gcc-dev.mk
# include linking instructions
include $(TOP)/builds/link_dos.mk
include $(TOP_DIR)/builds/link_dos.mk

View File

@ -18,12 +18,12 @@
SEP := /
# include Win32-specific definitions
include $(TOP)/builds/win32/win32-def.mk
include $(TOP_DIR)/builds/win32/win32-def.mk
# include gcc-specific definitions
include $(TOP)/builds/compiler/gcc.mk
include $(TOP_DIR)/builds/compiler/gcc.mk
# include linking instructions
include $(TOP)/builds/link_dos.mk
include $(TOP_DIR)/builds/link_dos.mk
# EOF

View File

@ -13,10 +13,10 @@
# fully.
include $(TOP)/builds/win32/win32-def.mk
include $(TOP)/builds/compiler/visualage.mk
include $(TOP_DIR)/builds/win32/win32-def.mk
include $(TOP_DIR)/builds/compiler/visualage.mk
# include linking instructions
include $(TOP)/builds/link_dos.mk
include $(TOP_DIR)/builds/link_dos.mk
# EOF

View File

@ -14,10 +14,10 @@
SEP := /
include $(TOP)/builds/win32/win32-def.mk
include $(TOP)/builds/compiler/intelc.mk
include $(TOP_DIR)/builds/win32/win32-def.mk
include $(TOP_DIR)/builds/compiler/intelc.mk
# include linking instructions
include $(TOP)/builds/link_dos.mk
include $(TOP_DIR)/builds/link_dos.mk
# EOF

View File

@ -14,11 +14,11 @@
SEP := /
include $(TOP)/builds/win32/win32-def.mk
include $(TOP)/builds/compiler/win-lcc.mk
include $(TOP_DIR)/builds/win32/win32-def.mk
include $(TOP_DIR)/builds/compiler/win-lcc.mk
# include linking instructions
include $(TOP)/builds/link_dos.mk
include $(TOP_DIR)/builds/link_dos.mk
# EOF

View File

@ -18,14 +18,14 @@
SEP := /
# include Win32-specific definitions
include $(TOP)/builds/win32/win32-def.mk
include $(TOP_DIR)/builds/win32/win32-def.mk
LIBRARY := lib$(PROJECT)
# include gcc-specific definitions
include $(TOP)/builds/compiler/gcc.mk
include $(TOP_DIR)/builds/compiler/gcc.mk
# include linking instructions
include $(TOP)/builds/link_dos.mk
include $(TOP_DIR)/builds/link_dos.mk
# EOF

View File

@ -14,10 +14,10 @@
SEP := /
include $(TOP)/builds/win32/win32-def.mk
include $(TOP)/builds/compiler/visualc.mk
include $(TOP_DIR)/builds/win32/win32-def.mk
include $(TOP_DIR)/builds/compiler/visualc.mk
# include linking instructions
include $(TOP)/builds/link_dos.mk
include $(TOP_DIR)/builds/link_dos.mk
# EOF

View File

@ -16,11 +16,11 @@
SEP := /
ISEP := $(strip \ )
include $(TOP)/builds/win32/win32-def.mk
include $(TOP)/builds/compiler/watcom.mk
include $(TOP_DIR)/builds/win32/win32-def.mk
include $(TOP_DIR)/builds/compiler/watcom.mk
# include linking instructions
include $(TOP)/builds/link_dos.mk
include $(TOP_DIR)/builds/link_dos.mk
# EOF

View File

@ -15,7 +15,7 @@
DELETE := del
HOSTSEP := $(strip \ )
BUILD := $(TOP)$(SEP)builds$(SEP)win32
BUILD := $(TOP_DIR)$(SEP)builds$(SEP)win32
PLATFORM := win32
# by default, we use "\" as a separator on Win32
@ -30,13 +30,13 @@ endif
#
# This lets you build the library in your own directory with something like
#
# set TOP=.../path/to/freetype2/top/dir...
# set TOP_DIR=.../path/to/freetype2/top/dir...
# set OBJ_DIR=.../path/to/obj/dir
# make -f %TOP%/Makefile setup [options]
# make -f %TOP%/Makefile
# make -f %TOP_DIR%/Makefile setup [options]
# make -f %TOP_DIR%/Makefile
#
ifndef OBJ_DIR
OBJ_DIR := $(TOP)$(SEP)objs
OBJ_DIR := $(TOP_DIR)$(SEP)objs
endif

2
configure vendored
View File

@ -47,7 +47,7 @@ abs_ft2_dir=`cd "$ft2_dir" && pwd`
if test "$abs_curr_dir" != "$abs_ft2_dir"; then
echo "OBJ_DIR=$abs_curr_dir" > Makefile
echo "TOP=$abs_ft2_dir" >> Makefile
echo "TOP_DIR=$abs_ft2_dir" >> Makefile
echo "OBJ_BUILD=$abs_curr_dir" >> Makefile
echo "LIBTOOL=$abs_curr_dir/libtool" >> Makefile
echo "include $abs_ft2_dir/Makefile" >> Makefile

View File

@ -1270,7 +1270,7 @@ OLD CHANGES 16 May 2000
Here's a layout of the new directory hierarchy:
TOP
TOP_DIR
include/
freetype/
freetype.h
@ -1298,7 +1298,7 @@ OLD CHANGES 16 May 2000
Compiling a module is now much easier, for example, the following
should work when in the TOP directory on an ANSI build:
should work when in the TOP_DIR directory on an ANSI build:
gcc -c -I./include -I./src/base src/base/ftbase.c
gcc -c -I./include -I./src/sfnt src/sfnt/sfnt.c

View File

@ -118,15 +118,15 @@ II. From the command line
If you want to build FreeType 2 in another directory, you must set
two environment variables, `OJB_DIR' and `TOP'. The former gives
the directory where the object files and the library should be
two environment variables, `OJB_DIR' and `TOP_DIR'. The former
gives the directory where the object files and the library should be
created (this directory must exist), the latter the top directory of
the FreeType 2 source tree. Example:
OBJ_DIR=~/freetype2.compiled TOP=~/freetype2 \
make -f$TOP/Makefile setup ansi
OBJ_DIR=~/freetype2.compiled TOP=~/freetype2 \
make -f$TOP/Makefile
OBJ_DIR=~/freetype2.compiled TOP_DIR=~/freetype2 \
make -f$TOP_DIR/Makefile setup ansi
OBJ_DIR=~/freetype2.compiled TOP_DIR=~/freetype2 \
make -f$TOP_DIR/Makefile
On Unix boxes, calling `configure' from the build directory is
sufficient; it will build a small Makefile which calls the