* Jamrules, Jamfile, Jamfile.in, src/*/Jamfile: small changes to support the compilation of FreeType 2 as part of larger projects with their own configuration options (only with Jam)
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 73 74 75 76 77 78
diff --git a/ChangeLog b/ChangeLog
index 03fbc02..ef671cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-08 David Turner <david@freetype.org>
+
+ * Jamrules, Jamfile, Jamfile.in, src/*/Jamfile: small changes to
+ support the compilation of FreeType 2 as part of larger projects with
+ their own configuration options (only with Jam)
+
2003-01-07 David Turner <david@freetype.org>
* src/base/ftstroker.c: probably the last bug-fixes to the stroker,
diff --git a/Jamfile b/Jamfile
index b6d4af0..2ba53bd 100644
--- a/Jamfile
+++ b/Jamfile
@@ -100,7 +100,10 @@ if $(DEBUG_HINTER)
# We need "freetype2/include" in the current include path in order to
# compile any part of FreeType 2.
#
-SubDirHdr += $(FT2_INCLUDE) ;
+HDRS += $(FT2_INCLUDE) ;
+
+
+#SubDirHdr += $(FT2_INCLUDE) ;
# Uncomment the following line if you want to build individual source files
# for each FreeType 2 module.
diff --git a/Jamrules b/Jamrules
index eb65f92..c05e508 100644
--- a/Jamrules
+++ b/Jamrules
@@ -6,6 +6,19 @@
#
+# call SubDirHdrs on a list of directories
+#
+rule AddSubDirHdrs
+{
+ local x ;
+
+ for x in $(<)
+ {
+ SubDirHdrs $(x) ;
+ }
+}
+
+
# Determine prefix of library file. We must use "libxxxxx" on Unix systems,
# while all other simply use the real name.
#
@@ -39,11 +52,6 @@ rule FT2_SubDir
}
}
-# The directory "include" must be in the current include path when compiling
-# any part of FreeType. We thus update the HDRS variable there.
-#
-HDRS += [ FT2_SubDir include ] ;
-
# We also set ALL_LOCATE_TARGET in order to place all object and library
# files in "objs".
#
diff --git a/src/base/Jamfile b/src/base/Jamfile
index bc4c71d..55e5e6a 100644
--- a/src/base/Jamfile
+++ b/src/base/Jamfile
@@ -3,6 +3,7 @@
SubDir FT2_TOP $(FT2_SRC_DIR) base ;
+
{
local _sources ;