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/autohint | |
| 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/autohint')
| -rw-r--r-- | src/autohint/rules.mk | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/src/autohint/rules.mk b/src/autohint/rules.mk index b70fcb58f..ee264e862 100644 --- a/src/autohint/rules.mk +++ b/src/autohint/rules.mk @@ -3,7 +3,7 @@ # -# Copyright 2000, 2001, 2002 Catharon Productions Inc. +# Copyright 2000, 2001, 2002, 2003 Catharon Productions Inc. # Author: David Turner # # This file is part of the Catharon Typography Project and shall only @@ -18,29 +18,28 @@ # AUTO driver directory # -AUTO_DIR := $(SRC_)autohint -AUTO_DIR_ := $(AUTO_DIR)$(SEP) +AUTO_DIR := $(SRC_DIR)/autohint # compilation flags for the driver # -AUTO_COMPILE := $(FT_COMPILE) $I$(AUTO_DIR) +AUTO_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(AUTO_DIR)) # AUTO driver sources (i.e., C files) # -AUTO_DRV_SRC := $(AUTO_DIR_)ahangles.c \ - $(AUTO_DIR_)ahglobal.c \ - $(AUTO_DIR_)ahglyph.c \ - $(AUTO_DIR_)ahhint.c \ - $(AUTO_DIR_)ahmodule.c +AUTO_DRV_SRC := $(AUTO_DIR)/ahangles.c \ + $(AUTO_DIR)/ahglobal.c \ + $(AUTO_DIR)/ahglyph.c \ + $(AUTO_DIR)/ahhint.c \ + $(AUTO_DIR)/ahmodule.c # AUTO driver headers # AUTO_DRV_H := $(AUTO_DRV_SRC:%c=%h) \ - $(AUTO_DIR_)ahloader.h \ - $(AUTO_DIR_)ahtypes.h \ - $(AUTO_DIR_)aherrors.h + $(AUTO_DIR)/ahloader.h \ + $(AUTO_DIR)/ahtypes.h \ + $(AUTO_DIR)/aherrors.h # AUTO driver object(s) @@ -48,25 +47,25 @@ AUTO_DRV_H := $(AUTO_DRV_SRC:%c=%h) \ # AUTO_DRV_OBJ_M is used during `multi' builds. # AUTO_DRV_OBJ_S is used during `single' builds. # -AUTO_DRV_OBJ_M := $(AUTO_DRV_SRC:$(AUTO_DIR_)%.c=$(OBJ_)%.$O) -AUTO_DRV_OBJ_S := $(OBJ_)autohint.$O +AUTO_DRV_OBJ_M := $(AUTO_DRV_SRC:$(AUTO_DIR)/%.c=$(OBJ_DIR)/%.$O) +AUTO_DRV_OBJ_S := $(OBJ_DIR)/autohint.$O # AUTO driver source file for single build # -AUTO_DRV_SRC_S := $(AUTO_DIR_)autohint.c +AUTO_DRV_SRC_S := $(AUTO_DIR)/autohint.c # AUTO driver - single object # $(AUTO_DRV_OBJ_S): $(AUTO_DRV_SRC_S) $(AUTO_DRV_SRC) \ $(FREETYPE_H) $(AUTO_DRV_H) - $(AUTO_COMPILE) $T$@ $(AUTO_DRV_SRC_S) + $(AUTO_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(AUTO_DRV_SRC_S)) # AUTO driver - multiple objects # -$(OBJ_)%.$O: $(AUTO_DIR_)%.c $(FREETYPE_H) $(AUTO_DRV_H) - $(AUTO_COMPILE) $T$@ $< +$(OBJ_DIR)/%.$O: $(AUTO_DIR)/%.c $(FREETYPE_H) $(AUTO_DRV_H) + $(AUTO_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) # update main driver object lists |