Clean up, formatting etc.
Fixing rules for installing cache headers on Unix. Updating builds/unix/ftconfig.in.
This commit is contained in:
parent
f50c2954d4
commit
bd547dc6e3
|
@ -29,7 +29,7 @@ endif
|
||||||
|
|
||||||
# The directory where all library files are placed.
|
# The directory where all library files are placed.
|
||||||
#
|
#
|
||||||
# By default, this is the same as $(OBJ_DIR), however, this can be changed
|
# By default, this is the same as $(OBJ_DIR); however, this can be changed
|
||||||
# to suit particular needs.
|
# to suit particular needs.
|
||||||
#
|
#
|
||||||
LIB_DIR := $(OBJ_DIR)
|
LIB_DIR := $(OBJ_DIR)
|
||||||
|
@ -48,7 +48,7 @@ I := -I
|
||||||
|
|
||||||
|
|
||||||
# C flag used to define a macro before the compilation of a given source
|
# C flag used to define a macro before the compilation of a given source
|
||||||
# object. Usually is `-D' like in `-DDEBUG'.
|
# object. Usually it is `-D' like in `-DDEBUG'.
|
||||||
#
|
#
|
||||||
D := -D
|
D := -D
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
# Compiler command line name
|
# Compiler command line name
|
||||||
|
#
|
||||||
CC := cc
|
CC := cc
|
||||||
|
|
||||||
# The object file extension (for standard and static libraries). This can be
|
# The object file extension (for standard and static libraries). This can be
|
||||||
|
@ -26,7 +27,7 @@ I := -I
|
||||||
|
|
||||||
|
|
||||||
# C flag used to define a macro before the compilation of a given source
|
# C flag used to define a macro before the compilation of a given source
|
||||||
# object. Usually is `-D' like in `-DDEBUG'.
|
# object. Usually it is `-D' like in `-DDEBUG'.
|
||||||
#
|
#
|
||||||
D := -D
|
D := -D
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
# Copyright 2000 David Turner
|
# Copyright 2000 David Turner
|
||||||
#
|
#
|
||||||
# gcc-specific with NO OPTIMISATIONS + DEBUGGING
|
# gcc-specific with NO OPTIMIZATIONS + DEBUGGING
|
||||||
#
|
#
|
||||||
|
|
||||||
# Compiler command line name
|
# Compiler command line name
|
||||||
|
#
|
||||||
CC := gcc
|
CC := gcc
|
||||||
|
|
||||||
# The object file extension (for standard and static libraries). This can be
|
# The object file extension (for standard and static libraries). This can be
|
||||||
|
@ -26,7 +27,7 @@ I := -I
|
||||||
|
|
||||||
|
|
||||||
# C flag used to define a macro before the compilation of a given source
|
# C flag used to define a macro before the compilation of a given source
|
||||||
# object. Usually is `-D' like in `-DDEBUG'.
|
# object. Usually it is `-D' like in `-DDEBUG'.
|
||||||
#
|
#
|
||||||
D := -D
|
D := -D
|
||||||
|
|
||||||
|
@ -61,8 +62,9 @@ ANSIFLAGS := -ansi -pedantic
|
||||||
# Library linking
|
# Library linking
|
||||||
#
|
#
|
||||||
ifndef CLEAN_LIBRARY
|
ifndef CLEAN_LIBRARY
|
||||||
CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY)) $(NO_OUTPUT)
|
CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY)) \
|
||||||
|
$(NO_OUTPUT)
|
||||||
endif
|
endif
|
||||||
LINK_LIBRARY = $(AR) -r $@ $(OBJECTS_LIST)
|
LINK_LIBRARY = $(AR) -r $@ $(OBJECTS_LIST)
|
||||||
|
|
||||||
# EOF
|
# EOF
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
# Compiler command line name
|
# Compiler command line name
|
||||||
|
#
|
||||||
CC := gcc
|
CC := gcc
|
||||||
|
|
||||||
# The object file extension (for standard and static libraries). This can be
|
# The object file extension (for standard and static libraries). This can be
|
||||||
|
@ -26,7 +27,7 @@ I := -I
|
||||||
|
|
||||||
|
|
||||||
# C flag used to define a macro before the compilation of a given source
|
# C flag used to define a macro before the compilation of a given source
|
||||||
# object. Usually is `-D' like in `-DDEBUG'.
|
# object. Usually it is `-D' like in `-DDEBUG'.
|
||||||
#
|
#
|
||||||
D := -D
|
D := -D
|
||||||
|
|
||||||
|
@ -61,8 +62,9 @@ ANSIFLAGS := -ansi -pedantic
|
||||||
# Library linking
|
# Library linking
|
||||||
#
|
#
|
||||||
ifndef CLEAN_LIBRARY
|
ifndef CLEAN_LIBRARY
|
||||||
CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY)) $(NO_OUTPUT)
|
CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY)) \
|
||||||
|
$(NO_OUTPUT)
|
||||||
endif
|
endif
|
||||||
LINK_LIBRARY = $(AR) -r $@ $(OBJECTS_LIST)
|
LINK_LIBRARY = $(AR) -r $@ $(OBJECTS_LIST)
|
||||||
|
|
||||||
# EOF
|
# EOF
|
||||||
|
|
|
@ -6,18 +6,21 @@
|
||||||
#
|
#
|
||||||
CC := icc
|
CC := icc
|
||||||
|
|
||||||
|
|
||||||
# The object file extension (for standard and static libraries). This can be
|
# The object file extension (for standard and static libraries). This can be
|
||||||
# .o, .tco, .obj, etc., depending on the platform.
|
# .o, .tco, .obj, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
O := obj
|
O := obj
|
||||||
SO := obj
|
SO := obj
|
||||||
|
|
||||||
|
|
||||||
# The library file extension (for standard and static libraries). This can
|
# The library file extension (for standard and static libraries). This can
|
||||||
# be .a, .lib, etc., depending on the platform.
|
# be .a, .lib, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
A := lib
|
A := lib
|
||||||
SA := lib
|
SA := lib
|
||||||
|
|
||||||
|
|
||||||
# Path inclusion flag. Some compilers use a different flag than `-I' to
|
# Path inclusion flag. Some compilers use a different flag than `-I' to
|
||||||
# specify an additional include path. Examples are `/i=' or `-J'.
|
# specify an additional include path. Examples are `/i=' or `-J'.
|
||||||
#
|
#
|
||||||
|
|
|
@ -3,14 +3,17 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
# compiler command line name
|
# compiler command line name
|
||||||
|
#
|
||||||
CC := cl
|
CC := cl
|
||||||
|
|
||||||
|
|
||||||
# The object file extension (for standard and static libraries). This can be
|
# The object file extension (for standard and static libraries). This can be
|
||||||
# .o, .tco, .obj, etc., depending on the platform.
|
# .o, .tco, .obj, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
O := obj
|
O := obj
|
||||||
SO := obj
|
SO := obj
|
||||||
|
|
||||||
|
|
||||||
# The library file extension (for standard and static libraries). This can
|
# The library file extension (for standard and static libraries). This can
|
||||||
# be .a, .lib, etc., depending on the platform.
|
# be .a, .lib, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
|
@ -25,7 +28,7 @@ I := /I
|
||||||
|
|
||||||
|
|
||||||
# C flag used to define a macro before the compilation of a given source
|
# C flag used to define a macro before the compilation of a given source
|
||||||
# object. Usually is `-D' like in `-DDEBUG'.
|
# object. Usually it is `-D' like in `-DDEBUG'.
|
||||||
#
|
#
|
||||||
D := /D
|
D := /D
|
||||||
|
|
||||||
|
|
|
@ -6,12 +6,14 @@
|
||||||
#
|
#
|
||||||
CC := lcc
|
CC := lcc
|
||||||
|
|
||||||
|
|
||||||
# The object file extension (for standard and static libraries). This can be
|
# The object file extension (for standard and static libraries). This can be
|
||||||
# .o, .tco, .obj, etc., depending on the platform.
|
# .o, .tco, .obj, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
O := obj
|
O := obj
|
||||||
SO := obj
|
SO := obj
|
||||||
|
|
||||||
|
|
||||||
# The library file extension (for standard and static libraries). This can
|
# The library file extension (for standard and static libraries). This can
|
||||||
# be .a, .lib, etc., depending on the platform.
|
# be .a, .lib, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
|
@ -26,7 +28,7 @@ I := -I
|
||||||
|
|
||||||
|
|
||||||
# C flag used to define a macro before the compilation of a given source
|
# C flag used to define a macro before the compilation of a given source
|
||||||
# object. Usually is `-D' like in `-DDEBUG'.
|
# object. Usually it is `-D' like in `-DDEBUG'.
|
||||||
#
|
#
|
||||||
D := -D
|
D := -D
|
||||||
|
|
||||||
|
@ -55,7 +57,7 @@ endif
|
||||||
|
|
||||||
# ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
|
# ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
|
||||||
#
|
#
|
||||||
# LCC is pure ANSI anyway !!
|
# LCC is pure ANSI anyway!
|
||||||
#
|
#
|
||||||
ANSIFLAGS :=
|
ANSIFLAGS :=
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@ ifndef TOP
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Set auto-detection default to `ansi' resp. UNIX-like operating systems.
|
# Set auto-detection default to `ansi' resp. UNIX-like operating systems.
|
||||||
# Note that we delay the evaluation of $(BUILD_CONFIG_), $(BUILD), and
|
# Note that we delay evaluation of $(BUILD_CONFIG_), $(BUILD), and
|
||||||
# $(CONFIG_RULES).
|
# $(CONFIG_RULES).
|
||||||
#
|
#
|
||||||
PLATFORM := ansi
|
PLATFORM := ansi
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
#
|
||||||
# Copyright 2000 David Turner <david.turner@freetype.org>
|
# Copyright 2000 David Turner <david.turner@freetype.org>
|
||||||
#
|
#
|
||||||
# DOS specific definitions
|
# DOS specific definitions
|
||||||
|
@ -30,7 +31,7 @@ endif
|
||||||
|
|
||||||
# The directory where all library files are placed.
|
# The directory where all library files are placed.
|
||||||
#
|
#
|
||||||
# By default, this is the same as $(OBJ_DIR), however, this can be changed
|
# By default, this is the same as $(OBJ_DIR); however, this can be changed
|
||||||
# to suit particular needs.
|
# to suit particular needs.
|
||||||
#
|
#
|
||||||
LIB_DIR := $(OBJ_DIR)
|
LIB_DIR := $(OBJ_DIR)
|
||||||
|
@ -41,7 +42,7 @@ LIB_DIR := $(OBJ_DIR)
|
||||||
LIBRARY := $(PROJECT)
|
LIBRARY := $(PROJECT)
|
||||||
|
|
||||||
|
|
||||||
# the NO_OUTPUT macro is used to ignore the output of commands
|
# The NO_OUTPUT macro is used to ignore the output of commands.
|
||||||
#
|
#
|
||||||
NO_OUTPUT = &> nul
|
NO_OUTPUT = &> nul
|
||||||
|
|
||||||
|
@ -70,4 +71,4 @@ ifdef BUILD_PROJECT
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# EOF
|
||||||
|
|
|
@ -105,6 +105,7 @@ LIB_ := $(LIB_DIR)$(SEP)
|
||||||
PUBLIC_ := $(TOP)$(SEP)include$(SEP)freetype$(SEP)
|
PUBLIC_ := $(TOP)$(SEP)include$(SEP)freetype$(SEP)
|
||||||
INTERNAL_ := $(PUBLIC_)internal$(SEP)
|
INTERNAL_ := $(PUBLIC_)internal$(SEP)
|
||||||
CONFIG_ := $(PUBLIC_)config$(SEP)
|
CONFIG_ := $(PUBLIC_)config$(SEP)
|
||||||
|
CACHE_ := $(PUBLIC_)cache$(SEP)
|
||||||
|
|
||||||
|
|
||||||
# The final name of the library file.
|
# The final name of the library file.
|
||||||
|
@ -145,8 +146,8 @@ OBJECTS_LIST :=
|
||||||
|
|
||||||
|
|
||||||
# Define $(PUBLIC_H) as the list of all public header files located in
|
# Define $(PUBLIC_H) as the list of all public header files located in
|
||||||
# `$(TOP)/include/freetype'. $(BASE_H) and $(CONFIG_H) are defined
|
# `$(TOP)/include/freetype'. $(BASE_H), $(CACHE_H), and $(CONFIG_H) are
|
||||||
# similarly.
|
# defined similarly.
|
||||||
#
|
#
|
||||||
# This is used to simplify the dependency rules -- if one of these files
|
# This is used to simplify the dependency rules -- if one of these files
|
||||||
# changes, the whole library is recompiled.
|
# changes, the whole library is recompiled.
|
||||||
|
@ -154,8 +155,9 @@ OBJECTS_LIST :=
|
||||||
PUBLIC_H := $(wildcard $(PUBLIC_)*.h)
|
PUBLIC_H := $(wildcard $(PUBLIC_)*.h)
|
||||||
BASE_H := $(wildcard $(INTERNAL_)*.h)
|
BASE_H := $(wildcard $(INTERNAL_)*.h)
|
||||||
CONFIG_H := $(wildcard $(CONFIG_)*.h)
|
CONFIG_H := $(wildcard $(CONFIG_)*.h)
|
||||||
|
CACHE_H := $(wildcard $(CACHE_)*.h)
|
||||||
|
|
||||||
FREETYPE_H := $(PUBLIC_H) $(BASE_H) $(CONFIG_H)
|
FREETYPE_H := $(PUBLIC_H) $(BASE_H) $(CONFIG_H) $(CACHE_H)
|
||||||
|
|
||||||
|
|
||||||
# ftsystem component
|
# ftsystem component
|
||||||
|
@ -257,10 +259,12 @@ distclean_project_std: clean_project_std
|
||||||
# we are stuck with wildcards.
|
# we are stuck with wildcards.
|
||||||
#
|
#
|
||||||
clean_project_dos:
|
clean_project_dos:
|
||||||
-$(DELETE) $(subst $(SEP),$(HOSTSEP),$(OBJ_))*.$O $(CLEAN) $(NO_OUTPUT)
|
-$(DELETE) $(subst $(SEP),$(HOSTSEP),$(OBJ_))*.$O \
|
||||||
|
$(CLEAN) $(NO_OUTPUT)
|
||||||
|
|
||||||
distclean_project_dos: clean_project_dos
|
distclean_project_dos: clean_project_dos
|
||||||
-$(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY)) $(DISTCLEAN) $(NO_OUTPUT)
|
-$(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY)) \
|
||||||
|
$(DISTCLEAN) $(NO_OUTPUT)
|
||||||
|
|
||||||
# Remove configuration file (used for distclean).
|
# Remove configuration file (used for distclean).
|
||||||
#
|
#
|
||||||
|
|
|
@ -59,4 +59,4 @@ ifeq ($(PLATFORM),ansi)
|
||||||
endif # test OS2_SHELL
|
endif # test OS2_SHELL
|
||||||
endif # test PLATFORM
|
endif # test PLATFORM
|
||||||
|
|
||||||
#EOF
|
# EOF
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
#
|
||||||
# Copyright 2000 David Turner <david.turner@freetype.org>
|
# Copyright 2000 David Turner <david.turner@freetype.org>
|
||||||
#
|
#
|
||||||
# OS/2 specific definitions
|
# OS/2 specific definitions
|
||||||
|
@ -10,7 +11,7 @@ PLATFORM := os2
|
||||||
|
|
||||||
# except for GCC+emx on OS/2
|
# except for GCC+emx on OS/2
|
||||||
ifndef SEP
|
ifndef SEP
|
||||||
SEP := $(HOSTSEP)
|
SEP := $(HOSTSEP)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -30,7 +31,7 @@ endif
|
||||||
|
|
||||||
# The directory where all library files are placed.
|
# The directory where all library files are placed.
|
||||||
#
|
#
|
||||||
# By default, this is the same as $(OBJ_DIR), however, this can be changed
|
# By default, this is the same as $(OBJ_DIR); however, this can be changed
|
||||||
# to suit particular needs.
|
# to suit particular needs.
|
||||||
#
|
#
|
||||||
LIB_DIR := $(OBJ_DIR)
|
LIB_DIR := $(OBJ_DIR)
|
||||||
|
@ -41,7 +42,7 @@ LIB_DIR := $(OBJ_DIR)
|
||||||
LIBRARY := $(PROJECT)
|
LIBRARY := $(PROJECT)
|
||||||
|
|
||||||
|
|
||||||
# the NO_OUTPUT macro is used to ignore the output of commands
|
# The NO_OUTPUT macro is used to ignore the output of commands.
|
||||||
#
|
#
|
||||||
NO_OUTPUT = 2> nul
|
NO_OUTPUT = 2> nul
|
||||||
|
|
||||||
|
@ -70,4 +71,4 @@ ifdef BUILD_LIBRARY
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# EOF
|
||||||
|
|
|
@ -43,7 +43,7 @@ endif
|
||||||
|
|
||||||
# The directory where all library files are placed.
|
# The directory where all library files are placed.
|
||||||
#
|
#
|
||||||
# By default, this is the same as $(OBJ_DIR), however, this can be changed
|
# By default, this is the same as $(OBJ_DIR); however, this can be changed
|
||||||
# to suit particular needs.
|
# to suit particular needs.
|
||||||
#
|
#
|
||||||
LIB_DIR := $(OBJ_DIR)
|
LIB_DIR := $(OBJ_DIR)
|
||||||
|
@ -75,7 +75,7 @@ I := -I
|
||||||
|
|
||||||
|
|
||||||
# C flag used to define a macro before the compilation of a given source
|
# C flag used to define a macro before the compilation of a given source
|
||||||
# object. Usually is `-D' like in `-DDEBUG'.
|
# object. Usually it is `-D' like in `-DDEBUG'.
|
||||||
#
|
#
|
||||||
D := -D
|
D := -D
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ endif
|
||||||
|
|
||||||
# The directory where all library files are placed.
|
# The directory where all library files are placed.
|
||||||
#
|
#
|
||||||
# By default, this is the same as $(OBJ_DIR), however, this can be changed
|
# By default, this is the same as $(OBJ_DIR); however, this can be changed
|
||||||
# to suit particular needs.
|
# to suit particular needs.
|
||||||
#
|
#
|
||||||
LIB_DIR := $(OBJ_DIR)
|
LIB_DIR := $(OBJ_DIR)
|
||||||
|
@ -53,6 +53,7 @@ LIB_DIR := $(OBJ_DIR)
|
||||||
O := o
|
O := o
|
||||||
SO := o
|
SO := o
|
||||||
|
|
||||||
|
|
||||||
# The library file extension (for standard and static libraries). This can
|
# The library file extension (for standard and static libraries). This can
|
||||||
# be .a, .lib, etc., depending on the platform.
|
# be .a, .lib, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
|
@ -73,7 +74,7 @@ I := -I
|
||||||
|
|
||||||
|
|
||||||
# C flag used to define a macro before the compilation of a given source
|
# C flag used to define a macro before the compilation of a given source
|
||||||
# object. Usually is `-D' like in `-DDEBUG'.
|
# object. Usually it is `-D' like in `-DDEBUG'.
|
||||||
#
|
#
|
||||||
D := -D
|
D := -D
|
||||||
|
|
||||||
|
|
|
@ -58,21 +58,21 @@ ifdef check_platform
|
||||||
|
|
||||||
all: setup
|
all: setup
|
||||||
|
|
||||||
ifdef USE_MODULES
|
ifdef USE_MODULES
|
||||||
# If the module list $(MODULE_LIST) file is not present, generate it.
|
# If the module list $(MODULE_LIST) file is not present, generate it.
|
||||||
#
|
#
|
||||||
#modules: make_module_list setup
|
#modules: make_module_list setup
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include $(TOP)/builds/detect.mk
|
include $(TOP)/builds/detect.mk
|
||||||
|
|
||||||
ifdef USE_MODULES
|
ifdef USE_MODULES
|
||||||
include $(TOP)/builds/modules.mk
|
include $(TOP)/builds/modules.mk
|
||||||
|
|
||||||
ifeq ($(wildcard $(MODULE_LIST)),)
|
ifeq ($(wildcard $(MODULE_LIST)),)
|
||||||
setup: make_module_list
|
setup: make_module_list
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
|
||||||
|
|
||||||
# This rule makes sense for Unix only to remove files created by a run
|
# This rule makes sense for Unix only to remove files created by a run
|
||||||
# of the configure script which hasn't been successful (so that no
|
# of the configure script which hasn't been successful (so that no
|
||||||
|
@ -80,11 +80,11 @@ endif
|
||||||
# GNU make.
|
# GNU make.
|
||||||
#
|
#
|
||||||
distclean:
|
distclean:
|
||||||
$(RM) builds/unix/config.cache
|
$(RM) builds/unix/config.cache
|
||||||
$(RM) builds/unix/config.log
|
$(RM) builds/unix/config.log
|
||||||
$(RM) builds/unix/config.status
|
$(RM) builds/unix/config.status
|
||||||
$(RM) builds/unix/unix-def.mk
|
$(RM) builds/unix/unix-def.mk
|
||||||
$(RM) builds/unix/unix-cc.mk
|
$(RM) builds/unix/unix-cc.mk
|
||||||
|
|
||||||
# IMPORTANT:
|
# IMPORTANT:
|
||||||
#
|
#
|
||||||
|
@ -97,9 +97,9 @@ else
|
||||||
#
|
#
|
||||||
all: single
|
all: single
|
||||||
|
|
||||||
ifdef USE_MODULES
|
ifdef USE_MODULES
|
||||||
modules: make_module_list
|
modules: make_module_list
|
||||||
endif
|
endif
|
||||||
|
|
||||||
BUILD_PROJECT := yes
|
BUILD_PROJECT := yes
|
||||||
include $(CONFIG_MK)
|
include $(CONFIG_MK)
|
||||||
|
|
|
@ -79,7 +79,7 @@ AC_CHECK_FUNCS(memcpy memmove)
|
||||||
|
|
||||||
AM_PROG_LIBTOOL
|
AM_PROG_LIBTOOL
|
||||||
|
|
||||||
dnl create the Unix-specific sub-Makefile `builds/unix/unix-def.mk'
|
dnl create the Unix-specific sub-Makefiles `builds/unix/unix-def.mk'
|
||||||
dnl and 'builds/unix/unix-cc.mk' that will be used by the build system
|
dnl and 'builds/unix/unix-cc.mk' that will be used by the build system
|
||||||
dnl
|
dnl
|
||||||
AC_OUTPUT(unix-cc.mk:unix-cc.in unix-def.mk:unix-def.in)
|
AC_OUTPUT(unix-cc.mk:unix-cc.in unix-def.mk:unix-def.in)
|
||||||
|
|
|
@ -24,14 +24,14 @@ ifeq ($(PLATFORM),ansi)
|
||||||
|
|
||||||
|
|
||||||
# If `devel' is the requested target, we use a special configuration
|
# If `devel' is the requested target, we use a special configuration
|
||||||
# file named "unix-dev.mk". It disables optimization and libtool..
|
# file named `unix-dev.mk'. It disables optimization and libtool.
|
||||||
#
|
#
|
||||||
ifneq ($(findstring devel,$(MAKECMDGOALS)),)
|
ifneq ($(findstring devel,$(MAKECMDGOALS)),)
|
||||||
CONFIG_FILE := unix-dev.mk
|
CONFIG_FILE := unix-dev.mk
|
||||||
devel: setup
|
devel: setup
|
||||||
else
|
else
|
||||||
# If a Unix platform is detected, the configure script is called and
|
# If a Unix platform is detected, the configure script is called and
|
||||||
# `unix.mk' is created.
|
# `unix-def.mk' together with `unix-cc.mk' is created.
|
||||||
#
|
#
|
||||||
# Arguments to `configure' should be in the CFG variable. Example:
|
# Arguments to `configure' should be in the CFG variable. Example:
|
||||||
#
|
#
|
||||||
|
|
|
@ -224,12 +224,16 @@
|
||||||
/* */
|
/* */
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|
||||||
|
#define LOCAL_VAR extern "C"
|
||||||
|
|
||||||
#define LOCAL_FUNC_X extern "C"
|
#define LOCAL_FUNC_X extern "C"
|
||||||
|
|
||||||
#define FT_CPLUSPLUS( x ) extern "C" x
|
#define FT_CPLUSPLUS( x ) extern "C" x
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
|
#define LOCAL_VAR extern
|
||||||
|
|
||||||
#define LOCAL_FUNC_X static
|
#define LOCAL_FUNC_X static
|
||||||
|
|
||||||
#define FT_CPLUSPLUS( x ) x
|
#define FT_CPLUSPLUS( x ) x
|
||||||
|
|
|
@ -1,53 +1,51 @@
|
||||||
#
|
#
|
||||||
# installation instructions for Unix systems
|
# installation instructions for Unix systems --
|
||||||
# this file is FreeType-specific
|
# this file is FreeType-specific
|
||||||
#
|
#
|
||||||
|
|
||||||
# Unix installation and deinstallation targets.
|
# Unix installation and deinstallation targets.
|
||||||
install: $(PROJECT_LIBRARY)
|
install: $(PROJECT_LIBRARY)
|
||||||
$(MKINSTALLDIRS) $(libdir) \
|
$(MKINSTALLDIRS) $(libdir) \
|
||||||
$(includedir)/freetype/config \
|
$(includedir)/freetype/config \
|
||||||
$(includedir)/freetype/internal \
|
$(includedir)/freetype/internal \
|
||||||
$(includedir)/freetype/cache
|
$(includedir)/freetype/cache
|
||||||
$(LIBTOOL) --mode=install $(INSTALL) $(PROJECT_LIBRARY) $(libdir)
|
$(LIBTOOL) --mode=install $(INSTALL) $(PROJECT_LIBRARY) $(libdir)
|
||||||
-for P in $(PUBLIC_H) ; do \
|
-for P in $(PUBLIC_H) ; do \
|
||||||
$(INSTALL_DATA) $$P $(includedir)/freetype ; \
|
$(INSTALL_DATA) $$P $(includedir)/freetype ; \
|
||||||
done
|
done
|
||||||
-for P in $(BASE_H) ; do \
|
-for P in $(BASE_H) ; do \
|
||||||
$(INSTALL_DATA) $$P $(includedir)/freetype/internal ; \
|
$(INSTALL_DATA) $$P $(includedir)/freetype/internal ; \
|
||||||
done
|
done
|
||||||
-for P in $(CONFIG_H) ; do \
|
-for P in $(CONFIG_H) ; do \
|
||||||
$(INSTALL_DATA) $$P $(includedir)/freetype/config ; \
|
$(INSTALL_DATA) $$P $(includedir)/freetype/config ; \
|
||||||
done
|
done
|
||||||
-for P in $(BASE_H) ; do \
|
-for P in $(CACHE_H) ; do \
|
||||||
$(INSTALL_DATA) $$P $(includedir)/freetype/cache ; \
|
$(INSTALL_DATA) $$P $(includedir)/freetype/cache ; \
|
||||||
done
|
done
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
-$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/$(PROJECT_LIBRARY).$A
|
-$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/$(PROJECT_LIBRARY).$A
|
||||||
-$(DELETE) $(includedir)/freetype/cache/*
|
-$(DELETE) $(includedir)/freetype/cache/*
|
||||||
-$(DELDIR) $(includedir)/freetype/cache
|
-$(DELDIR) $(includedir)/freetype/cache
|
||||||
-$(DELETE) $(includedir)/freetype/config/*
|
-$(DELETE) $(includedir)/freetype/config/*
|
||||||
-$(DELDIR) $(includedir)/freetype/config
|
-$(DELDIR) $(includedir)/freetype/config
|
||||||
-$(DELETE) $(includedir)/freetype/internal/*
|
-$(DELETE) $(includedir)/freetype/internal/*
|
||||||
-$(DELDIR) $(includedir)/freetype/internal
|
-$(DELDIR) $(includedir)/freetype/internal
|
||||||
-$(DELETE) $(includedir)/freetype/*
|
-$(DELETE) $(includedir)/freetype/*
|
||||||
-$(DELDIR) $(includedir)/freetype
|
-$(DELDIR) $(includedir)/freetype
|
||||||
|
|
||||||
|
|
||||||
# Unix cleaning and distclean rules.
|
# Unix cleaning and distclean rules.
|
||||||
#
|
#
|
||||||
clean_project_unix:
|
clean_project_unix:
|
||||||
-$(DELETE) $(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)
|
-$(DELETE) $(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)
|
||||||
-$(DELETE) $(patsubst %.$O,%.$(SO),$(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)) \
|
-$(DELETE) $(patsubst %.$O,%.$(SO),$(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)) \
|
||||||
$(CLEAN)
|
$(CLEAN)
|
||||||
|
|
||||||
distclean_project_unix: clean_project_unix
|
|
||||||
-$(DELETE) $(PROJECT_LIBRARY)
|
|
||||||
-$(DELETE) $(OBJ_DIR)/.libs/*
|
|
||||||
-$(DELDIR) $(OBJ_DIR)/.libs
|
|
||||||
-$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
|
|
||||||
|
|
||||||
|
|
||||||
|
distclean_project_unix: clean_project_unix
|
||||||
|
-$(DELETE) $(PROJECT_LIBRARY)
|
||||||
|
-$(DELETE) $(OBJ_DIR)/.libs/*
|
||||||
|
-$(DELDIR) $(OBJ_DIR)/.libs
|
||||||
|
-$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
|
||||||
|
|
||||||
# EOF
|
# EOF
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
# template for Unix-specific compiler definitions
|
# template for Unix-specific compiler definitions
|
||||||
#
|
#
|
||||||
|
|
||||||
CC := @CC@
|
CC := @CC@
|
||||||
|
|
||||||
|
LIBTOOL := $(BUILD)/libtool
|
||||||
|
|
||||||
LIBTOOL := $(BUILD)/libtool
|
|
||||||
|
|
||||||
# The object file extension (for standard and static libraries). This can be
|
# The object file extension (for standard and static libraries). This can be
|
||||||
# .o, .tco, .obj, etc., depending on the platform.
|
# .o, .tco, .obj, etc., depending on the platform.
|
||||||
|
@ -11,6 +12,7 @@ LIBTOOL := $(BUILD)/libtool
|
||||||
O := lo
|
O := lo
|
||||||
SO := o
|
SO := o
|
||||||
|
|
||||||
|
|
||||||
# The library file extension (for standard and static libraries). This can
|
# The library file extension (for standard and static libraries). This can
|
||||||
# be .a, .lib, etc., depending on the platform.
|
# be .a, .lib, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
|
@ -31,7 +33,7 @@ I := -I
|
||||||
|
|
||||||
|
|
||||||
# C flag used to define a macro before the compilation of a given source
|
# C flag used to define a macro before the compilation of a given source
|
||||||
# object. Usually is `-D' like in `-DDEBUG'.
|
# object. Usually it is `-D' like in `-DDEBUG'.
|
||||||
#
|
#
|
||||||
D := -D
|
D := -D
|
||||||
|
|
||||||
|
@ -76,3 +78,4 @@ LDFLAGS := @LDFLAGS@
|
||||||
LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
|
LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
|
||||||
-rpath $(libdir) -version-info $(version_info)
|
-rpath $(libdir) -version-info $(version_info)
|
||||||
|
|
||||||
|
# EOF
|
||||||
|
|
|
@ -69,14 +69,14 @@ endif
|
||||||
|
|
||||||
# The directory where all library files are placed.
|
# The directory where all library files are placed.
|
||||||
#
|
#
|
||||||
# By default, this is the same as $(OBJ_DIR), however, this can be changed
|
# By default, this is the same as $(OBJ_DIR); however, this can be changed
|
||||||
# to suit particular needs.
|
# to suit particular needs.
|
||||||
#
|
#
|
||||||
LIB_DIR := $(OBJ_DIR)
|
LIB_DIR := $(OBJ_DIR)
|
||||||
|
|
||||||
|
|
||||||
# the NO_OUTPUT macro is appended to command lines in order to ignore
|
# The NO_OUTPUT macro is appended to command lines in order to ignore
|
||||||
# the output of some programs..
|
# the output of some programs.
|
||||||
#
|
#
|
||||||
NO_OUTPUT := 2> /dev/null
|
NO_OUTPUT := 2> /dev/null
|
||||||
|
|
||||||
|
|
|
@ -31,3 +31,4 @@ endif
|
||||||
|
|
||||||
include $(TOP)/builds/unix/install.mk
|
include $(TOP)/builds/unix/install.mk
|
||||||
|
|
||||||
|
# EOF
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#
|
#
|
||||||
# FreeType 2 configuration rules templates for
|
# FreeType 2 configuration rules templates for
|
||||||
# developement under Unix with no configure (gcc only)
|
# development under Unix with no configure script (gcc only)
|
||||||
#
|
#
|
||||||
|
|
||||||
# Copyright 1996-2000 by
|
# Copyright 1996-2000 by
|
||||||
|
@ -12,16 +12,18 @@
|
||||||
# indicate that you have read the license and understand and accept it
|
# indicate that you have read the license and understand and accept it
|
||||||
# fully.
|
# fully.
|
||||||
|
|
||||||
|
|
||||||
ifndef TOP
|
ifndef TOP
|
||||||
TOP := .
|
TOP := .
|
||||||
endif
|
endif
|
||||||
TOP := $(shell cd $(TOP); pwd)
|
TOP := $(shell cd $(TOP); pwd)
|
||||||
|
|
||||||
DELETE := rm -f
|
DELETE := rm -f
|
||||||
SEP := /
|
SEP := /
|
||||||
HOSTSEP := $(SEP)
|
HOSTSEP := $(SEP)
|
||||||
BUILD := $(TOP)/builds/unix/devel # we use a special devel ftoption.h
|
BUILD := $(TOP)/builds/unix/devel # we use a special devel ftoption.h
|
||||||
PLATFORM := unixdev # do not set it to 'unix', or libtool will trick you
|
PLATFORM := unixdev # do not set it to `unix', or libtool will trick you
|
||||||
|
|
||||||
|
|
||||||
# The directory where all object files are placed.
|
# The directory where all object files are placed.
|
||||||
#
|
#
|
||||||
|
@ -29,17 +31,20 @@ ifndef OBJ_DIR
|
||||||
OBJ_DIR := $(shell cd $(TOP)/obj; pwd)
|
OBJ_DIR := $(shell cd $(TOP)/obj; pwd)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
# library file name
|
# library file name
|
||||||
#
|
#
|
||||||
LIBRARY := lib$(PROJECT)
|
LIBRARY := lib$(PROJECT)
|
||||||
|
|
||||||
|
|
||||||
# The directory where all library files are placed.
|
# The directory where all library files are placed.
|
||||||
#
|
#
|
||||||
# By default, this is the same as $(OBJ_DIR), however, this can be changed
|
# By default, this is the same as $(OBJ_DIR); however, this can be changed
|
||||||
# to suit particular needs.
|
# to suit particular needs.
|
||||||
#
|
#
|
||||||
LIB_DIR := $(OBJ_DIR)
|
LIB_DIR := $(OBJ_DIR)
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
NO_OUTPUT := 2> /dev/null
|
NO_OUTPUT := 2> /dev/null
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
# Configuration rules for Win32 + LCC
|
# Configuration rules for Win32 + LCC
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
SEP := /
|
SEP := /
|
||||||
include $(TOP)/builds/win32/win32-def.mk
|
include $(TOP)/builds/win32/win32-def.mk
|
||||||
include $(TOP)/builds/compiler/win-lcc.mk
|
include $(TOP)/builds/compiler/win-lcc.mk
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# Visual C++ on Win32
|
# Visual C++ on Win32
|
||||||
#
|
#
|
||||||
|
|
||||||
SEP := /
|
SEP := /
|
||||||
|
|
|
@ -12,7 +12,7 @@ PLATFORM := win32
|
||||||
# but certain compilers accept "/" as well
|
# but certain compilers accept "/" as well
|
||||||
#
|
#
|
||||||
ifndef SEP
|
ifndef SEP
|
||||||
SEP := $(HOSTSEP)
|
SEP := $(HOSTSEP)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -32,20 +32,20 @@ endif
|
||||||
|
|
||||||
# The directory where all library files are placed.
|
# The directory where all library files are placed.
|
||||||
#
|
#
|
||||||
# By default, this is the same as $(OBJ_DIR), however, this can be changed
|
# By default, this is the same as $(OBJ_DIR); however, this can be changed
|
||||||
# to suit particular needs.
|
# to suit particular needs.
|
||||||
#
|
#
|
||||||
LIB_DIR := $(OBJ_DIR)
|
LIB_DIR := $(OBJ_DIR)
|
||||||
|
|
||||||
|
|
||||||
# The name of the final library file. Note that the DOS-specific Makefile
|
# The name of the final library file. Note that the DOS-specific Makefile
|
||||||
# uses a shorter (8.3) name.
|
# uses a shorter (8.3) name.
|
||||||
#
|
#
|
||||||
LIBRARY := $(PROJECT)
|
LIBRARY := $(PROJECT)
|
||||||
|
|
||||||
|
|
||||||
# the NO_OUTPUT macro is used to ignore the output of commands
|
# The NO_OUTPUT macro is used to ignore the output of commands.
|
||||||
#
|
#
|
||||||
NO_OUTPUT = 2> nul
|
NO_OUTPUT = 2> nul
|
||||||
|
|
||||||
|
# EOF
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue