[xorg-commit-diffs] xc/extras/freetype2/builds detect.mk, 1.1.4.1,
1.1.4.2 freetype.mk, 1.1.4.1, 1.1.4.2 link_dos.mk, 1.1.4.1,
1.1.4.2 link_std.mk, 1.1.4.1, 1.1.4.2 modules.mk, 1.1.4.1,
1.1.4.2 toplevel.mk, 1.1.4.1, 1.1.4.2
Egbert Eich
xorg-commit at pdx.freedesktop.org
Thu Apr 15 03:14:18 PDT 2004
- Previous message: [xorg-commit-diffs] xc/extras/freetype2 vms_make.com, 1.1,
1.1.2.1 ChangeLog, 1.1.4.1, 1.1.4.2 Jamfile, 1.1.4.1,
1.1.4.2 Jamfile.in, 1.1.4.1, 1.1.4.2 Jamrules, 1.1.4.1,
1.1.4.2 README, 1.1.4.1, 1.1.4.2 configure, 1.1.4.1,
1.1.4.2 .cvsignore, 1.1.1.1.2.1, NONE descrip.mms, 1.1,
NONE install, 1.1, NONE
- Next message: [xorg-commit-diffs] xc/extras/freetype2/builds/ansi ansi-def.mk,
1.1.4.1, 1.1.4.2 ansi.mk, 1.1.4.1, 1.1.4.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: eich
Update of /cvs/xorg/xc/extras/freetype2/builds
In directory pdx:/home/eich/tstbuild/xc/extras/freetype2/builds
Modified Files:
Tag: XORG-CURRENT
detect.mk freetype.mk link_dos.mk link_std.mk modules.mk
toplevel.mk
Log Message:
2004-04-15 Egbert Eich <eich at freedesktop.org>
Merged changes from RELEASE-1 branch
Index: detect.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/detect.mk,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/detect.mk 26 Nov 2003 22:48:21 -0000 1.1.4.1
+++ b/detect.mk 15 Apr 2004 10:14:14 -0000 1.1.4.2
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2001, 2002, 2003 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -16,7 +16,7 @@
# This sub-Makefile is in charge of detecting the current platform. It sets
# the following variables:
#
-# BUILD The configuration and system-specific directory. Usually
+# BUILD_DIR The configuration and system-specific directory. Usually
# `freetype/builds/$(PLATFORM)' but can be different for
# custom builds of the library.
#
@@ -30,6 +30,7 @@
# DELETE The shell command used to remove a given file.
# COPY The shell command used to copy one file.
# SEP The platform-specific directory separator.
+# COMPILER_SEP The separator used in arguments of the compilation tools.
# CC The compiler to use.
#
# You need to set the following variable(s) before calling it:
@@ -44,17 +45,17 @@
endif
# Set auto-detection default to `ansi' resp. UNIX-like operating systems.
-# Note that we delay evaluation of $(BUILD_CONFIG_), $(BUILD), and
-# $(CONFIG_RULES).
#
-PLATFORM := ansi
-DELETE := $(RM)
-COPY := cp
-SEP := /
+PLATFORM := ansi
+DELETE := $(RM)
+COPY := cp
+SEP := /
-BUILD_CONFIG_ = $(TOP_DIR)$(SEP)builds$(SEP)
-BUILD = $(BUILD_CONFIG_)$(PLATFORM)
-CONFIG_RULES = $(BUILD)$(SEP)$(CONFIG_FILE)
+BUILD_CONFIG := $(TOP_DIR)/builds
+
+# These two assignments must be delayed.
+BUILD_DIR = $(BUILD_CONFIG)/$(PLATFORM)
+CONFIG_RULES = $(BUILD_DIR)/$(CONFIG_FILE)
# We define the BACKSLASH variable to hold a single back-slash character.
# This is needed because a line like
@@ -72,12 +73,12 @@
# Find all auto-detectable platforms.
#
-PLATFORMS_ := $(notdir $(subst /detect.mk,,$(wildcard $(BUILD_CONFIG_)*/detect.mk)))
-.PHONY: $(PLATFORMS_) ansi
+PLATFORMS := $(notdir $(subst /detect.mk,,$(wildcard $(BUILD_CONFIG)/*/detect.mk)))
+.PHONY: $(PLATFORMS) ansi
# Filter out platform specified as setup target.
#
-PLATFORM := $(firstword $(filter $(MAKECMDGOALS),$(PLATFORMS_)))
+PLATFORM := $(firstword $(filter $(MAKECMDGOALS),$(PLATFORMS)))
# If no setup target platform was specified, enable auto-detection/
# default platform.
@@ -94,7 +95,7 @@
# directories. Note that the calling order of the various `detect.mk'
# files isn't predictable.
#
- include $(wildcard $(BUILD_CONFIG_)*/detect.mk)
+ include $(wildcard $(BUILD_CONFIG)/*/detect.mk)
endif
# In case no detection rule file was successful, use the default.
@@ -121,13 +122,14 @@
@echo ""
@echo " platform $(PLATFORM)"
@echo " compiler $(CC)"
- @echo " configuration directory $(BUILD)"
+ @echo " configuration directory $(BUILD_DIR)"
@echo " configuration rules $(CONFIG_RULES)"
@echo ""
@echo "If this does not correspond to your system or settings please remove the file"
@echo "\`$(CONFIG_MK)' from this directory then read the INSTALL file for help."
@echo ""
- @echo "Otherwise, simply type \`$(MAKE)' again to build the library."
+ @echo "Otherwise, simply type \`$(MAKE)' again to build the library,"
+ @echo "or \`$(MAKE) refdoc' to build the API reference (the latter needs python)."
@echo ""
@$(COPY) $(CONFIG_RULES) $(CONFIG_MK)
@@ -142,14 +144,16 @@
@type builds\newline
@echo platformÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ$(PLATFORM)
@echo compilerÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ$(CC)
- @echo configuration directoryÿÿÿÿÿÿ$(BUILD)
- @echo configuration rulesÿÿÿÿÿÿÿÿÿÿ$(CONFIG_RULES)
+ @echo configuration directoryÿÿÿÿÿÿ$(subst /,\,$(BUILD_DIR))
+ @echo configuration rulesÿÿÿÿÿÿÿÿÿÿ$(subst /,\,$(CONFIG_RULES))
@type builds\newline
@echo If this does not correspond to your system or settings please remove the file
@echo '$(CONFIG_MK)' from this directory then read the INSTALL file for help.
@type builds\newline
@echo Otherwise, simply type 'make' again to build the library.
+ @echo or 'make refdoc' to build the API reference (the latter needs python).
@type builds\newline
@$(COPY) $(subst /,\,$(CONFIG_RULES) $(CONFIG_MK)) > nul
+
# EOF
Index: freetype.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/freetype.mk,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/freetype.mk 26 Nov 2003 22:48:21 -0000 1.1.4.1
+++ b/freetype.mk 15 Apr 2004 10:14:14 -0000 1.1.4.2
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2000, 2002 by
+# Copyright 1996-2000, 2001, 2002, 2003 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -20,13 +20,15 @@
# The following variables (set by other Makefile components, in the
# environment, or on the command line) are used:
#
-# BUILD The architecture dependent directory,
+# BUILD_DIR The architecture dependent directory,
# e.g. `$(TOP_DIR)/builds/unix'.
#
# OBJ_DIR The directory in which object files are created.
#
# LIB_DIR The directory in which the library is created.
#
+# DOC_DIR The directory in which the API reference is created.
+#
# INCLUDES A list of directories to be included additionally.
# Usually empty.
#
@@ -63,6 +65,7 @@
# `distclean' target.
#
# TOP_DIR, SEP,
+# COMPILER_SEP,
# LIBRARY, CC,
# A, I, O, T Check `config.mk' for details.
@@ -70,7 +73,7 @@
# The targets `objects' and `library' are defined at the end of this
# Makefile after all other rules have been included.
#
-.PHONY: single multi objects library
+.PHONY: single multi objects library refdoc
# default target -- build single objects and library
#
@@ -83,43 +86,30 @@
# The FreeType source directory, usually `./src'.
#
-SRC := $(TOP_DIR)$(SEP)src
-
+SRC_DIR := $(TOP_DIR)/src
# The directory where the base layer components are placed, usually
# `./src/base'.
#
-BASE_DIR := $(SRC)$(SEP)base
+BASE_DIR := $(SRC_DIR)/base
-# The build header file used to define all public header file names
-# as macro.
+# Other derived directories.
#
-ifndef FT_BUILD_H
- FT_BUILD_H := $(TOP_DIR)$(SEP)include$(SEP)ft2build.h
- FTBUILD_CMD :=
-else
- FTBUILD_CMD = $(D)FT_BUILD_H=$(FT_BUILD_H)
-endif
+PUBLIC_DIR := $(TOP_DIR)/include/freetype
+INTERNAL_DIR := $(PUBLIC_DIR)/internal
+SERVICES_DIR := $(INTERNAL_DIR)/services
+CONFIG_DIR := $(PUBLIC_DIR)/config
+CACHE_DIR := $(PUBLIC_DIR)/cache
-# 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_DIR).
-#
+# The documentation directory.
#
-SRC_ := $(SRC)$(SEP)
-BASE_ := $(BASE_DIR)$(SEP)
-OBJ_ := $(OBJ_DIR)$(SEP)
-LIB_ := $(LIB_DIR)$(SEP)
-PUBLIC_ := $(TOP_DIR)$(SEP)include$(SEP)freetype$(SEP)
-INTERNAL_ := $(PUBLIC_)internal$(SEP)
-CONFIG_ := $(PUBLIC_)config$(SEP)
-CACHE_ := $(PUBLIC_)cache$(SEP)
-
+ifndef DOC_DIR
+ DOC_DIR := $(TOP_DIR)/docs/reference
+endif
# The final name of the library file.
#
-PROJECT_LIBRARY := $(LIB_)$(LIBRARY).$A
+PROJECT_LIBRARY := $(LIB_DIR)/$(LIBRARY).$A
# include paths
@@ -130,7 +120,8 @@
# in the `freetype/builds/<system>' directory, as these
# files will override the default sources.
#
-INCLUDES := $(OBJ_DIR) $(BUILD) $(TOP_DIR)$(SEP)include
+INCLUDES := $(subst /,$(COMPILER_SEP),$(OBJ_DIR) $(BUILD_DIR) \
+ $(TOP_DIR)/include)
INCLUDE_FLAGS = $(INCLUDES:%=$I%)
@@ -164,46 +155,48 @@
# This is used to simplify the dependency rules -- if one of these files
# changes, the whole library is recompiled.
#
-PUBLIC_H := $(wildcard $(PUBLIC_)*.h)
-BASE_H := $(wildcard $(INTERNAL_)*.h)
-CONFIG_H := $(wildcard $(CONFIG_)*.h) \
- $(wildcard $(BUILD)$(SEP)freetype$(SEP)config$(SEP)*.h)
-CACHE_H := $(wildcard $(CACHE_)*.h)
+PUBLIC_H := $(wildcard $(PUBLIC_DIR)/*.h)
+BASE_H := $(wildcard $(INTERNAL_DIR)/*.h) \
+ $(wildcard $(SERVICES_DIR)/*.h)
+CONFIG_H := $(wildcard $(CONFIG_DIR)/*.h) \
+ $(wildcard $(BUILD_DIR)/freetype/config/*.h)
+CACHE_H := $(wildcard $(CACHE_DIR)/*.h)
+DEVEL_H := $(wildcard $(TOP_DIR)/devel/*.h)
-FREETYPE_H := $(PUBLIC_H) $(BASE_H) $(CONFIG_H) $(CACHE_H)
+FREETYPE_H := $(PUBLIC_H) $(BASE_H) $(CONFIG_H) $(CACHE_H) $(DEVEL_H)
# ftsystem component
#
ifndef FTSYS_SRC
- FTSYS_SRC = $(BASE_)ftsystem.c
+ FTSYS_SRC = $(BASE_DIR)/ftsystem.c
endif
-FTSYS_OBJ = $(OBJ_)ftsystem.$O
+FTSYS_OBJ = $(OBJ_DIR)/ftsystem.$O
OBJECTS_LIST += $(FTSYS_OBJ)
$(FTSYS_OBJ): $(FTSYS_SRC) $(FREETYPE_H)
- $(FT_COMPILE) $T$@ $<
+ $(FT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
# ftdebug component
#
ifndef FTDEBUG_SRC
- FTDEBUG_SRC = $(BASE_)ftdebug.c
+ FTDEBUG_SRC = $(BASE_DIR)/ftdebug.c
endif
-FTDEBUG_OBJ = $(OBJ_)ftdebug.$O
+FTDEBUG_OBJ = $(OBJ_DIR)/ftdebug.$O
OBJECTS_LIST += $(FTDEBUG_OBJ)
$(FTDEBUG_OBJ): $(FTDEBUG_SRC) $(FREETYPE_H)
- $(FT_COMPILE) $T$@ $<
+ $(FT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
# Include all rule files from FreeType components.
#
-include $(wildcard $(SRC)/*/rules.mk)
+include $(wildcard $(SRC_DIR)/*/rules.mk)
# ftinit component
@@ -217,13 +210,13 @@
# which contain additional include paths and macros used to compile the
# single `ftinit.c' source.
#
-FTINIT_SRC := $(BASE_)ftinit.c
-FTINIT_OBJ := $(OBJ_)ftinit.$O
+FTINIT_SRC := $(BASE_DIR)/ftinit.c
+FTINIT_OBJ := $(OBJ_DIR)/ftinit.$O
OBJECTS_LIST += $(FTINIT_OBJ)
$(FTINIT_OBJ): $(FTINIT_SRC) $(FREETYPE_H) $(FT_MODULE_LIST)
- $(FT_COMPILE) $T$@ $<
+ $(FT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
# All FreeType library objects
@@ -255,7 +248,17 @@
library: $(PROJECT_LIBRARY)
.c.$O:
- $(FT_COMPILE) $T$@ $<
+ $(FT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
+
+
+refdoc:
+ python $(SRC_DIR)/tools/docmaker/docmaker.py \
+ --prefix=ft2 \
+ --title=FreeType-2.1.7 \
+ --output=$(DOC_DIR) \
+ $(PUBLIC_DIR)/*.h \
+ $(PUBLIC_DIR)/config/*.h \
+ $(PUBLIC_DIR)/cache/*.h
.PHONY: clean_project_std distclean_project_std
@@ -280,10 +283,10 @@
# working correctly on Win9x.
#
clean_project_dos:
- -$(DELETE) $(subst $(SEP),$(HOSTSEP),$(OBJ_))*.$O $(CLEAN) $(NO_OUTPUT)
+ -$(DELETE) $(subst /,\,$(OBJ)/*.$O $(CLEAN) $(NO_OUTPUT))
distclean_project_dos: clean_project_dos
- -$(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY)) $(DISTCLEAN) $(NO_OUTPUT)
+ -$(DELETE) $(subst /,\,$(PROJECT_LIBRARY) $(DISTCLEAN) $(NO_OUTPUT))
.PHONY: remove_config_mk
@@ -291,7 +294,7 @@
# Remove configuration file (used for distclean).
#
remove_config_mk:
- -$(DELETE) $(subst $(SEP),$(HOSTSEP),$(CONFIG_MK)) $(NO_OUTPUT)
+ -$(DELETE) $(subst /,$(SEP),$(CONFIG_MK) $(NO_OUTPUT))
.PHONY: clean distclean
@@ -303,5 +306,7 @@
#
clean: clean_project
distclean: distclean_project remove_config_mk
+ -$(DELETE) $(subst /,$(SEP),$(DOC_DIR)/*.html $(NO_OUTPUT))
+
# EOF
Index: link_dos.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/link_dos.mk,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/link_dos.mk 26 Nov 2003 22:48:21 -0000 1.1.4.1
+++ b/link_dos.mk 15 Apr 2004 10:14:14 -0000 1.1.4.2
@@ -38,4 +38,5 @@
endif
+
# EOF
Index: link_std.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/link_std.mk,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/link_std.mk 26 Nov 2003 22:48:21 -0000 1.1.4.1
+++ b/link_std.mk 15 Apr 2004 10:14:14 -0000 1.1.4.2
@@ -38,4 +38,5 @@
endif
+
# EOF
Index: modules.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/modules.mk,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/modules.mk 26 Nov 2003 22:48:21 -0000 1.1.4.1
+++ b/modules.mk 15 Apr 2004 10:14:14 -0000 1.1.4.2
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2003 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -26,7 +26,7 @@
# resides. For now, it is in `include/freetype/config/ftmodule.h'.
#
ifndef MODULE_LIST
- MODULE_LIST := $(TOP_DIR)$(SEP)include$(SEP)$(PROJECT)$(SEP)config$(SEP)ftmodule.h
+ MODULE_LIST := $(TOP_DIR)/include/$(PROJECT)/config/ftmodule.h
endif
# To build the modules list, we invoke the `make_module_list' target.
@@ -39,8 +39,8 @@
ifneq ($(findstring $(PLATFORM),dos win32 win16 os2),)
OPEN_MODULE := @echo$(space)
- CLOSE_MODULE := >> $(subst $(SEP),$(HOSTSEP),$(MODULE_LIST))
- REMOVE_MODULE := @-$(DELETE) $(subst $(SEP),$(HOSTSEP),$(MODULE_LIST))
+ CLOSE_MODULE := >> $(subst /,\,$(MODULE_LIST))
+ REMOVE_MODULE := @-$(DELETE) $(subst /,\,$(MODULE_LIST))
else
OPEN_MODULE := @echo "
CLOSE_MODULE := " >> $(MODULE_LIST)
@@ -53,7 +53,7 @@
#
clean_module_list:
$(REMOVE_MODULE)
- @-echo Regenerating the modules list in $(MODULE_LIST)...
+ @-echo Regenerating modules list in $(MODULE_LIST)...
make_module_list: clean_module_list
@echo done.
@@ -73,4 +73,5 @@
#
include $(wildcard $(TOP_DIR)/src/*/module.mk)
+
# EOF
Index: toplevel.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/builds/toplevel.mk,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/toplevel.mk 26 Nov 2003 22:48:21 -0000 1.1.4.1
+++ b/toplevel.mk 15 Apr 2004 10:14:14 -0000 1.1.4.2
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2001, 2003 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -99,7 +99,9 @@
#
# note: This test is duplicated in "builds/toplevel.mk".
#
- is_unix := $(strip $(wildcard /sbin/init) $(wildcard /usr/sbin/init) $(wildcard /hurd/auth))
+ is_unix := $(strip $(wildcard /sbin/init) \
+ $(wildcard /usr/sbin/init) \
+ $(wildcard /hurd/auth))
ifneq ($(is_unix),)
distclean:
@@ -108,6 +110,7 @@
$(RM) builds/unix/config.status
$(RM) builds/unix/unix-def.mk
$(RM) builds/unix/unix-cc.mk
+ $(RM) builds/unix/freetype2.pc
$(RM) nul
endif # test is_unix
@@ -132,4 +135,5 @@
endif # test check_platform
+
# EOF
- Previous message: [xorg-commit-diffs] xc/extras/freetype2 vms_make.com, 1.1,
1.1.2.1 ChangeLog, 1.1.4.1, 1.1.4.2 Jamfile, 1.1.4.1,
1.1.4.2 Jamfile.in, 1.1.4.1, 1.1.4.2 Jamrules, 1.1.4.1,
1.1.4.2 README, 1.1.4.1, 1.1.4.2 configure, 1.1.4.1,
1.1.4.2 .cvsignore, 1.1.1.1.2.1, NONE descrip.mms, 1.1,
NONE install, 1.1, NONE
- Next message: [xorg-commit-diffs] xc/extras/freetype2/builds/ansi ansi-def.mk,
1.1.4.1, 1.1.4.2 ansi.mk, 1.1.4.1, 1.1.4.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the xorg-commit-diffs
mailing list