From 9a8574e788cdecb0228ce3d6ef71128145c578ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20Fabian=20Kr=C3=BCger?= <tex@2krueger.de>
Date: Sun, 2 Jan 2022 11:01:00 +0100
Subject: [PATCH] Use TeXLive supplied graphite2 and HarfBuzz build

---
 Makefile | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index f8c8f8b..ca0c2df 100644
--- a/Makefile
+++ b/Makefile
@@ -3,11 +3,11 @@ TEXLIVE_SRC = $(HOME)/texlive-source
 # We expect to find a precompiled static library compiled with -fpic here
 LUA_DIR = $(HOME)/lua/
 # HarfBuzz also should be compiled static, position independent in a build_meson subdirectory
-HARFBUZZ_DIR = $(HOME)/harfbuzz
+HARFBUZZ_DIR = $(TEXLIVE_SRC)/Work/libs/harfbuzz
 # Graphite also should be compiled static, position independent in a build subdirectory
-GRAPHITE_DIR = $(HOME)/graphite
+GRAPHITE_DIR = $(TEXLIVE_SRC)/Work/libs/graphite2
 
-HB_INCLUDE_DIRS = $(HARFBUZZ_DIR)/src
+HB_INCLUDE_DIRS = $(HARFBUZZ_DIR)/include
 TL_INCLUDE_DIRS = $(TEXLIVE_SRC)/Work/texk $(TEXLIVE_SRC)/texk
 LUA_INCLUDE_DIRS = $(LUA_DIR)
 LINK.so = $(LINK.o) -shared
@@ -15,21 +15,28 @@ LINK.so = $(LINK.o) -shared
 LUAHARFBUZZ_SRCS = $(wildcard luaharfbuzz/src/luaharfbuzz/*.c)
 LUAHARFBUZZ_OBJS = $(patsubst %.c,%.o,$(LUAHARFBUZZ_SRCS))
 
+
 override CFLAGS += -fpic -DHAVE_DECL_ISASCII=1 $(patsubst %,-I%,$(INCLUDE_DIRS))
+# For Linux
 override LDFLAGS += -Wl,linkscript.ld
+SO_EXT = so
 # For Windows instead:
 # override LDFLAGS += -Wl,-version-script=versionscript
+# SO_EXT = dll
+# For MacOS instead:
+# override LDFLAGS += -Wl,-exported_symbols_list,symbols_list,-alias_list,alias_list -lc++abi
+# SO_EXT = dylib
 
 luaharfbuzz/src/luaharfbuzz/%.o: INCLUDE_DIRS = $(HB_INCLUDE_DIRS) $(LUA_INCLUDE_DIRS)
 luametalatex-kpse/lkpselib.o: INCLUDE_DIRS = $(TL_INCLUDE_DIRS) $(LUA_INCLUDE_DIRS)
 
-luametalatex.so: luametalatex-kpse/lkpselib.o $(LUAHARFBUZZ_OBJS) $(TEXLIVE_SRC)/Work/texk/kpathsea/.libs/libkpathsea.a $(HARFBUZZ_DIR)/build_meson/src/libharfbuzz.a $(GRAPHITE_DIR)/build/src/libgraphite2.a $(LUA_DIR)/liblua.a
+luametalatex.$(SO_EXT): luametalatex-kpse/lkpselib.o $(LUAHARFBUZZ_OBJS) $(TEXLIVE_SRC)/Work/texk/kpathsea/.libs/libkpathsea.a $(HARFBUZZ_DIR)/libharfbuzz.a $(GRAPHITE_DIR)/libgraphite2.a $(LUA_DIR)/liblua.a
 
-%.so:
+%.$(SO_EXT):
 	$(LINK.so) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
 .PHONY: clean
 clean:
-	rm $(LUAHARFBUZZ_OBJS) luametalatex-kpse/lkpselib.o luametalatex.so
+	rm $(LUAHARFBUZZ_OBJS) luametalatex-kpse/lkpselib.o luametalatex.$(SO_EXT)
 
 # lkpselib.o: lkpselib.c