commit: 2255c43da734bc297f5606289616d31798cb32be
parent 8f32745795a95fa7ce4ea48e6ca88fe9d35609c0
Author: Michael Forney <mforney@mforney.org>
Date: Mon, 16 Dec 2019 23:48:22 -0800
Use $basedir to refer to paths relative to base source tree
Diffstat:
26 files changed, 57 insertions(+), 56 deletions(-)
diff --git a/gen.lua b/gen.lua
@@ -1,5 +1,6 @@
set('ninja_required_version', '1.8')
+set('basedir', '.')
set('builddir', config.builddir)
set('outdir', '$builddir')
@@ -27,7 +28,7 @@ subgen 'src'
file('.perms', '644', '$outdir/root.perms')
build('gitinit', '$builddir/root.stamp')
-build('gittree', '$builddir/root.tree', {'$outdir/root.index', '|', 'scripts/tree.sh', '||', '$builddir/root.stamp'})
+build('gittree', '$builddir/root.tree', {'$outdir/root.index', '|', '$basedir/scripts/tree.sh', '||', '$builddir/root.stamp'})
build('gitarchive', '$builddir/root.tar', {'|', '$builddir/root.tree'})
build('gitcommit', '$builddir/root.commit', {'|', '$builddir/root.tree'})
build('phony', 'commit', '$builddir/root.commit')
diff --git a/pkg/dmenu/gen.lua b/pkg/dmenu/gen.lua
@@ -1,8 +1,8 @@
cflags{
[[-D 'VERSION="4.6"']],
'-I $dir',
- '-I pkg/fontconfig/src',
- '-I pkg/libxkbcommon/src',
+ '-I $basedir/pkg/fontconfig/src',
+ '-I $basedir/pkg/libxkbcommon/src',
'-I $builddir/pkg/pixman/include',
'-I $builddir/pkg/swc/include',
'-I $builddir/pkg/wayland/include',
diff --git a/pkg/expat/gen.lua b/pkg/expat/gen.lua
@@ -1,7 +1,7 @@
cflags{
'-D HAVE_EXPAT_CONFIG_H',
'-I $dir',
- '-I pkg/openbsd/include',
+ '-I $basedir/pkg/openbsd/include',
}
lib('libexpat.a', [[
diff --git a/pkg/fontconfig/gen.lua b/pkg/fontconfig/gen.lua
@@ -3,7 +3,7 @@ cflags{
'-I $dir',
'-I $outdir',
'-I $srcdir',
- '-I pkg/freetype/src/include',
+ '-I $basedir/pkg/freetype/src/include',
'-I $builddir/pkg/expat/include',
'-I $builddir/pkg/util-linux/include',
}
diff --git a/pkg/libass/gen.lua b/pkg/libass/gen.lua
@@ -1,6 +1,6 @@
cflags{
'-I $dir',
- '-I pkg/freetype/src/include',
+ '-I $basedir/pkg/freetype/src/include',
'-I $builddir/pkg/fribidi/include',
}
nasmflags{
diff --git a/pkg/libdrm/gen.lua b/pkg/libdrm/gen.lua
@@ -22,7 +22,7 @@ lib('libdrm.a', {
})
if config.video_drivers and config.video_drivers['intel'] then
- cflags{'-I pkg/libpciaccess/src/include'}
+ cflags{'-I $basedir/pkg/libpciaccess/src/include'}
pkg.deps = {'pkg/libpciaccess/fetch'}
lib('libdrm_intel.a', [[
intel/(
diff --git a/pkg/libinput/gen.lua b/pkg/libinput/gen.lua
@@ -2,8 +2,8 @@ cflags{
'-std=c11', '-Wall',
'-I $dir',
'-I $srcdir/include',
- '-I pkg/libevdev/src',
- '-I pkg/mtdev/src/include',
+ '-I $basedir/pkg/libevdev/src',
+ '-I $basedir/pkg/mtdev/src/include',
}
pkg.deps = {
diff --git a/pkg/libressl/gen.lua b/pkg/libressl/gen.lua
@@ -15,7 +15,7 @@ cflags{
'-I $srcdir/crypto/ecdsa',
'-I $srcdir/crypto/evp',
'-I $srcdir/crypto/modes',
- '-I pkg/openbsd/include',
+ '-I $basedir/pkg/openbsd/include',
}
pkg.hdrs = {
diff --git a/pkg/loksh/gen.lua b/pkg/loksh/gen.lua
@@ -3,7 +3,7 @@ cflags{
'-D EMACS',
'-D SMALL',
'-D VI',
- '-I pkg/openbsd/include',
+ '-I $basedir/pkg/openbsd/include',
'-idirafter $srcdir', -- for vis.h
}
diff --git a/pkg/lpeg/gen.lua b/pkg/lpeg/gen.lua
@@ -1,7 +1,7 @@
cflags{
'-std=c99',
'-D NDEBUG',
- '-I pkg/lua/src/src',
+ '-I $basedir/pkg/lua/src/src',
}
lib('liblpeg.a', {
diff --git a/pkg/mandoc/gen.lua b/pkg/mandoc/gen.lua
@@ -1,6 +1,6 @@
cflags{
'-I $dir',
- '-I pkg/openbsd/include',
+ '-I $basedir/pkg/openbsd/include',
'-I $builddir/pkg/zlib/include',
}
diff --git a/pkg/mpv/gen.lua b/pkg/mpv/gen.lua
@@ -14,7 +14,7 @@ cflags{
'-I $dir',
'-I $outdir',
'-I $srcdir',
- '-I pkg/ffmpeg/src',
+ '-I $basedir/pkg/ffmpeg/src',
'-I $builddir/pkg/ffmpeg/include',
'-I $builddir/pkg/zlib/include',
}
@@ -128,8 +128,8 @@ if options['HAVE_ALSA'] then
end
if options['HAVE_DRM'] then
cflags{
- '-I pkg/libdrm/src',
- '-I pkg/libdrm/src/include/drm',
+ '-I $basedir/pkg/libdrm/src',
+ '-I $basedir/pkg/libdrm/src/include/drm',
}
table.insert(libs, 'libdrm/libdrm.a')
table.insert(pkg.deps, 'pkg/libdrm/fetch')
@@ -140,14 +140,14 @@ if options['HAVE_LIBASS'] then
table.insert(pkg.deps, 'pkg/libass/headers')
end
if options['HAVE_LUA'] then
- cflags{'-I pkg/lua/src/src'}
+ cflags{'-I $basedir/pkg/lua/src/src'}
table.insert(libs, 'lua/liblua.a')
table.insert(pkg.deps, 'pkg/lua/fetch')
end
if options['HAVE_WAYLAND'] then
cflags{
'-I $builddir/pkg/wayland/include',
- '-I pkg/libxkbcommon/src',
+ '-I $basedir/pkg/libxkbcommon/src',
}
table.insert(libs, {
'wayland/libwayland-client.a.d',
diff --git a/pkg/mupdf/gen.lua b/pkg/mupdf/gen.lua
@@ -17,8 +17,8 @@ cflags{
'-D SHARE_JPEG',
'-I $srcdir/include',
'-I $outdir',
- '-I pkg/freetype/src/include',
- '-I pkg/jbig2dec/src',
+ '-I $basedir/pkg/freetype/src/include',
+ '-I $basedir/pkg/jbig2dec/src',
'-I $builddir/pkg/libjpeg-turbo/include',
'-I $builddir/pkg/zlib/include',
}
@@ -81,7 +81,7 @@ cc('platform/x11/wl_main.c', {
'-I $builddir/pkg/pixman/include',
'-I $builddir/pkg/wayland/include',
'-I $builddir/pkg/wayland-protocols/include',
- '-I pkg/libxkbcommon/src',
+ '-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
@@ -43,10 +43,10 @@ cflags{
'-I $dir/libparserutils/src/include',
'-I $dir/libsvgtiny/src/include',
'-I $dir/libwapcaplet/src/include',
- '-I pkg/freetype/src/include',
- '-I pkg/libxkbcommon/src',
- '-I pkg/openbsd/include',
- '-I pkg/utf8proc/src',
+ '-I $basedir/pkg/freetype/src/include',
+ '-I $basedir/pkg/libxkbcommon/src',
+ '-I $basedir/pkg/openbsd/include',
+ '-I $basedir/pkg/utf8proc/src',
}
pkg.deps = {
diff --git a/pkg/netsurf/libcss/gen.lua b/pkg/netsurf/libcss/gen.lua
@@ -2,8 +2,8 @@ cflags{
[[-D '_ALIGNED=__attribute__((aligned))']],
'-I $srcdir/include',
'-I $srcdir/src',
- '-I pkg/netsurf/libparserutils/src/include',
- '-I pkg/netsurf/libwapcaplet/src/include',
+ '-I $basedir/pkg/netsurf/libparserutils/src/include',
+ '-I $basedir/pkg/netsurf/libwapcaplet/src/include',
}
sub('tools.ninja', function()
diff --git a/pkg/netsurf/libdom/gen.lua b/pkg/netsurf/libdom/gen.lua
@@ -1,9 +1,9 @@
cflags{
'-I $srcdir/include',
'-I $srcdir/src',
- '-I pkg/netsurf/libhubbub/src/include',
- '-I pkg/netsurf/libparserutils/src/include',
- '-I pkg/netsurf/libwapcaplet/src/include',
+ '-I $basedir/pkg/netsurf/libhubbub/src/include',
+ '-I $basedir/pkg/netsurf/libparserutils/src/include',
+ '-I $basedir/pkg/netsurf/libwapcaplet/src/include',
'-I $builddir/pkg/expat/include',
}
diff --git a/pkg/netsurf/libhubbub/gen.lua b/pkg/netsurf/libhubbub/gen.lua
@@ -2,9 +2,9 @@ cflags{
'-I $outdir',
'-I $srcdir/src',
'-I $srcdir/include',
- '-I pkg/netsurf/libdom/src/include',
- '-I pkg/netsurf/libparserutils/src/include',
- '-I pkg/netsurf/libwapcaplet/src/include',
+ '-I $basedir/pkg/netsurf/libdom/src/include',
+ '-I $basedir/pkg/netsurf/libparserutils/src/include',
+ '-I $basedir/pkg/netsurf/libwapcaplet/src/include',
}
build('awk', '$outdir/entities.inc', {'$srcdir/build/Entities', '|', '$dir/entities.awk'}, {
diff --git a/pkg/netsurf/libsvgtiny/gen.lua b/pkg/netsurf/libsvgtiny/gen.lua
@@ -2,8 +2,8 @@ cflags{
'-I $dir',
'-I $srcdir/include',
'-I $srcdir/src',
- '-I pkg/netsurf/libdom/src/include',
- '-I pkg/netsurf/libwapcaplet/src/include',
+ '-I $basedir/pkg/netsurf/libdom/src/include',
+ '-I $basedir/pkg/netsurf/libwapcaplet/src/include',
'-I $builddir/pkg/netsurf/libdom/include',
}
diff --git a/pkg/sshfs/gen.lua b/pkg/sshfs/gen.lua
@@ -1,7 +1,7 @@
cflags{
'-D FUSE_USE_VERSION=31',
'-I $dir',
- '-I pkg/fuse/src/include',
+ '-I $basedir/pkg/fuse/src/include',
}
exe('sshfs', {
diff --git a/pkg/st/gen.lua b/pkg/st/gen.lua
@@ -1,8 +1,8 @@
cflags{
[[-D 'VERSION="0.7"']],
'-I $dir',
- '-I pkg/fontconfig/src',
- '-I pkg/libxkbcommon/src',
+ '-I $basedir/pkg/fontconfig/src',
+ '-I $basedir/pkg/libxkbcommon/src',
'-I $builddir/pkg/pixman/include',
'-I $builddir/pkg/wayland/include',
'-I $builddir/pkg/wayland-protocols/include',
diff --git a/pkg/swc/gen.lua b/pkg/swc/gen.lua
@@ -6,11 +6,11 @@ cflags{
'-I $outdir',
'-I $outdir/include',
'-I $srcdir',
- '-I pkg/fontconfig/src',
- '-I pkg/libdrm/src/include/drm',
- '-I pkg/libdrm/src',
- '-I pkg/libinput/src/src',
- '-I pkg/libxkbcommon/src',
+ '-I $basedir/pkg/fontconfig/src',
+ '-I $basedir/pkg/libdrm/src/include/drm',
+ '-I $basedir/pkg/libdrm/src',
+ '-I $basedir/pkg/libinput/src/src',
+ '-I $basedir/pkg/libxkbcommon/src',
'-I $builddir/pkg/pixman/include',
'-I $builddir/pkg/wayland-protocols/include',
'-I $builddir/pkg/wayland/include',
diff --git a/pkg/transmission/gen.lua b/pkg/transmission/gen.lua
@@ -41,8 +41,8 @@ cflags{
'-I $srcdir/third-party',
'-I $srcdir/third-party/libb64',
'-I $srcdir/third-party/libnatpmp',
- '-I pkg/libevent/src/include',
- '-I pkg/libutp/src',
+ '-I $basedir/pkg/libevent/src/include',
+ '-I $basedir/pkg/libutp/src',
'-idirafter pkg/openbsd/src/sys',
'-include config.h',
}
diff --git a/pkg/unzip/gen.lua b/pkg/unzip/gen.lua
@@ -1,7 +1,7 @@
cflags{
'-include $dir/config.h',
'-I $srcdir',
- '-I pkg/bzip2/src',
+ '-I $basedir/pkg/bzip2/src',
}
exe('unzip', [[
diff --git a/pkg/velox/gen.lua b/pkg/velox/gen.lua
@@ -1,8 +1,8 @@
cflags{
[[-D 'VELOX_LIBEXEC="/libexec/velox"']],
'-I $outdir',
- '-I pkg/fontconfig/src',
- '-I pkg/libxkbcommon/src',
+ '-I $basedir/pkg/fontconfig/src',
+ '-I $basedir/pkg/libxkbcommon/src',
'-I $builddir/pkg/pixman/include',
'-I $builddir/pkg/swc/include',
'-I $builddir/pkg/wayland/include',
diff --git a/pkg/vis/gen.lua b/pkg/vis/gen.lua
@@ -15,8 +15,8 @@ cflags{
[[-D 'VIS_PATH="/share/vis"']],
'-D NDEBUG',
'-I $outdir',
- '-I pkg/libtermkey/src',
- '-I pkg/lua/src/src',
+ '-I $basedir/pkg/libtermkey/src',
+ '-I $basedir/pkg/lua/src/src',
'-I $builddir/pkg/ncurses/include',
}
diff --git a/pkg/wld/gen.lua b/pkg/wld/gen.lua
@@ -2,10 +2,10 @@ cflags{
'-D WITH_WAYLAND_SHM',
'-D WITH_WAYLAND_DRM',
'-I $outdir',
- '-I pkg/fontconfig/src',
- '-I pkg/freetype/src/include',
- '-I pkg/libdrm/src',
- '-I pkg/libdrm/src/include/drm',
+ '-I $basedir/pkg/fontconfig/src',
+ '-I $basedir/pkg/freetype/src/include',
+ '-I $basedir/pkg/libdrm/src',
+ '-I $basedir/pkg/libdrm/src/include/drm',
'-I $builddir/pkg/pixman/include',
'-I $builddir/pkg/wayland/include',
}
@@ -38,12 +38,12 @@ local libs = {
}
if config.video_drivers and config.video_drivers['intel'] then
- cflags{'-D WITH_DRM_INTEL', '-I pkg/libdrm/src/intel'}
+ cflags{'-D WITH_DRM_INTEL', '-I $basedir/pkg/libdrm/src/intel'}
table.insert(srcs, {'intel.c', 'intel/batch.c'})
table.insert(libs, 'libdrm/libdrm_intel.a.d')
end
if config.video_drivers and config.video_drivers['nouveau'] then
- cflags{'-D WITH_DRM_NOUVEAU', '-I pkg/libdrm/src/nouveau'}
+ cflags{'-D WITH_DRM_NOUVEAU', '-I $basedir/pkg/libdrm/src/nouveau'}
table.insert(srcs, 'nouveau.c')
table.insert(libs, 'libdrm/libdrm_nouveau.a')
end
