oasis

commit: 4f9e793714bf4dd12c158e93892e04245f7319fc
parent 7273495b8cedc7e15726655722329518eca867be
Author: Michael Forney <mforney@mforney.org>
Date:   Tue,  2 Jun 2020 02:15:43 -0700

fontconfig: Add header target

Diffstat:
M
pkg/dmenu/gen.lua
4
++--
M
pkg/fontconfig/gen.lua
1
+
M
pkg/st/gen.lua
4
++--
M
pkg/swc/gen.lua
4
++--
M
pkg/velox/gen.lua
4
++--
M
pkg/wld/gen.lua
4
++--

6 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/pkg/dmenu/gen.lua b/pkg/dmenu/gen.lua
@@ -1,7 +1,7 @@
 cflags{
 	[[-D 'VERSION="4.6"']],
 	'-I $dir',
-	'-I $basedir/pkg/fontconfig/src',
+	'-I $builddir/pkg/fontconfig/include',
 	'-I $basedir/pkg/libxkbcommon/src',
 	'-I $builddir/pkg/pixman/include',
 	'-I $builddir/pkg/swc/include',
@@ -10,7 +10,7 @@ cflags{
 }
 
 pkg.deps = {
-	'pkg/fontconfig/fetch',
+	'pkg/fontconfig/headers',
 	'pkg/libxkbcommon/fetch',
 	'pkg/pixman/headers',
 	'pkg/swc/headers',
diff --git a/pkg/fontconfig/gen.lua b/pkg/fontconfig/gen.lua
@@ -8,6 +8,7 @@ cflags{
 	'-I $builddir/pkg/util-linux/include',
 }
 
+pkg.hdrs = copy('$outdir/include', '$srcdir', {'fontconfig/fontconfig.h'})
 pkg.deps = {
 	'pkg/expat/headers',
 	'pkg/freetype/headers',
diff --git a/pkg/st/gen.lua b/pkg/st/gen.lua
@@ -1,7 +1,7 @@
 cflags{
 	[[-D 'VERSION="0.7"']],
 	'-I $dir',
-	'-I $basedir/pkg/fontconfig/src',
+	'-I $builddir/pkg/fontconfig/include',
 	'-I $basedir/pkg/libxkbcommon/src',
 	'-I $builddir/pkg/linux-headers/include',
 	'-I $builddir/pkg/pixman/include',
@@ -11,7 +11,7 @@ cflags{
 }
 
 pkg.deps = {
-	'pkg/fontconfig/fetch',
+	'pkg/fontconfig/headers',
 	'pkg/libxkbcommon/fetch',
 	'pkg/linux-headers/headers',
 	'pkg/pixman/headers',
diff --git a/pkg/swc/gen.lua b/pkg/swc/gen.lua
@@ -6,7 +6,7 @@ cflags{
 	'-I $outdir',
 	'-I $outdir/include',
 	'-I $srcdir',
-	'-I $basedir/pkg/fontconfig/src',
+	'-I $builddir/pkg/fontconfig/include',
 	'-I $basedir/pkg/libinput/src/src',
 	'-I $basedir/pkg/libxkbcommon/src',
 	'-I $builddir/pkg/libdrm/include',
@@ -52,7 +52,7 @@ pkg.deps = {
 	'$outdir/wayland-drm-server-protocol.h',
 	'$outdir/include/swc-server-protocol.h',
 	'$outdir/cursor/cursor_data.h',
-	'pkg/fontconfig/fetch',
+	'pkg/fontconfig/headers',
 	'pkg/libdrm/headers',
 	'pkg/libinput/fetch',
 	'pkg/libxkbcommon/fetch',
diff --git a/pkg/velox/gen.lua b/pkg/velox/gen.lua
@@ -1,7 +1,7 @@
 cflags{
 	string.format([[-D 'VELOX_LIBEXEC="%s/libexec/velox"']], config.prefix),
 	'-I $outdir',
-	'-I $basedir/pkg/fontconfig/src',
+	'-I $builddir/pkg/fontconfig/include',
 	'-I $basedir/pkg/libinput/src/src',
 	'-I $basedir/pkg/libxkbcommon/src',
 	'-I $builddir/pkg/linux-headers/include',
@@ -22,7 +22,7 @@ pkg.deps = {
 	'$outdir/protocol/swc-client-protocol.h',
 	'$outdir/protocol/velox-client-protocol.h',
 	'$outdir/protocol/velox-server-protocol.h',
-	'pkg/fontconfig/fetch',
+	'pkg/fontconfig/headers',
 	'pkg/libinput/fetch',
 	'pkg/libxkbcommon/fetch',
 	'pkg/linux-headers/headers',
diff --git a/pkg/wld/gen.lua b/pkg/wld/gen.lua
@@ -2,7 +2,7 @@ cflags{
 	'-D WITH_WAYLAND_SHM',
 	'-D WITH_WAYLAND_DRM',
 	'-I $outdir',
-	'-I $basedir/pkg/fontconfig/src',
+	'-I $builddir/pkg/fontconfig/include',
 	'-I $builddir/pkg/freetype/include',
 	'-I $builddir/pkg/libdrm/include',
 	'-I $builddir/pkg/linux-headers/include',
@@ -56,7 +56,7 @@ waylandproto('protocol/wayland-drm.xml', {
 
 pkg.deps = {
 	'$outdir/protocol/wayland-drm-client-protocol.h',
-	'pkg/fontconfig/fetch',
+	'pkg/fontconfig/headers',
 	'pkg/freetype/headers',
 	'pkg/libdrm/headers',
 	'pkg/linux-headers/headers',