libxkbcommon: Add header target

8 files changed, 21 insertions, 14 deletions

diff --git a/pkg/dmenu/gen.lua b/pkg/dmenu/gen.lua
index a55337d9..78fedd99 100644
--- a/pkg/dmenu/gen.lua
+++ b/pkg/dmenu/gen.lua
@@ -2,7 +2,7 @@ cflags{
 	[[-D 'VERSION="4.6"']],
 	'-I $dir',
 	'-I $builddir/pkg/fontconfig/include',
-	'-I $basedir/pkg/libxkbcommon/src',
+	'-I $builddir/pkg/libxkbcommon/include',
 	'-I $builddir/pkg/pixman/include',
 	'-I $builddir/pkg/swc/include',
 	'-I $builddir/pkg/wayland/include',
@@ -11,7 +11,7 @@ cflags{
 
 pkg.deps = {
 	'pkg/fontconfig/headers',
-	'pkg/libxkbcommon/fetch',
+	'pkg/libxkbcommon/headers',
 	'pkg/pixman/headers',
 	'pkg/swc/headers',
 	'pkg/wayland/headers',
diff --git a/pkg/libxkbcommon/gen.lua b/pkg/libxkbcommon/gen.lua
index c2eabeae..675bcf96 100644
--- a/pkg/libxkbcommon/gen.lua
+++ b/pkg/libxkbcommon/gen.lua
@@ -4,6 +4,13 @@ cflags{
 	'-I $srcdir/src',
 }
 
+pkg.hdrs = copy('$outdir/include/xkbcommon', '$srcdir/xkbcommon', {
+	'xkbcommon.h',
+	'xkbcommon-compat.h',
+	'xkbcommon-keysyms.h',
+	'xkbcommon-names.h',
+})
+
 lib('libxkbcommon.a', [[src/(
 	compose/parser.c
 	compose/paths.c
diff --git a/pkg/mpv/gen.lua b/pkg/mpv/gen.lua
index 70e1a5da..6c4c27ca 100644
--- a/pkg/mpv/gen.lua
+++ b/pkg/mpv/gen.lua
@@ -145,8 +145,8 @@ if options['HAVE_LUA'] then
 end
 if options['HAVE_WAYLAND'] then
 	cflags{
+		'-I $builddir/pkg/libxkbcommon/include',
 		'-I $builddir/pkg/wayland/include',
-		'-I $basedir/pkg/libxkbcommon/src',
 	}
 	table.insert(libs, {
 		'wayland/libwayland-client.a.d',
@@ -158,8 +158,8 @@ if options['HAVE_WAYLAND'] then
 		'$outdir/video/out/wayland/presentation-time.h',
 		'$outdir/video/out/wayland/xdg-decoration-v1.h',
 		'$outdir/video/out/wayland/xdg-shell.h',
+		'pkg/libxkbcommon/headers',
 		'pkg/wayland/headers',
-		'pkg/libxkbcommon/fetch',
 	})
 end
 
diff --git a/pkg/mupdf/gen.lua b/pkg/mupdf/gen.lua
index 8e848d07..0f4809b2 100644
--- a/pkg/mupdf/gen.lua
+++ b/pkg/mupdf/gen.lua
@@ -72,16 +72,16 @@ file('bin/mutool', '755', '$outdir/bin/mutool')
 
 cc('platform/x11/wl_main.c', {
 	'$gendir/deps',
-	'pkg/libxkbcommon/fetch',
+	'pkg/libxkbcommon/headers',
 	'pkg/pixman/headers',
 	'pkg/wayland/headers',
 	'pkg/wayland-protocols/headers',
 }, {cflags={
 	'$cflags',
+	'-I $builddir/pkg/libxkbcommon/include',
 	'-I $builddir/pkg/pixman/include',
 	'-I $builddir/pkg/wayland/include',
 	'-I $builddir/pkg/wayland-protocols/include',
-	'-I $basedir/pkg/libxkbcommon/src',
 }})
 exe('bin/mupdf', [[
 	platform/x11/(pdfapp.c wl_main.c.o)
diff --git a/pkg/netsurf/gen.lua b/pkg/netsurf/gen.lua
index 8db42392..36b1b574 100644
--- a/pkg/netsurf/gen.lua
+++ b/pkg/netsurf/gen.lua
@@ -31,6 +31,7 @@ cflags{
 	'-I $builddir/pkg/freetype/include',
 	'-I $builddir/pkg/libjpeg-turbo/include',
 	'-I $builddir/pkg/libpng/include',
+	'-I $builddir/pkg/libxkbcommon/include',
 	'-I $builddir/pkg/linux-headers/include',
 	'-I $builddir/pkg/pixman/include',
 	'-I $builddir/pkg/wayland/include',
@@ -45,7 +46,6 @@ cflags{
 	'-I $dir/libparserutils/src/include',
 	'-I $dir/libsvgtiny/src/include',
 	'-I $dir/libwapcaplet/src/include',
-	'-I $basedir/pkg/libxkbcommon/src',
 	'-I $basedir/pkg/openbsd/include',
 	'-I $basedir/pkg/utf8proc/src',
 }
@@ -65,7 +65,7 @@ pkg.deps = {
 	'pkg/freetype/headers',
 	'pkg/libjpeg-turbo/headers',
 	'pkg/libpng/headers',
-	'pkg/libxkbcommon/fetch',
+	'pkg/libxkbcommon/headers',
 	'pkg/linux-headers/headers',
 	'pkg/pixman/headers',
 	'pkg/utf8proc/fetch',
diff --git a/pkg/st/gen.lua b/pkg/st/gen.lua
index f6ebf696..9a52a00c 100644
--- a/pkg/st/gen.lua
+++ b/pkg/st/gen.lua
@@ -2,7 +2,7 @@ cflags{
 	[[-D 'VERSION="0.7"']],
 	'-I $dir',
 	'-I $builddir/pkg/fontconfig/include',
-	'-I $basedir/pkg/libxkbcommon/src',
+	'-I $builddir/pkg/libxkbcommon/include',
 	'-I $builddir/pkg/linux-headers/include',
 	'-I $builddir/pkg/pixman/include',
 	'-I $builddir/pkg/wayland/include',
@@ -12,7 +12,7 @@ cflags{
 
 pkg.deps = {
 	'pkg/fontconfig/headers',
-	'pkg/libxkbcommon/fetch',
+	'pkg/libxkbcommon/headers',
 	'pkg/linux-headers/headers',
 	'pkg/pixman/headers',
 	'pkg/wayland/headers',
diff --git a/pkg/swc/gen.lua b/pkg/swc/gen.lua
index 980296bb..8815c589 100644
--- a/pkg/swc/gen.lua
+++ b/pkg/swc/gen.lua
@@ -8,7 +8,7 @@ cflags{
 	'-I $srcdir',
 	'-I $builddir/pkg/fontconfig/include',
 	'-I $basedir/pkg/libinput/src/src',
-	'-I $basedir/pkg/libxkbcommon/src',
+	'-I $builddir/pkg/libxkbcommon/include',
 	'-I $builddir/pkg/libdrm/include',
 	'-I $builddir/pkg/linux-headers/include',
 	'-I $builddir/pkg/pixman/include',
@@ -55,7 +55,7 @@ pkg.deps = {
 	'pkg/fontconfig/headers',
 	'pkg/libdrm/headers',
 	'pkg/libinput/fetch',
-	'pkg/libxkbcommon/fetch',
+	'pkg/libxkbcommon/headers',
 	'pkg/linux-headers/headers',
 	'pkg/pixman/headers',
 	'pkg/wayland/headers',
diff --git a/pkg/velox/gen.lua b/pkg/velox/gen.lua
index cc82ba56..63ac696f 100644
--- a/pkg/velox/gen.lua
+++ b/pkg/velox/gen.lua
@@ -3,7 +3,7 @@ cflags{
 	'-I $outdir',
 	'-I $builddir/pkg/fontconfig/include',
 	'-I $basedir/pkg/libinput/src/src',
-	'-I $basedir/pkg/libxkbcommon/src',
+	'-I $builddir/pkg/libxkbcommon/include',
 	'-I $builddir/pkg/linux-headers/include',
 	'-I $builddir/pkg/pixman/include',
 	'-I $builddir/pkg/swc/include',
@@ -24,7 +24,7 @@ pkg.deps = {
 	'$outdir/protocol/velox-server-protocol.h',
 	'pkg/fontconfig/headers',
 	'pkg/libinput/fetch',
-	'pkg/libxkbcommon/fetch',
+	'pkg/libxkbcommon/headers',
 	'pkg/linux-headers/headers',
 	'pkg/pixman/headers',
 	'pkg/swc/fetch',