ref: 576403f22be42343da8e7f2c1cbc7b4aef4fc8ad
parent: cbc14b10e623a5d08c89a1323ae9c420c8492118
author: Alexei Podtelezhnikov <[email protected]>
date: Thu Jan 7 11:02:32 EST 2021
[builds] Relocate `FTMODULE_H'. * builds/toplevel.mk: Place `FTMODULE_H' in include/. * builds/freetype.mk: Simplify included path.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2021-01-07 Alexei Podtelezhnikov <[email protected]>
+
+ [builds] Relocate `FTMODULE_H'.
+
+ * builds/toplevel.mk: Place `FTMODULE_H' in include/.
+ * builds/freetype.mk: Simplify included path.
+
2021-01-07 Werner Lemberg <[email protected]>
Fix ABI incompatibility.
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -119,8 +119,7 @@
# in the `builds/<system>' directory, as these files will
# override the default sources.
#
-INCLUDES := $(subst /,$(COMPILER_SEP),$(OBJ_DIR) \
- $(DEVEL_DIR) \
+INCLUDES := $(subst /,$(COMPILER_SEP),$(DEVEL_DIR) \
$(BUILD_DIR) \
$(TOP_DIR)/include)
--- a/builds/toplevel.mk
+++ b/builds/toplevel.mk
@@ -68,7 +68,7 @@
# FTMODULE_H, as its name suggests, indicates where the FreeType module
# class file resides.
#
-FTMODULE_H ?= $(OBJ_DIR)/ftmodule.h
+FTMODULE_H ?= $(TOP_DIR)/include/ftmodule.h
include $(MODULES_CFG)