ref: 2561b245372a026db8a70ad572e5b7f7f02e29af
parent: 787183ea64082d6eb9173840119975b105fe670b
author: David Turner <[email protected]>
date: Thu May 11 14:47:39 EDT 2000
I knew the first CVS commit wouldn't be good :o) Here, the build system seems to be cured now.. (I'll need to try it on Unix too though..)
--- a/src/base/rules.mk
+++ b/src/base/rules.mk
@@ -25,7 +25,7 @@
# in `freetype/lib/base' which are not compiled within the
# base layer proper.
-INCLUDES += $(SRC_)base
+BASE_COMPILE := $(FT_COMPILE) $I$(SRC_)base
# Base layer sources
#
@@ -89,12 +89,12 @@
# Multiple objects build + extensions
#
$(OBJ_)ft%.$O: $(BASE_)ft%.c $(PUBLIC_H) $(BASE_H)
- $(FT_COMPILE) $T$@ $<
+ $(BASE_COMPILE) $T$@ $<
# Base layer - single object build
#
$(BASE_OBJ_S): $(PUBLIC_H) $(BASE_H) $(BASE_SRC_S) $(BASE_SRC)
- $(FT_COMPILE) $T$@ $(BASE_SRC_S)
+ $(BASE_COMPILE) $T$@ $(BASE_SRC_S)
# EOF
--- a/src/psnames/rules.mk
+++ b/src/psnames/rules.mk
@@ -16,8 +16,6 @@
ifndef PSNAMES_INCLUDE
PSNAMES_INCLUDED := 1
- include $(SRC_)shared/rules.mk
-
# PSNAMES driver directory
#
PSNAMES_DIR := $(SRC_)psnames
@@ -41,7 +39,7 @@
# driver headers
#
- PSNAMES_DRV_H := $(SHARED_H) \
+ PSNAMES_DRV_H := $(BASE_H) \
$(PSNAMES_DIR_)psdriver.h \
$(PSNAMES_DIR_)pstables.h
--- a/src/sfnt/rules.mk
+++ b/src/sfnt/rules.mk
@@ -16,8 +16,6 @@
ifndef SFNT_INCLUDE
SFNT_INCLUDED := 1
- include $(SRC_)shared/rules.mk
-
# SFNT driver directory
#
SFNT_DIR := $(SRC_)sfnt
@@ -45,7 +43,7 @@
# driver headers
#
- SFNT_DRV_H := $(SHARED_H) \
+ SFNT_DRV_H := $(BASE_H) \
$(SFNT_DIR_)ttload.h \
$(SFNT_DIR_)ttsbit.h \
$(SFNT_DIR_)ttcmap.h \