* builds/freetype.mk (BASE_H): Rename to...
(INTERNAL_H): This. (FREETYPE_H): Updated. * src/base/rules.mk: (BASE_OBJ_S, OBJ_DIR/%.$O): Add BASE_H. * src/bdf/rules.mk (BDF_DRV_H): Add bdferror.h. * src/cache/rules.mk (CACHE_DRV_H): Add ftccache.h and ftcsbits.h. * src/pcf/rules.mk (PCF_DRV_H): Add pcfread.h. * src/raster/rules.mk (RASTER_DRV_H): Add ftmisc.h. * src/type42/rules.mk (T42_DRV_H): Add t42types.h.
This commit is contained in:
Werner Lemberg
parent
cff15b07f3
commit
89a1a51834
12
ChangeLog
12
ChangeLog
@ -1,3 +1,15 @@
|
||||
2008-10-02 Werner Lemberg <wl@gnu.org>
|
||||
|
||||
* builds/freetype.mk (BASE_H): Rename to...
|
||||
(INTERNAL_H): This.
|
||||
(FREETYPE_H): Updated.
|
||||
* src/base/rules.mk: (BASE_OBJ_S, OBJ_DIR/%.$O): Add BASE_H.
|
||||
* src/bdf/rules.mk (BDF_DRV_H): Add bdferror.h.
|
||||
* src/cache/rules.mk (CACHE_DRV_H): Add ftccache.h and ftcsbits.h.
|
||||
* src/pcf/rules.mk (PCF_DRV_H): Add pcfread.h.
|
||||
* src/raster/rules.mk (RASTER_DRV_H): Add ftmisc.h.
|
||||
* src/type42/rules.mk (T42_DRV_H): Add t42types.h.
|
||||
|
||||
2008-10-02 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
||||
|
||||
* src/base/ftbase.h: New file to declare the private utility
|
||||
|
||||
@ -168,14 +168,14 @@ OBJECTS_LIST :=
|
||||
|
||||
|
||||
# Define $(PUBLIC_H) as the list of all public header files located in
|
||||
# `$(TOP_DIR)/include/freetype'. $(BASE_H), and $(CONFIG_H) are defined
|
||||
# `$(TOP_DIR)/include/freetype'. $(INTERNAL_H), and $(CONFIG_H) are defined
|
||||
# similarly.
|
||||
#
|
||||
# This is used to simplify the dependency rules -- if one of these files
|
||||
# changes, the whole library is recompiled.
|
||||
#
|
||||
PUBLIC_H := $(wildcard $(PUBLIC_DIR)/*.h)
|
||||
BASE_H := $(wildcard $(INTERNAL_DIR)/*.h) \
|
||||
INTERNAL_H := $(wildcard $(INTERNAL_DIR)/*.h) \
|
||||
$(wildcard $(SERVICES_DIR)/*.h)
|
||||
CONFIG_H := $(wildcard $(CONFIG_DIR)/*.h) \
|
||||
$(wildcard $(BUILD_DIR)/freetype/config/*.h) \
|
||||
@ -183,7 +183,7 @@ CONFIG_H := $(wildcard $(CONFIG_DIR)/*.h) \
|
||||
$(FTOPTION_H)
|
||||
DEVEL_H := $(wildcard $(TOP_DIR)/devel/*.h)
|
||||
|
||||
FREETYPE_H := $(PUBLIC_H) $(BASE_H) $(CONFIG_H) $(DEVEL_H)
|
||||
FREETYPE_H := $(PUBLIC_H) $(INTERNAL_H) $(CONFIG_H) $(DEVEL_H)
|
||||
|
||||
|
||||
# ftsystem component
|
||||
|
||||
@ -21,8 +21,6 @@
|
||||
# BASE_EXT_OBJ: A list of base layer extensions, i.e., components found
|
||||
# in `freetype/src/base' which are not compiled within the
|
||||
# base layer proper.
|
||||
#
|
||||
# BASE_H is defined in freetype.mk to simplify the dependency rules.
|
||||
|
||||
|
||||
BASE_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(SRC_DIR)/base)
|
||||
@ -84,13 +82,13 @@ BASE_SRC_S := $(BASE_DIR)/ftbase.c
|
||||
|
||||
# Base layer - single object build
|
||||
#
|
||||
$(BASE_OBJ_S): $(BASE_SRC_S) $(BASE_SRC) $(FREETYPE_H)
|
||||
$(BASE_OBJ_S): $(BASE_SRC_S) $(BASE_SRC) $(FREETYPE_H) $(BASE_H)
|
||||
$(BASE_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(BASE_SRC_S))
|
||||
|
||||
|
||||
# Multiple objects build + extensions
|
||||
#
|
||||
$(OBJ_DIR)/%.$O: $(BASE_DIR)/%.c $(FREETYPE_H)
|
||||
$(OBJ_DIR)/%.$O: $(BASE_DIR)/%.c $(FREETYPE_H) $(BASE_H)
|
||||
$(BASE_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
|
||||
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
#
|
||||
|
||||
|
||||
# Copyright (C) 2001, 2002, 2003 by
|
||||
# Copyright (C) 2001, 2002, 2003, 2008 by
|
||||
# Francesco Zappa Nardelli
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
@ -29,7 +29,7 @@
|
||||
|
||||
# bdf driver directory
|
||||
#
|
||||
BDF_DIR := $(SRC_DIR)/bdf
|
||||
BDF_DIR := $(SRC_DIR)/bdf
|
||||
|
||||
|
||||
BDF_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(BDF_DIR))
|
||||
@ -44,7 +44,8 @@ BDF_DRV_SRC := $(BDF_DIR)/bdflib.c \
|
||||
# bdf driver headers
|
||||
#
|
||||
BDF_DRV_H := $(BDF_DIR)/bdf.h \
|
||||
$(BDF_DIR)/bdfdrivr.h
|
||||
$(BDF_DIR)/bdfdrivr.h \
|
||||
$(BDF_DIR)/bdferror.h
|
||||
|
||||
# bdf driver object(s)
|
||||
#
|
||||
|
||||
10
src/cache/rules.mk
vendored
10
src/cache/rules.mk
vendored
@ -3,7 +3,7 @@
|
||||
#
|
||||
|
||||
|
||||
# Copyright 2000, 2001, 2003, 2004, 2006 by
|
||||
# Copyright 2000, 2001, 2003, 2004, 2006, 2008 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 @@ CACHE_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(CACHE_DIR))
|
||||
#
|
||||
CACHE_DRV_SRC := $(CACHE_DIR)/ftcbasic.c \
|
||||
$(CACHE_DIR)/ftccache.c \
|
||||
$(CACHE_DIR)/ftccmap.c \
|
||||
$(CACHE_DIR)/ftccmap.c \
|
||||
$(CACHE_DIR)/ftcglyph.c \
|
||||
$(CACHE_DIR)/ftcimage.c \
|
||||
$(CACHE_DIR)/ftcmanag.c \
|
||||
@ -35,12 +35,14 @@ CACHE_DRV_SRC := $(CACHE_DIR)/ftcbasic.c \
|
||||
|
||||
# Cache driver headers
|
||||
#
|
||||
CACHE_DRV_H := $(CACHE_DIR)/ftccback.h \
|
||||
CACHE_DRV_H := $(CACHE_DIR)/ftccache.h \
|
||||
$(CACHE_DIR)/ftccback.h \
|
||||
$(CACHE_DIR)/ftcerror.h \
|
||||
$(CACHE_DIR)/ftcglyph.h \
|
||||
$(CACHE_DIR)/ftcimage.h \
|
||||
$(CACHE_DIR)/ftcmanag.h \
|
||||
$(CACHE_DIR)/ftcmru.h
|
||||
$(CACHE_DIR)/ftcmru.h \
|
||||
$(CACHE_DIR)/ftcsbits.h
|
||||
|
||||
|
||||
# Cache driver object(s)
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
#
|
||||
|
||||
|
||||
# Copyright (C) 2000, 2001, 2003 by
|
||||
# Copyright (C) 2000, 2001, 2003, 2008 by
|
||||
# Francesco Zappa Nardelli
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
@ -35,15 +35,14 @@ PCF_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(PCF_DIR))
|
||||
|
||||
# pcf driver sources (i.e., C files)
|
||||
#
|
||||
PCF_DRV_SRC := $(PCF_DIR)/pcfread.c \
|
||||
$(PCF_DIR)/pcfdrivr.c \
|
||||
PCF_DRV_SRC := $(PCF_DIR)/pcfdrivr.c \
|
||||
$(PCF_DIR)/pcfread.c \
|
||||
$(PCF_DIR)/pcfutil.c
|
||||
|
||||
# pcf driver headers
|
||||
#
|
||||
PCF_DRV_H := $(PCF_DIR)/pcf.h \
|
||||
$(PCF_DIR)/pcfdrivr.h \
|
||||
$(PCF_DIR)/pcfutil.h \
|
||||
PCF_DRV_H := $(PCF_DRV_SRC:%.c=%.h) \
|
||||
$(PCF_DIR)/pcf.h \
|
||||
$(PCF_DIR)/pcferror.h
|
||||
|
||||
# pcf driver object(s)
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
#
|
||||
|
||||
|
||||
# Copyright 1996-2000, 2001, 2003 by
|
||||
# Copyright 1996-2000, 2001, 2003, 2008 by
|
||||
# David Turner, Robert Wilhelm, and Werner Lemberg.
|
||||
#
|
||||
# This file is part of the FreeType project, and may only be used, modified,
|
||||
@ -31,6 +31,7 @@ RASTER_DRV_SRC := $(RASTER_DIR)/ftraster.c \
|
||||
# raster driver headers
|
||||
#
|
||||
RASTER_DRV_H := $(RASTER_DRV_SRC:%.c=%.h) \
|
||||
$(RASTER_DIR)/ftmisc.h \
|
||||
$(RASTER_DIR)/rasterrs.h
|
||||
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
#
|
||||
|
||||
|
||||
# Copyright 2002, 2003 by
|
||||
# Copyright 2002, 2003, 2008 by
|
||||
# David Turner, Robert Wilhelm, and Werner Lemberg.
|
||||
#
|
||||
# This file is part of the FreeType project, and may only be used, modified,
|
||||
@ -32,7 +32,8 @@ T42_DRV_SRC := $(T42_DIR)/t42objs.c \
|
||||
# Type42 driver headers
|
||||
#
|
||||
T42_DRV_H := $(T42_DRV_SRC:%.c=%.h) \
|
||||
$(T42_DIR)/t42error.h
|
||||
$(T42_DIR)/t42error.h \
|
||||
$(T42_DIR)/t42types.h
|
||||
|
||||
|
||||
# Type42 driver object(s)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user