[Git][freetype/freetype][master] 2 commits: * build/toplevel.mk (do_dist): Fix typo.

[Werner Lemberg (@wl)]

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

• 79a8201e
  by Werner Lemberg at 2023-02-09T07:32:05+01:00

  * build/toplevel.mk (do_dist): Fix typo.
  

• 23e60cae
  by Jan Alexander Steffens (heftig) at 2023-02-09T21:49:34+01:00

  * builds/meson/parse_modules_cfg.py: Handle `gxvalid` and `otvalid`.
  
  These need a name mapping similar to what was done for other modules,
  or linking will fail.
  

2 changed files:

• builds/meson/parse_modules_cfg.py
• builds/toplevel.mk

Changes:

builds/meson/parse_modules_cfg.py

---

...	...	@@ -97,8 +97,12 @@ def generate_ftmodule(lists):
97	97
98	98	for module in lists["AUX_MODULES"]:
99	99	if module in ("psaux", "psnames", "otvalid", "gxvalid"):
	100	+ name = {
	101	+ "gxvalid": "gxv",
	102	+ "otvalid": "otv",
	103	+ }.get(module, module)
100	104	result += (
101		- "FT_USE_MODULE( FT_Module_Class, %s_module_class )\n" % module
	105	+ "FT_USE_MODULE( FT_Module_Class, %s_module_class )\n" % name
102	106	)
103	107
104	108	result += "/* EOF */\n"

builds/toplevel.mk

---

...	...	@@ -317,6 +317,6 @@ do-dist: distclean refdoc
317	317	rm -f $(TOP_DIR)/docs/mkdocs.yml
318	318
319	319	@# Remove more stuff related to git.
320		- rm -rf (TOP_DIR)/subprojects/dlg
	320	+ rm -rf $(TOP_DIR)/subprojects/dlg
321	321
322	322	# EOF

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. Manage all notifications · Help