forked from minhngoc25a/freetype2
* builds/*: s/BUILD_DIR/PLATFORM_DIR/.
The old variable name caused confusion.
This commit is contained in:
parent
3431553836
commit
03ceda9701
|
@ -1,3 +1,9 @@
|
||||||
|
2021-01-10 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
* builds/*: s/BUILD_DIR/PLATFORM_DIR/.
|
||||||
|
|
||||||
|
The old variable name caused confusion.
|
||||||
|
|
||||||
2021-01-08 Alexei Podtelezhnikov <apodtele@gmail.com>
|
2021-01-08 Alexei Podtelezhnikov <apodtele@gmail.com>
|
||||||
|
|
||||||
[builds] Revert `FTMODULE_H' changes.
|
[builds] Revert `FTMODULE_H' changes.
|
||||||
|
|
|
@ -13,11 +13,11 @@
|
||||||
# fully.
|
# fully.
|
||||||
|
|
||||||
|
|
||||||
DELETE := rm -f
|
DELETE := rm -f
|
||||||
CAT := cat
|
CAT := cat
|
||||||
SEP := /
|
SEP := /
|
||||||
BUILD_DIR := $(TOP_DIR)/builds/ansi
|
PLATFORM_DIR := $(TOP_DIR)/builds/ansi
|
||||||
PLATFORM := ansi
|
PLATFORM := ansi
|
||||||
|
|
||||||
# This is used for `make refdoc' and `make refdoc-venv'
|
# This is used for `make refdoc' and `make refdoc-venv'
|
||||||
#
|
#
|
||||||
|
|
|
@ -15,11 +15,11 @@
|
||||||
# fully.
|
# fully.
|
||||||
|
|
||||||
|
|
||||||
DELETE := rm -f
|
DELETE := rm -f
|
||||||
CAT := cat
|
CAT := cat
|
||||||
SEP := /
|
SEP := /
|
||||||
BUILD_DIR := $(TOP_DIR)/builds/beos
|
PLATFORM_DIR := $(TOP_DIR)/builds/beos
|
||||||
PLATFORM := beos
|
PLATFORM := beos
|
||||||
|
|
||||||
# This is used for `make refdoc' and `make refdoc-venv'
|
# This is used for `make refdoc' and `make refdoc-venv'
|
||||||
#
|
#
|
||||||
|
|
|
@ -27,11 +27,11 @@ endif
|
||||||
|
|
||||||
ifeq ($(PLATFORM),beos)
|
ifeq ($(PLATFORM),beos)
|
||||||
|
|
||||||
DELETE := rm -f
|
DELETE := rm -f
|
||||||
CAT := cat
|
CAT := cat
|
||||||
SEP := /
|
SEP := /
|
||||||
BUILD_DIR := $(TOP_DIR)/builds/beos
|
PLATFORM_DIR := $(TOP_DIR)/builds/beos
|
||||||
CONFIG_FILE := beos.mk
|
CONFIG_FILE := beos.mk
|
||||||
|
|
||||||
setup: std_setup
|
setup: std_setup
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
# This sub-Makefile is in charge of detecting the current platform. It sets
|
# This sub-Makefile is in charge of detecting the current platform. It sets
|
||||||
# the following variables:
|
# the following variables:
|
||||||
#
|
#
|
||||||
# BUILD_DIR The configuration and system-specific directory. Usually
|
# PLATFORM_DIR The configuration and system-specific directory. Usually
|
||||||
# `builds/$(PLATFORM)' but can be different for custom builds
|
# `builds/$(PLATFORM)' but can be different for custom builds
|
||||||
# of the library.
|
# of the library.
|
||||||
#
|
#
|
||||||
|
@ -49,8 +49,8 @@ SEP := /
|
||||||
BUILD_CONFIG := $(TOP_DIR)/builds
|
BUILD_CONFIG := $(TOP_DIR)/builds
|
||||||
|
|
||||||
# These two assignments must be delayed.
|
# These two assignments must be delayed.
|
||||||
BUILD_DIR = $(BUILD_CONFIG)/$(PLATFORM)
|
PLATFORM_DIR = $(BUILD_CONFIG)/$(PLATFORM)
|
||||||
CONFIG_RULES = $(BUILD_DIR)/$(CONFIG_FILE)
|
CONFIG_RULES = $(PLATFORM_DIR)/$(CONFIG_FILE)
|
||||||
|
|
||||||
# We define the BACKSLASH variable to hold a single back-slash character.
|
# We define the BACKSLASH variable to hold a single back-slash character.
|
||||||
# This is needed because a line like
|
# This is needed because a line like
|
||||||
|
@ -113,7 +113,7 @@ std_setup:
|
||||||
$(info )
|
$(info )
|
||||||
$(info $(empty) platform $(PLATFORM))
|
$(info $(empty) platform $(PLATFORM))
|
||||||
$(info $(empty) compiler $(CC))
|
$(info $(empty) compiler $(CC))
|
||||||
$(info $(empty) configuration directory $(subst /,$(SEP),$(BUILD_DIR)))
|
$(info $(empty) configuration directory $(subst /,$(SEP),$(PLATFORM_DIR)))
|
||||||
$(info $(empty) configuration rules $(subst /,$(SEP),$(CONFIG_RULES)))
|
$(info $(empty) configuration rules $(subst /,$(SEP),$(CONFIG_RULES)))
|
||||||
$(info )
|
$(info )
|
||||||
$(info If this does not correspond to your system or settings please remove the file)
|
$(info If this does not correspond to your system or settings please remove the file)
|
||||||
|
|
|
@ -13,11 +13,11 @@
|
||||||
# fully.
|
# fully.
|
||||||
|
|
||||||
|
|
||||||
DELETE := del
|
DELETE := del
|
||||||
CAT := type
|
CAT := type
|
||||||
SEP := $(strip \ )
|
SEP := $(strip \ )
|
||||||
BUILD_DIR := $(TOP_DIR)/builds/dos
|
PLATFORM_DIR := $(TOP_DIR)/builds/dos
|
||||||
PLATFORM := dos
|
PLATFORM := dos
|
||||||
|
|
||||||
# This is used for `make refdoc' and `make refdoc-venv'
|
# This is used for `make refdoc' and `make refdoc-venv'
|
||||||
#
|
#
|
||||||
|
|
|
@ -20,8 +20,8 @@
|
||||||
# The following variables (set by other Makefile components, in the
|
# The following variables (set by other Makefile components, in the
|
||||||
# environment, or on the command line) are used:
|
# environment, or on the command line) are used:
|
||||||
#
|
#
|
||||||
# BUILD_DIR The architecture dependent directory,
|
# PLATFORM_DIR The architecture-dependent directory,
|
||||||
# e.g. `$(TOP_DIR)/builds/unix'. Added to INCLUDES also.
|
# e.g., `$(TOP_DIR)/builds/unix'. Added to INCLUDES also.
|
||||||
#
|
#
|
||||||
# OBJ_DIR The directory in which object files are created.
|
# OBJ_DIR The directory in which object files are created.
|
||||||
#
|
#
|
||||||
|
@ -121,7 +121,7 @@ PROJECT_LIBRARY := $(LIB_DIR)/$(LIBRARY).$A
|
||||||
#
|
#
|
||||||
INCLUDES := $(subst /,$(COMPILER_SEP),$(OBJ_DIR) \
|
INCLUDES := $(subst /,$(COMPILER_SEP),$(OBJ_DIR) \
|
||||||
$(DEVEL_DIR) \
|
$(DEVEL_DIR) \
|
||||||
$(BUILD_DIR) \
|
$(PLATFORM_DIR) \
|
||||||
$(TOP_DIR)/include)
|
$(TOP_DIR)/include)
|
||||||
|
|
||||||
INCLUDE_FLAGS := $(INCLUDES:%=$I%)
|
INCLUDE_FLAGS := $(INCLUDES:%=$I%)
|
||||||
|
@ -175,16 +175,16 @@ OBJECTS_LIST :=
|
||||||
# changes, the whole library is recompiled.
|
# changes, the whole library is recompiled.
|
||||||
#
|
#
|
||||||
ifneq ($(wildcard $(OBJ_DIR)/ftoption.h),)
|
ifneq ($(wildcard $(OBJ_DIR)/ftoption.h),)
|
||||||
FTOPTION_H := $(OBJ_DIR)/ftoption.h
|
FTOPTION_H := $(OBJ_DIR)/ftoption.h
|
||||||
else ifneq ($(wildcard $(BUILD_DIR)/ftoption.h),)
|
else ifneq ($(wildcard $(PLATFORM_DIR)/ftoption.h),)
|
||||||
FTOPTION_H := $(BUILD_DIR)/ftoption.h
|
FTOPTION_H := $(PLATFORM_DIR)/ftoption.h
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PUBLIC_H := $(wildcard $(PUBLIC_DIR)/*.h)
|
PUBLIC_H := $(wildcard $(PUBLIC_DIR)/*.h)
|
||||||
INTERNAL_H := $(wildcard $(INTERNAL_DIR)/*.h) \
|
INTERNAL_H := $(wildcard $(INTERNAL_DIR)/*.h) \
|
||||||
$(wildcard $(SERVICES_DIR)/*.h)
|
$(wildcard $(SERVICES_DIR)/*.h)
|
||||||
CONFIG_H := $(wildcard $(CONFIG_DIR)/*.h) \
|
CONFIG_H := $(wildcard $(CONFIG_DIR)/*.h) \
|
||||||
$(wildcard $(BUILD_DIR)/config/*.h) \
|
$(wildcard $(PLATFORM_DIR)/config/*.h) \
|
||||||
$(FTMODULE_H) \
|
$(FTMODULE_H) \
|
||||||
$(FTOPTION_H)
|
$(FTOPTION_H)
|
||||||
DEVEL_H := $(wildcard $(TOP_DIR)/devel/*.h)
|
DEVEL_H := $(wildcard $(TOP_DIR)/devel/*.h)
|
||||||
|
|
|
@ -13,11 +13,11 @@
|
||||||
# fully.
|
# fully.
|
||||||
|
|
||||||
|
|
||||||
DELETE := del
|
DELETE := del
|
||||||
CAT := type
|
CAT := type
|
||||||
SEP := $(strip \ )
|
SEP := $(strip \ )
|
||||||
BUILD_DIR := $(TOP_DIR)/builds/os2
|
PLATFORM_DIR := $(TOP_DIR)/builds/os2
|
||||||
PLATFORM := os2
|
PLATFORM := os2
|
||||||
|
|
||||||
# This is used for `make refdoc' and `make refdoc-venv'
|
# This is used for `make refdoc' and `make refdoc-venv'
|
||||||
#
|
#
|
||||||
|
|
|
@ -204,7 +204,7 @@ if test "x${enable_mmap}" = "xno" \
|
||||||
-o "$ac_cv_func_mmap_fixed_mapped" != "yes"; then
|
-o "$ac_cv_func_mmap_fixed_mapped" != "yes"; then
|
||||||
FTSYS_SRC='$(BASE_DIR)/ftsystem.c'
|
FTSYS_SRC='$(BASE_DIR)/ftsystem.c'
|
||||||
else
|
else
|
||||||
FTSYS_SRC='$(BUILD_DIR)/ftsystem.c'
|
FTSYS_SRC='$(PLATFORM_DIR)/ftsystem.c'
|
||||||
|
|
||||||
AC_CHECK_DECLS([munmap],
|
AC_CHECK_DECLS([munmap],
|
||||||
[],
|
[],
|
||||||
|
|
|
@ -62,7 +62,7 @@ endif
|
||||||
$(DESTDIR)$(includedir)/freetype2/freetype/config/ftmodule.h
|
$(DESTDIR)$(includedir)/freetype2/freetype/config/ftmodule.h
|
||||||
$(INSTALL_DATA) $(OBJ_BUILD)/ftoption.h \
|
$(INSTALL_DATA) $(OBJ_BUILD)/ftoption.h \
|
||||||
$(DESTDIR)$(includedir)/freetype2/freetype/config/ftoption.h
|
$(DESTDIR)$(includedir)/freetype2/freetype/config/ftoption.h
|
||||||
$(INSTALL_SCRIPT) -m 644 $(BUILD_DIR)/freetype2.m4 \
|
$(INSTALL_SCRIPT) -m 644 $(PLATFORM_DIR)/freetype2.m4 \
|
||||||
$(DESTDIR)$(datadir)/aclocal/freetype2.m4
|
$(DESTDIR)$(datadir)/aclocal/freetype2.m4
|
||||||
$(INSTALL_SCRIPT) -m 644 $(OBJ_BUILD)/freetype2.pc \
|
$(INSTALL_SCRIPT) -m 644 $(OBJ_BUILD)/freetype2.pc \
|
||||||
$(DESTDIR)$(libdir)/pkgconfig/freetype2.pc
|
$(DESTDIR)$(libdir)/pkgconfig/freetype2.pc
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
CC := @CC@
|
CC := @CC@
|
||||||
COMPILER_SEP := $(SEP)
|
COMPILER_SEP := $(SEP)
|
||||||
FT_LIBTOOL_DIR ?= $(BUILD_DIR)
|
FT_LIBTOOL_DIR ?= $(PLATFORM_DIR)
|
||||||
|
|
||||||
LIBTOOL := $(FT_LIBTOOL_DIR)/libtool
|
LIBTOOL := $(FT_LIBTOOL_DIR)/libtool
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@ PYTHON := @PYTHON@
|
||||||
BIN := bin
|
BIN := bin
|
||||||
|
|
||||||
# this is used for `make distclean' and `make install'
|
# this is used for `make distclean' and `make install'
|
||||||
OBJ_BUILD ?= $(BUILD_DIR)
|
OBJ_BUILD ?= $(PLATFORM_DIR)
|
||||||
|
|
||||||
# don't use `:=' here since the path stuff will be included after this file
|
# don't use `:=' here since the path stuff will be included after this file
|
||||||
#
|
#
|
||||||
|
|
|
@ -13,8 +13,8 @@
|
||||||
# fully.
|
# fully.
|
||||||
|
|
||||||
# We need these declarations here since unix-def.mk is a generated file.
|
# We need these declarations here since unix-def.mk is a generated file.
|
||||||
BUILD_DIR := $(TOP_DIR)/builds/unix
|
PLATFORM_DIR := $(TOP_DIR)/builds/unix
|
||||||
PLATFORM := unix
|
PLATFORM := unix
|
||||||
|
|
||||||
have_mk := $(wildcard $(OBJ_DIR)/unix-def.mk)
|
have_mk := $(wildcard $(OBJ_DIR)/unix-def.mk)
|
||||||
ifneq ($(have_mk),)
|
ifneq ($(have_mk),)
|
||||||
|
@ -22,8 +22,8 @@ ifneq ($(have_mk),)
|
||||||
include $(OBJ_DIR)/unix-def.mk
|
include $(OBJ_DIR)/unix-def.mk
|
||||||
include $(OBJ_DIR)/unix-cc.mk
|
include $(OBJ_DIR)/unix-cc.mk
|
||||||
else
|
else
|
||||||
include $(BUILD_DIR)/unix-def.mk
|
include $(PLATFORM_DIR)/unix-def.mk
|
||||||
include $(BUILD_DIR)/unix-cc.mk
|
include $(PLATFORM_DIR)/unix-cc.mk
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef BUILD_PROJECT
|
ifdef BUILD_PROJECT
|
||||||
|
|
|
@ -13,11 +13,11 @@
|
||||||
# fully.
|
# fully.
|
||||||
|
|
||||||
|
|
||||||
DELETE := del
|
DELETE := del
|
||||||
CAT := type
|
CAT := type
|
||||||
SEP := $(strip \ )
|
SEP := $(strip \ )
|
||||||
BUILD_DIR := $(TOP_DIR)/builds/windows
|
PLATFORM_DIR := $(TOP_DIR)/builds/windows
|
||||||
PLATFORM := windows
|
PLATFORM := windows
|
||||||
|
|
||||||
# This is used for `make refdoc' and `make refdoc-venv'
|
# This is used for `make refdoc' and `make refdoc-venv'
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in New Issue