Commit 576403f22be42343da8e7f2c1cbc7b4aef4fc8ad
2021-01-07T16:02:32
[builds] Relocate `FTMODULE_H'. * builds/toplevel.mk: Place `FTMODULE_H' in include/. * builds/freetype.mk: Simplify included path.
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
diff --git a/ChangeLog b/ChangeLog
index 85f431d..86871ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2021-01-07 Alexei Podtelezhnikov <apodtele@gmail.com>
+
+ [builds] Relocate `FTMODULE_H'.
+
+ * builds/toplevel.mk: Place `FTMODULE_H' in include/.
+ * builds/freetype.mk: Simplify included path.
+
2021-01-07 Werner Lemberg <wl@gnu.org>
Fix ABI incompatibility.
diff --git a/builds/freetype.mk b/builds/freetype.mk
index 71d3a48..54ee9de 100644
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -119,8 +119,7 @@ PROJECT_LIBRARY := $(LIB_DIR)/$(LIBRARY).$A
# 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)
diff --git a/builds/toplevel.mk b/builds/toplevel.mk
index 0cad543..186db04 100644
--- a/builds/toplevel.mk
+++ b/builds/toplevel.mk
@@ -68,7 +68,7 @@ endif
# 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)