Commit 1e4402e3dc9836611ea421187d360460c5a2abd1
2006-09-29T22:10:36
* src/base/rules.mk (BASE_SRC): Remove `ftapi.c' (which is no longer in use). * src/base/ftbase.c: Include `ftlcdfil.c'.
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
diff --git a/ChangeLog b/ChangeLog
index 6ba1c97..664f18b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-30 Werner Lemberg <wl@gnu.org>
+
+ * src/base/rules.mk (BASE_SRC): Remove `ftapi.c' (which is no longer
+ in use).
+
+ * src/base/ftbase.c: Include `ftlcdfil.c'.
+
2006-09-29 Werner Lemberg <wl@gnu.org>
* src/sfnt/ttcmap.c (tt_cmap4_char_map_binary): Fix algorithm for
diff --git a/src/base/ftbase.c b/src/base/ftbase.c
index 7d5a7fd..4a77cd9 100644
--- a/src/base/ftbase.c
+++ b/src/base/ftbase.c
@@ -4,7 +4,7 @@
/* */
/* Single object library component (body only). */
/* */
-/* Copyright 1996-2001, 2002, 2003, 2004 by */
+/* Copyright 1996-2001, 2002, 2003, 2004, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -20,16 +20,17 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
-#include "ftutil.c"
-#include "ftdbgmem.c"
-#include "ftstream.c"
#include "ftcalc.c"
-#include "fttrigon.c"
-#include "ftoutln.c"
+#include "ftdbgmem.c"
#include "ftgloadr.c"
-#include "ftobjs.c"
+#include "ftlcdfil.c"
#include "ftnames.c"
+#include "ftobjs.c"
+#include "ftoutln.c"
#include "ftrfork.c"
+#include "ftstream.c"
+#include "fttrigon.c"
+#include "ftutil.c"
#if defined( __APPLE__ ) && !defined ( DARWIN_NO_CARBON )
#include "ftmac.c"
diff --git a/src/base/rules.mk b/src/base/rules.mk
index 32cdeb1..980216e 100644
--- a/src/base/rules.mk
+++ b/src/base/rules.mk
@@ -32,17 +32,19 @@ BASE_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(SRC_DIR)/base)
#
# ftsystem, ftinit, and ftdebug are handled by freetype.mk
#
-BASE_SRC := $(BASE_DIR)/ftapi.c \
- $(BASE_DIR)/ftcalc.c \
+# All files listed here should be included in `ftbase.c' (for a `single'
+# build).
+#
+BASE_SRC := $(BASE_DIR)/ftcalc.c \
$(BASE_DIR)/ftdbgmem.c \
$(BASE_DIR)/ftgloadr.c \
+ $(BASE_DIR)/ftlcdfil.c \
$(BASE_DIR)/ftnames.c \
$(BASE_DIR)/ftobjs.c \
$(BASE_DIR)/ftoutln.c \
$(BASE_DIR)/ftrfork.c \
$(BASE_DIR)/ftstream.c \
$(BASE_DIR)/fttrigon.c \
- $(BASE_DIR)/ftlcdfil.c \
$(BASE_DIR)/ftutil.c
# Base layer `extensions' sources