Commit 2561b245372a026db8a70ad572e5b7f7f02e29af
2000-05-11T18:47:39
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..)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72
diff --git a/src/base/rules.mk b/src/base/rules.mk
index 7ea7488..dd0f1a6 100644
--- 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 @@ BASE_SRC_S := $(BASE_)ftbase.c
# 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
diff --git a/src/psnames/rules.mk b/src/psnames/rules.mk
index 25a1f19..a97797b 100644
--- 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 @@ ifndef PSNAMES_INCLUDE
# driver headers
#
- PSNAMES_DRV_H := $(SHARED_H) \
+ PSNAMES_DRV_H := $(BASE_H) \
$(PSNAMES_DIR_)psdriver.h \
$(PSNAMES_DIR_)pstables.h
diff --git a/src/sfnt/rules.mk b/src/sfnt/rules.mk
index e67e4ff..31f7a8d 100644
--- 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 @@ ifndef SFNT_INCLUDE
# driver headers
#
- SFNT_DRV_H := $(SHARED_H) \
+ SFNT_DRV_H := $(BASE_H) \
$(SFNT_DIR_)ttload.h \
$(SFNT_DIR_)ttsbit.h \
$(SFNT_DIR_)ttcmap.h \