diff options
| author | Werner Lemberg <wl@gnu.org> | 2003-06-09 04:46:30 +0000 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2003-06-09 04:46:30 +0000 |
| commit | 858f310b80da8655ba0d30a9551e8fbcc3de4818 (patch) | |
| tree | d1b39ba4c9096f0e0f6980a1bc4a020a06fb92a7 /src/cff/rules.mk | |
| parent | e0805659bb6548b4f3098ec28fe91c4ab4696f7b (diff) | |
| download | freetype2-858f310b80da8655ba0d30a9551e8fbcc3de4818.tar.gz | |
Completely revised FreeType's make management.
. In all makefiles `/' is used as the path separator. The
conversion to the real path separators is done as late as
possible using $(subst ...).
. $(HOSTSEP) no longer exists. Now, $(SEP) gives the path separator
for the operating system, and the new $(COMPILER_SEP) the path
separator for the compiler tools.
. $(BUILD) has been renamed to $(BUILD_DIR). In general, all
directory variables end with `_DIR'. The variants ending in `_'
(like `BASE_' have been removed).
The following ChangeLog entries only describe changes which are
not related to the redesign.
* builds/beos/beos-def.mk (BUILD_DIR): Fix typo.
* builds/compiler/watcom.mk (LINK_LIBRARY): Fix linker call to avoid
overlong arguments as suggested by J. Ali Harlow
<ali@avrc.city.ac.uk>.
* builds/dos/dos-wat.mk: New file.
* builds/freetype.mk (FREETYPE_H): Include header files from the
`devel' subdirectory.
* builds/os2/os2-dev.mk, builds/unix/unixddef.mk,
builds/unix/unixddef.mk, builds/win32/w32-bccd.mk,
builds/win32/w32-dev.mk (BUILD_DIR): Fix path.
* builds/unix/configure.ac, builds/unic/configure: Updated.
* builds/unix/unix-def.in (DISTCLEAN): Add `freetype2.pc'.
* devel/ftoption.h: Updated.
Diffstat (limited to 'src/cff/rules.mk')
| -rw-r--r-- | src/cff/rules.mk | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/cff/rules.mk b/src/cff/rules.mk index b53fdd83a..579f144e0 100644 --- a/src/cff/rules.mk +++ b/src/cff/rules.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2001 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, @@ -15,27 +15,26 @@ # OpenType driver directory # -CFF_DIR := $(SRC_)cff -CFF_DIR_ := $(CFF_DIR)$(SEP) +CFF_DIR := $(SRC_DIR)/cff -CFF_COMPILE := $(FT_COMPILE) $I$(CFF_DIR) +CFF_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(CFF_DIR)) # CFF driver sources (i.e., C files) # -CFF_DRV_SRC := $(CFF_DIR_)cffobjs.c \ - $(CFF_DIR_)cffload.c \ - $(CFF_DIR_)cffgload.c \ - $(CFF_DIR_)cffparse.c \ - $(CFF_DIR_)cffcmap.c \ - $(CFF_DIR_)cffdrivr.c +CFF_DRV_SRC := $(CFF_DIR)/cffobjs.c \ + $(CFF_DIR)/cffload.c \ + $(CFF_DIR)/cffgload.c \ + $(CFF_DIR)/cffparse.c \ + $(CFF_DIR)/cffcmap.c \ + $(CFF_DIR)/cffdrivr.c # CFF driver headers # CFF_DRV_H := $(CFF_DRV_SRC:%.c=%.h) \ - $(CFF_DIR_)cfftoken.h \ - $(CFF_DIR_)cfferrs.h + $(CFF_DIR)/cfftoken.h \ + $(CFF_DIR)/cfferrs.h # CFF driver object(s) @@ -43,24 +42,24 @@ CFF_DRV_H := $(CFF_DRV_SRC:%.c=%.h) \ # CFF_DRV_OBJ_M is used during `multi' builds # CFF_DRV_OBJ_S is used during `single' builds # -CFF_DRV_OBJ_M := $(CFF_DRV_SRC:$(CFF_DIR_)%.c=$(OBJ_)%.$O) -CFF_DRV_OBJ_S := $(OBJ_)cff.$O +CFF_DRV_OBJ_M := $(CFF_DRV_SRC:$(CFF_DIR)/%.c=$(OBJ_DIR)/%.$O) +CFF_DRV_OBJ_S := $(OBJ_DIR)/cff.$O # CFF driver source file for single build # -CFF_DRV_SRC_S := $(CFF_DIR_)cff.c +CFF_DRV_SRC_S := $(CFF_DIR)/cff.c # CFF driver - single object # $(CFF_DRV_OBJ_S): $(CFF_DRV_SRC_S) $(CFF_DRV_SRC) $(FREETYPE_H) $(CFF_DRV_H) - $(CFF_COMPILE) $T$@ $(CFF_DRV_SRC_S) + $(CFF_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(CFF_DRV_SRC_S)) # CFF driver - multiple objects # -$(OBJ_)%.$O: $(CFF_DIR_)%.c $(FREETYPE_H) $(CFF_DRV_H) - $(CFF_COMPILE) $T$@ $< +$(OBJ_DIR)/%.$O: $(CFF_DIR)/%.c $(FREETYPE_H) $(CFF_DRV_H) + $(CFF_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) # update main driver object lists @@ -68,4 +67,5 @@ $(OBJ_)%.$O: $(CFF_DIR_)%.c $(FREETYPE_H) $(CFF_DRV_H) DRV_OBJS_S += $(CFF_DRV_OBJ_S) DRV_OBJS_M += $(CFF_DRV_OBJ_M) + # EOF |