oasis

commit: d3edcea45684cb5fce0a58d1572463990e8fd3ff
parent 4f9e793714bf4dd12c158e93892e04245f7319fc
Author: Michael Forney <mforney@mforney.org>
Date:   Tue,  2 Jun 2020 02:19:16 -0700

Use lua header target

Diffstat:
M
pkg/lpeg/gen.lua
6
++++--
M
pkg/mpv/gen.lua
4
++--
M
pkg/vis/gen.lua
4
++--

3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/pkg/lpeg/gen.lua b/pkg/lpeg/gen.lua
@@ -1,15 +1,17 @@
 cflags{
 	'-std=c99',
 	'-D NDEBUG',
-	'-I $basedir/pkg/lua/src/src',
+	'-I $builddir/pkg/lua/include',
 }
 
+pkg.deps = {'pkg/lua/headers'}
+
 lib('liblpeg.a', {
 	'lpvm.c',
 	'lpcap.c',
 	'lptree.c',
 	'lpcode.c',
 	'lpprint.c',
-}, {'pkg/lua/fetch'})
+})
 
 fetch 'curl'
diff --git a/pkg/mpv/gen.lua b/pkg/mpv/gen.lua
@@ -139,9 +139,9 @@ if options['HAVE_LIBASS'] then
 	table.insert(pkg.deps, 'pkg/libass/headers')
 end
 if options['HAVE_LUA'] then
-	cflags{'-I $basedir/pkg/lua/src/src'}
+	cflags{'-I $builddir/pkg/lua/include'}
 	table.insert(libs, 'lua/liblua.a')
-	table.insert(pkg.deps, 'pkg/lua/fetch')
+	table.insert(pkg.deps, 'pkg/lua/headers')
 end
 if options['HAVE_WAYLAND'] then
 	cflags{
diff --git a/pkg/vis/gen.lua b/pkg/vis/gen.lua
@@ -16,7 +16,7 @@ cflags{
 	'-D NDEBUG',
 	'-I $outdir',
 	'-I $basedir/pkg/libtermkey/src',
-	'-I $basedir/pkg/lua/src/src',
+	'-I $builddir/pkg/lua/include',
 	'-I $builddir/pkg/ncurses/include',
 }
 
@@ -25,7 +25,7 @@ build('copy', '$outdir/config.h', '$srcdir/config.def.h')
 pkg.deps = {
 	'$outdir/config.h',
 	'pkg/libtermkey/fetch',
-	'pkg/lua/fetch',
+	'pkg/lua/headers',
 	'pkg/ncurses/headers',
 }