Commit 6ac722b229a6ce58f61e7966bd069d870b333195
2000-07-27T11:32:13
Adapting changes for Unix to other makefiles.
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 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245
diff --git a/builds/ansi/ansi.mk b/builds/ansi/ansi.mk
index d326f83..6ecc6fb 100644
--- a/builds/ansi/ansi.mk
+++ b/builds/ansi/ansi.mk
@@ -23,17 +23,19 @@ HOSTSEP := $(SEP)
BUILD := $(TOP)/builds/ansi
PLATFORM := ansi
+
# The directory where all object files are placed.
#
-# Note that this is not $(TOP)/obj!
# This lets you build the library in your own directory with something like
#
# set TOP=.../path/to/freetype2/top/dir...
-# mkdir obj
+# set OBJ_DIR=.../path/to/obj/dir
# make -f $TOP/Makefile setup [options]
# make -f $TOP/Makefile
#
-OBJ_DIR := obj
+ifndef OBJ_DIR
+ OBJ_DIR := $(TOP)$(SEP)obj
+endif
# The directory where all library files are placed.
diff --git a/builds/dos/dos-gcc.mk b/builds/dos/dos-gcc.mk
index b9f55a2..b748e7c 100644
--- a/builds/dos/dos-gcc.mk
+++ b/builds/dos/dos-gcc.mk
@@ -23,17 +23,19 @@ HOSTSEP := $(strip \ )
BUILD := $(TOP)/builds/dos
PLATFORM := dos
+
# The directory where all object files are placed.
#
-# Note that this is not $(TOP)/obj!
# This lets you build the library in your own directory with something like
#
# set TOP=.../path/to/freetype2/top/dir...
-# mkdir obj
+# set OBJ_DIR=.../path/to/obj/dir
# make -f %TOP%/Makefile setup [options]
# make -f %TOP%/Makefile
#
-OBJ_DIR := obj
+ifndef OBJ_DIR
+ OBJ_DIR := $(TOP)$(SEP)obj
+endif
# The directory where all library files are placed.
diff --git a/builds/os2/os2-dev.mk b/builds/os2/os2-dev.mk
index 93939d2..5d78053 100644
--- a/builds/os2/os2-dev.mk
+++ b/builds/os2/os2-dev.mk
@@ -26,17 +26,19 @@ BUILD := $(TOP)/builds/os2
PLATFORM := os2
CC := gcc
+
# The directory where all object files are placed.
#
-# Note that this is not $(TOP)/obj!
# This lets you build the library in your own directory with something like
#
# set TOP=.../path/to/freetype2/top/dir...
-# mkdir obj
+# set OBJ_DIR=.../path/to/obj/dir
# make -f %TOP%/Makefile setup [options]
# make -f %TOP%/Makefile
#
-OBJ_DIR := obj
+ifndef OBJ_DIR
+ OBJ_DIR := $(TOP)$(SEP)obj
+endif
# The directory where all library files are placed.
diff --git a/builds/os2/os2-gcc.mk b/builds/os2/os2-gcc.mk
index 14992e6..9694aee 100644
--- a/builds/os2/os2-gcc.mk
+++ b/builds/os2/os2-gcc.mk
@@ -24,17 +24,19 @@ BUILD := $(TOP)/builds/os2
PLATFORM := os2
CC := gcc
+
# The directory where all object files are placed.
#
-# Note that this is not $(TOP)/obj!
# This lets you build the library in your own directory with something like
#
# set TOP=.../path/to/freetype2/top/dir...
-# mkdir obj
-# make -f %TOP%/Makefile setup [options]
-# make -f %TOP%/Makefile
+# set OBJ_DIR=.../path/to/obj/dir
+# make -f %TOP%Makefile setup [options]
+# make -f %TOP%Makefile
#
-OBJ_DIR := obj
+ifndef OBJ_DIR
+ OBJ_DIR := $(TOP)$(SEP)obj
+endif
# The directory where all library files are placed.
diff --git a/builds/win32/w32-dev.mk b/builds/win32/w32-dev.mk
index 8eea55a..278a600 100644
--- a/builds/win32/w32-dev.mk
+++ b/builds/win32/w32-dev.mk
@@ -29,17 +29,19 @@ BUILD := $(TOP)/builds/win32
PLATFORM := win32
CC := gcc
+
# The directory where all object files are placed.
#
-# Note that this is not $(TOP)/obj!
# This lets you build the library in your own directory with something like
#
# set TOP=.../path/to/freetype2/top/dir...
-# mkdir obj
+# set OBJ_DIR=.../path/to/obj/dir
# make -f %TOP%/Makefile setup [options]
# make -f %TOP%/Makefile
#
-OBJ_DIR := obj
+ifndef OBJ_DIR
+ OBJ_DIR := $(TOP)$(SEP)obj
+endif
# The directory where all library files are placed.
diff --git a/builds/win32/w32-gcc.mk b/builds/win32/w32-gcc.mk
index 3501a79..af814d5 100644
--- a/builds/win32/w32-gcc.mk
+++ b/builds/win32/w32-gcc.mk
@@ -27,17 +27,19 @@ BUILD := $(TOP)/builds/win32
PLATFORM := win32
CC := gcc
+
# The directory where all object files are placed.
#
-# Note that this is not $(TOP)/obj!
# This lets you build the library in your own directory with something like
#
# set TOP=.../path/to/freetype2/top/dir...
-# mkdir obj
+# set OBJ_DIR=.../path/to/obj/dir
# make -f %TOP%/Makefile setup [options]
# make -f %TOP%/Makefile
#
-OBJ_DIR := obj
+ifndef OBJ_DIR
+ OBJ_DIR := $(TOP)$(SEP)obj
+endif
# The directory where all library files are placed.
diff --git a/builds/win32/w32-icc.mk b/builds/win32/w32-icc.mk
index 504579e..4a3ea6f 100644
--- a/builds/win32/w32-icc.mk
+++ b/builds/win32/w32-icc.mk
@@ -20,17 +20,19 @@ BUILD := $(TOP)$(SEP)config$(SEP)win32
PLATFORM := win32
CC := icc
+
# The directory where all object files are placed.
#
-# Note that this is not $(TOP)/obj!
# This lets you build the library in your own directory with something like
#
# set TOP=.../path/to/freetype2/top/dir...
-# mkdir obj
+# set OBJ_DIR=.../path/to/obj/dir
# make -f %TOP%/Makefile setup [options]
# make -f %TOP%/Makefile
#
-OBJ_DIR := obj
+ifndef OBJ_DIR
+ OBJ_DIR := $(TOP)$(SEP)obj
+endif
# The directory where all library files are placed.
diff --git a/builds/win32/w32-lcc.mk b/builds/win32/w32-lcc.mk
index 476de14..c835c1b 100644
--- a/builds/win32/w32-lcc.mk
+++ b/builds/win32/w32-lcc.mk
@@ -24,17 +24,19 @@ BUILD := $(TOP)/builds/win32
PLATFORM := win32
CC := lcc
+
# The directory where all object files are placed.
#
-# Note that this is not $(TOP)/obj!
# This lets you build the library in your own directory with something like
#
# set TOP=.../path/to/freetype2/top/dir...
-# mkdir obj
+# set OBJ_DIR=.../path/to/obj/dir
# make -f %TOP%/Makefile setup [options]
# make -f %TOP%/Makefile
#
-OBJ_DIR := obj
+ifndef OBJ_DIR
+ OBJ_DIR := $(TOP)$(SEP)obj
+endif
# The directory where all library files are placed.
diff --git a/builds/win32/w32-vcc.mk b/builds/win32/w32-vcc.mk
index 955f44a..f1f2d3f 100644
--- a/builds/win32/w32-vcc.mk
+++ b/builds/win32/w32-vcc.mk
@@ -24,17 +24,19 @@ BUILD := $(TOP)/builds/win32
PLATFORM := win32
CC := cl
+
# The directory where all object files are placed.
#
-# Note that this is not $(TOP)/obj!
# This lets you build the library in your own directory with something like
#
# set TOP=.../path/to/freetype2/top/dir...
-# mkdir obj
+# set OBJ_DIR=.../path/to/obj/dir
# make -f %TOP%/Makefile setup [options]
# make -f %TOP%/Makefile
#
-OBJ_DIR := obj
+ifndef OBJ_DIR
+ OBJ_DIR := $(TOP)$(SEP)obj
+endif
# The directory where all library files are placed.