freetype: Add header target

6 files changed, 49 insertions, 10 deletions

diff --git a/pkg/fontconfig/gen.lua b/pkg/fontconfig/gen.lua
index 5ad7a54c..caf6b9e5 100644
--- a/pkg/fontconfig/gen.lua
+++ b/pkg/fontconfig/gen.lua
@@ -3,14 +3,14 @@ cflags{
 	'-I $dir',
 	'-I $outdir',
 	'-I $srcdir',
-	'-I $basedir/pkg/freetype/src/include',
+	'-I $builddir/pkg/freetype/include',
 	'-I $builddir/pkg/expat/include',
 	'-I $builddir/pkg/util-linux/include',
 }
 
 pkg.deps = {
 	'pkg/expat/headers',
-	'pkg/freetype/fetch',
+	'pkg/freetype/headers',
 	'pkg/util-linux/headers',
 }
 
diff --git a/pkg/freetype/gen.lua b/pkg/freetype/gen.lua
index 456b46dd..c326eca0 100644
--- a/pkg/freetype/gen.lua
+++ b/pkg/freetype/gen.lua
@@ -11,6 +11,45 @@ cflags{
 	'-I $builddir/pkg/zlib/include',
 }
 
+pkg.hdrs = copy('$outdir/include', '$srcdir/include', paths[[
+	ft2build.h
+	freetype/(
+		freetype.h
+		ftadvanc.h
+		ftbdf.h
+		ftbitmap.h
+		ftcache.h
+		ftcolor.h
+		fterrdef.h
+		fterrors.h
+		ftfntfmt.h
+		ftglyph.h
+		ftimage.h
+		ftmm.h
+		ftmodapi.h
+		ftmoderr.h
+		ftoutln.h
+		ftparams.h
+		ftsizes.h
+		ftsnames.h
+		ftstroke.h
+		ftsynth.h
+		ftsystem.h
+		fttrigon.h
+		fttypes.h
+		t1tables.h
+		ttnameid.h
+		tttables.h
+		tttags.h
+		config/(
+			ftconfig.h
+			ftheader.h
+			ftoption.h
+			ftstdlib.h
+		)
+	)
+]])
+
 cc('src/gzip/ftgzip.c', {'pkg/zlib/headers'})
 lib('libfreetype.a', [[
 	builds/unix/ftsystem.c
diff --git a/pkg/libass/gen.lua b/pkg/libass/gen.lua
index c59ff3c7..06b0e227 100644
--- a/pkg/libass/gen.lua
+++ b/pkg/libass/gen.lua
@@ -1,6 +1,6 @@
 cflags{
 	'-I $dir',
-	'-I $basedir/pkg/freetype/src/include',
+	'-I $builddir/pkg/freetype/include',
 	'-I $builddir/pkg/fribidi/include',
 }
 nasmflags{
@@ -17,7 +17,7 @@ end
 
 pkg.hdrs = copy('$outdir/include/ass', '$srcdir/libass', {'ass.h', 'ass_types.h'})
 pkg.deps = {
-	'pkg/freetype/fetch',
+	'pkg/freetype/headers',
 	'pkg/fribidi/headers',
 }
 
diff --git a/pkg/mupdf/gen.lua b/pkg/mupdf/gen.lua
index ee1cc9a0..8e848d07 100644
--- a/pkg/mupdf/gen.lua
+++ b/pkg/mupdf/gen.lua
@@ -17,7 +17,7 @@ cflags{
 	'-D SHARE_JPEG',
 	'-I $srcdir/include',
 	'-I $outdir',
-	'-I $basedir/pkg/freetype/src/include',
+	'-I $builddir/pkg/freetype/include',
 	'-I $basedir/pkg/jbig2dec/src',
 	'-I $builddir/pkg/libjpeg-turbo/include',
 	'-I $builddir/pkg/zlib/include',
@@ -36,7 +36,7 @@ for _, font in ipairs(fonts) do
 end
 
 pkg.deps = {
-	'pkg/freetype/fetch',
+	'pkg/freetype/headers',
 	'pkg/jbig2dec/fetch',
 	'pkg/libjpeg-turbo/headers',
 	'pkg/zlib/headers',
diff --git a/pkg/netsurf/gen.lua b/pkg/netsurf/gen.lua
index 0eb09602..8db42392 100644
--- a/pkg/netsurf/gen.lua
+++ b/pkg/netsurf/gen.lua
@@ -28,6 +28,7 @@ cflags{
 	'-I $outdir',
 	'-I $outdir/libdom/include',
 	'-I $builddir/pkg/curl/include',
+	'-I $builddir/pkg/freetype/include',
 	'-I $builddir/pkg/libjpeg-turbo/include',
 	'-I $builddir/pkg/libpng/include',
 	'-I $builddir/pkg/linux-headers/include',
@@ -44,7 +45,6 @@ cflags{
 	'-I $dir/libparserutils/src/include',
 	'-I $dir/libsvgtiny/src/include',
 	'-I $dir/libwapcaplet/src/include',
-	'-I $basedir/pkg/freetype/src/include',
 	'-I $basedir/pkg/libxkbcommon/src',
 	'-I $basedir/pkg/openbsd/include',
 	'-I $basedir/pkg/utf8proc/src',
@@ -62,7 +62,7 @@ pkg.deps = {
 	'$dir/libsvgtiny/fetch',
 	'$dir/libwapcaplet/fetch',
 	'pkg/curl/headers',
-	'pkg/freetype/fetch',
+	'pkg/freetype/headers',
 	'pkg/libjpeg-turbo/headers',
 	'pkg/libpng/headers',
 	'pkg/libxkbcommon/fetch',
diff --git a/pkg/wld/gen.lua b/pkg/wld/gen.lua
index eeb95cc9..b60de0a5 100644
--- a/pkg/wld/gen.lua
+++ b/pkg/wld/gen.lua
@@ -3,7 +3,7 @@ cflags{
 	'-D WITH_WAYLAND_DRM',
 	'-I $outdir',
 	'-I $basedir/pkg/fontconfig/src',
-	'-I $basedir/pkg/freetype/src/include',
+	'-I $builddir/pkg/freetype/include',
 	'-I $builddir/pkg/libdrm/include',
 	'-I $builddir/pkg/linux-headers/include',
 	'-I $builddir/pkg/pixman/include',
@@ -57,7 +57,7 @@ waylandproto('protocol/wayland-drm.xml', {
 pkg.deps = {
 	'$outdir/protocol/wayland-drm-client-protocol.h',
 	'pkg/fontconfig/fetch',
-	'pkg/freetype/fetch',
+	'pkg/freetype/headers',
 	'pkg/libdrm/headers',
 	'pkg/linux-headers/headers',
 	'pkg/pixman/headers',