[vala/wip/meson] meson: Fixed build without bootstrap
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/wip/meson] meson: Fixed build without bootstrap
- Date: Thu, 2 May 2019 22:31:56 +0000 (UTC)
commit 12269b644de2adb7084ea562c0ddf0c67c6f2993
Author: Daniel Espinosa <esodan gmail com>
Date: Thu May 2 16:44:30 2019 -0500
meson: Fixed build without bootstrap
ccode/meson.build | 2 +
codegen/meson.build | 2 +
compiler/meson.build | 3 +
gee/meson.build | 32 +-------
libvaladoc/api/meson.build | 38 +++++++++
libvaladoc/charts/meson.build | 6 ++
libvaladoc/content/meson.build | 32 ++++++++
libvaladoc/documentation/meson.build | 13 +++
libvaladoc/highlighter/meson.build | 7 ++
libvaladoc/html/meson.build | 8 ++
libvaladoc/importer/meson.build | 7 ++
libvaladoc/meson.build | 153 ++++++++---------------------------
libvaladoc/parser/meson.build | 13 +++
libvaladoc/taglets/meson.build | 11 +++
meson.build | 1 +
vala/meson.build | 27 ++-----
valadoc/doclets/devhelp/meson.build | 10 ++-
valadoc/doclets/gtkdoc/meson.build | 10 ++-
valadoc/doclets/html/meson.build | 10 ++-
valadoc/meson.build | 9 ++-
valadoc/tests/meson.build | 10 ++-
vapigen/meson.build | 4 +
22 files changed, 231 insertions(+), 177 deletions(-)
---
diff --git a/ccode/meson.build b/ccode/meson.build
index 88477c277..012362c91 100644
--- a/ccode/meson.build
+++ b/ccode/meson.build
@@ -65,6 +65,8 @@ foreach f : valaccode_sources
af = f.split('.vala')
nf = join_paths (meson.current_source_dir (), af[0] + '.c')
valaccode_sources_c += nf
+ else
+ valaccode_sources_c += join_paths (meson.current_source_dir (), f)
endif
endforeach
diff --git a/codegen/meson.build b/codegen/meson.build
index 37ac9d440..8c5b0bc48 100644
--- a/codegen/meson.build
+++ b/codegen/meson.build
@@ -40,6 +40,8 @@ foreach f : valacodegen_sources
af = f.split('.vala')
nf = join_paths (meson.current_source_dir (), af[0] + '.c')
valacodegen_sources_c += nf
+ else
+ valaccode_sources_c += join_paths (meson.current_source_dir (), f)
endif
endforeach
diff --git a/compiler/meson.build b/compiler/meson.build
index b0a0a031f..189aa730b 100644
--- a/compiler/meson.build
+++ b/compiler/meson.build
@@ -10,6 +10,8 @@ foreach f : valac_sources
af = f.split('.vala')
nf = join_paths (meson.current_source_dir (), af[0] + '.c')
valac_sources_c += nf
+ else
+ valac_sources_c += join_paths (meson.current_source_dir (), f)
endif
endforeach
@@ -20,6 +22,7 @@ valac_exe = executable(
valac_sources_c,
dependencies: [
valacore_lib_deps,
+ gio_dep,
inc_libvalarooth_dep,
inc_libvalah_dep,
inc_libvalacodegenh_dep,
diff --git a/gee/meson.build b/gee/meson.build
index b1cd0d293..f8d0ec991 100644
--- a/gee/meson.build
+++ b/gee/meson.build
@@ -21,35 +21,9 @@ valagee_sources_c = []
foreach f : valagee_sources
if get_option ('bootstrap')
af = f.split('.vala')
- nf = af[0] + '.c'
+ nf = join_paths (meson.current_source_dir (), af[0] + '.c')
valagee_sources_c += nf
+ else
+ valagee_sources_c += join_paths (meson.current_source_dir (), f)
endif
endforeach
-
-install_dirs = [
- false,
- join_paths (get_option('includedir'), 'vala@0@'.format (vala_version_suffix)),
- false
- ]
-if get_option ('bootstrap')
-
-install_dirs = [
- true
- ]
-endif
-
-valagee_lib = static_library(
- 'valagee',
- valagee_sources_c,
- dependencies: [gobject_dep],
- install: [ false, true, false ],
- install_dir: install_dirs,
- vala_args: ['--use-header'],
- vala_header: 'valagee.h',
- vala_vapi: 'gee.vapi',
-)
-
-valagee_dep = declare_dependency(
- link_with: [valagee_lib],
- include_directories: include_directories('.', '..'),
-)
diff --git a/libvaladoc/api/meson.build b/libvaladoc/api/meson.build
new file mode 100644
index 000000000..5f26c3144
--- /dev/null
+++ b/libvaladoc/api/meson.build
@@ -0,0 +1,38 @@
+api_sources = files([
+ 'array.vala',
+ 'attribute.vala',
+ 'callable.vala',
+ 'childsymbolregistrar.vala',
+ 'class.vala',
+ 'constant.vala',
+ 'delegate.vala',
+ 'enum.vala',
+ 'enumvalue.vala',
+ 'errorcode.vala',
+ 'errordomain.vala',
+ 'field.vala',
+ 'formalparameter.vala',
+ 'girsourcecomment.vala',
+ 'interface.vala',
+ 'item.vala',
+ 'method.vala',
+ 'namespace.vala',
+ 'node.vala',
+ 'nodetype.vala',
+ 'ownership.vala',
+ 'package.vala',
+ 'pointer.vala',
+ 'property.vala',
+ 'propertyaccessor.vala',
+ 'signal.vala',
+ 'signaturebuilder.vala',
+ 'sourcecomment.vala',
+ 'sourcefile.vala',
+ 'struct.vala',
+ 'symbol.vala',
+ 'tree.vala',
+ 'typeparameter.vala',
+ 'typereference.vala',
+ 'typesymbol.vala',
+ 'visitor.vala',
+])
diff --git a/libvaladoc/charts/meson.build b/libvaladoc/charts/meson.build
new file mode 100644
index 000000000..317e1c6ef
--- /dev/null
+++ b/libvaladoc/charts/meson.build
@@ -0,0 +1,6 @@
+charts_sources = files([
+ 'chart.vala',
+ 'chartfactory.vala',
+ 'hierarchychart.vala',
+ 'simplechartfactory.vala',
+])
diff --git a/libvaladoc/content/meson.build b/libvaladoc/content/meson.build
new file mode 100644
index 000000000..741c84512
--- /dev/null
+++ b/libvaladoc/content/meson.build
@@ -0,0 +1,32 @@
+content_sources = files([
+ 'block.vala',
+ 'blockcontent.vala',
+ 'comment.vala',
+ 'contentelement.vala',
+ 'contentfactory.vala',
+ 'contentrenderer.vala',
+ 'contentvisitor.vala',
+ 'embedded.vala',
+ 'headline.vala',
+ 'inline.vala',
+ 'inlinecontent.vala',
+ 'inlinetaglet.vala',
+ 'link.vala',
+ 'list.vala',
+ 'listitem.vala',
+ 'note.vala',
+ 'page.vala',
+ 'paragraph.vala',
+ 'resourcelocator.vala',
+ 'run.vala',
+ 'sourcecode.vala',
+ 'styleattributes.vala',
+ 'symbollink.vala',
+ 'table.vala',
+ 'tablecell.vala',
+ 'tablerow.vala',
+ 'taglet.vala',
+ 'text.vala',
+ 'warning.vala',
+ 'wikilink.vala',
+])
diff --git a/libvaladoc/documentation/meson.build b/libvaladoc/documentation/meson.build
new file mode 100644
index 000000000..b2c4ae35e
--- /dev/null
+++ b/libvaladoc/documentation/meson.build
@@ -0,0 +1,13 @@
+documentation_sources = files([
+ 'commentscanner.vala',
+ 'documentationparser.vala',
+ 'documentation.vala',
+ 'girmetadata.vala',
+ 'gtkdoccommentparser.vala',
+ 'gtkdoccommentscanner.vala',
+ 'gtkdocmarkdownparser.vala',
+ 'gtkdocmarkdownscanner.vala',
+ 'importerhelper.vala',
+ 'wikiscanner.vala',
+ 'wiki.vala',
+])
diff --git a/libvaladoc/highlighter/meson.build b/libvaladoc/highlighter/meson.build
new file mode 100644
index 000000000..bc2ccf358
--- /dev/null
+++ b/libvaladoc/highlighter/meson.build
@@ -0,0 +1,7 @@
+highlighter_sources = files([
+ 'codescanner.vala',
+ 'codetoken.vala',
+ 'highlighter.vala',
+ 'scanner.vala',
+ 'xmlscanner.vala',
+])
diff --git a/libvaladoc/html/meson.build b/libvaladoc/html/meson.build
new file mode 100644
index 000000000..95fc1058e
--- /dev/null
+++ b/libvaladoc/html/meson.build
@@ -0,0 +1,8 @@
+html_sources = files([
+ 'basicdoclet.vala',
+ 'cssclassresolver.vala',
+ 'htmlchartfactory.vala',
+ 'htmlmarkupwriter.vala',
+ 'htmlrenderer.vala',
+ 'linkhelper.vala',
+])
diff --git a/libvaladoc/importer/meson.build b/libvaladoc/importer/meson.build
new file mode 100644
index 000000000..d9495b36f
--- /dev/null
+++ b/libvaladoc/importer/meson.build
@@ -0,0 +1,7 @@
+importer_sources = files([
+ 'documentationimporter.vala',
+ 'girdocumentationimporter.vala',
+ 'internalidregistrar.vala',
+ 'valadocdocumentationimporterscanner.vala',
+ 'valadocdocumentationimporter.vala',
+])
diff --git a/libvaladoc/meson.build b/libvaladoc/meson.build
index f1714ebd3..9d01ddf3d 100644
--- a/libvaladoc/meson.build
+++ b/libvaladoc/meson.build
@@ -1,4 +1,4 @@
-libvaladoc_sources = files(
+libvaladoc_sources = files([
'ctyperesolver.vala',
'devhelp-markupwriter.vala',
'doclet.vala',
@@ -10,129 +10,37 @@ libvaladoc_sources = files(
'markupwriter.vala',
'moduleloader.vala',
'settings.vala',
- 'api/array.vala',
- 'api/attribute.vala',
- 'api/callable.vala',
- 'api/childsymbolregistrar.vala',
- 'api/class.vala',
- 'api/constant.vala',
- 'api/delegate.vala',
- 'api/enum.vala',
- 'api/enumvalue.vala',
- 'api/errorcode.vala',
- 'api/errordomain.vala',
- 'api/field.vala',
- 'api/formalparameter.vala',
- 'api/girsourcecomment.vala',
- 'api/interface.vala',
- 'api/item.vala',
- 'api/method.vala',
- 'api/namespace.vala',
- 'api/node.vala',
- 'api/nodetype.vala',
- 'api/ownership.vala',
- 'api/package.vala',
- 'api/pointer.vala',
- 'api/property.vala',
- 'api/propertyaccessor.vala',
- 'api/signal.vala',
- 'api/signaturebuilder.vala',
- 'api/sourcecomment.vala',
- 'api/sourcefile.vala',
- 'api/struct.vala',
- 'api/symbol.vala',
- 'api/tree.vala',
- 'api/typeparameter.vala',
- 'api/typereference.vala',
- 'api/typesymbol.vala',
- 'api/visitor.vala',
- 'charts/chart.vala',
- 'charts/chartfactory.vala',
- 'charts/hierarchychart.vala',
- 'charts/simplechartfactory.vala',
- 'content/block.vala',
- 'content/blockcontent.vala',
- 'content/comment.vala',
- 'content/contentelement.vala',
- 'content/contentfactory.vala',
- 'content/contentrenderer.vala',
- 'content/contentvisitor.vala',
- 'content/embedded.vala',
- 'content/headline.vala',
- 'content/inline.vala',
- 'content/inlinecontent.vala',
- 'content/inlinetaglet.vala',
- 'content/link.vala',
- 'content/list.vala',
- 'content/listitem.vala',
- 'content/note.vala',
- 'content/page.vala',
- 'content/paragraph.vala',
- 'content/resourcelocator.vala',
- 'content/run.vala',
- 'content/sourcecode.vala',
- 'content/styleattributes.vala',
- 'content/symbollink.vala',
- 'content/table.vala',
- 'content/tablecell.vala',
- 'content/tablerow.vala',
- 'content/taglet.vala',
- 'content/text.vala',
- 'content/warning.vala',
- 'content/wikilink.vala',
- 'documentation/commentscanner.vala',
- 'documentation/documentationparser.vala',
- 'documentation/documentation.vala',
- 'documentation/girmetadata.vala',
- 'documentation/gtkdoccommentparser.vala',
- 'documentation/gtkdoccommentscanner.vala',
- 'documentation/gtkdocmarkdownparser.vala',
- 'documentation/gtkdocmarkdownscanner.vala',
- 'documentation/importerhelper.vala',
- 'documentation/wikiscanner.vala',
- 'documentation/wiki.vala',
- 'highlighter/codescanner.vala',
- 'highlighter/codetoken.vala',
- 'highlighter/highlighter.vala',
- 'highlighter/scanner.vala',
- 'highlighter/xmlscanner.vala',
- 'html/basicdoclet.vala',
- 'html/cssclassresolver.vala',
- 'html/htmlchartfactory.vala',
- 'html/htmlmarkupwriter.vala',
- 'html/htmlrenderer.vala',
- 'html/linkhelper.vala',
- 'importer/documentationimporter.vala',
- 'importer/girdocumentationimporter.vala',
- 'importer/internalidregistrar.vala',
- 'importer/valadocdocumentationimporterscanner.vala',
- 'importer/valadocdocumentationimporter.vala',
- 'parser/manyrule.vala',
- 'parser/oneofrule.vala',
- 'parser/optionalrule.vala',
- 'parser/parser.vala',
- 'parser/parsercallback.vala',
- 'parser/rule.vala',
- 'parser/scanner.vala',
- 'parser/sequencerule.vala',
- 'parser/stubrule.vala',
- 'parser/token.vala',
- 'parser/tokentype.vala',
- 'taglets/tagletdeprecated.vala',
- 'taglets/tagletinheritdoc.vala',
- 'taglets/tagletinit.vala',
- 'taglets/tagletlink.vala',
- 'taglets/tagletparam.vala',
- 'taglets/tagletreturn.vala',
- 'taglets/tagletsee.vala',
- 'taglets/tagletsince.vala',
- 'taglets/tagletthrows.vala',
-)
+])
+
+subdir('api')
+subdir('charts')
+subdir('content')
+subdir('documentation')
+subdir('highlighter')
+subdir('html')
+subdir('importer')
+subdir('parser')
+subdir('taglets')
+
+libvaladoc_sources += api_sources
+libvaladoc_sources += charts_sources
+libvaladoc_sources += content_sources
+libvaladoc_sources += documentation_sources
+libvaladoc_sources += highlighter_sources
+libvaladoc_sources += html_sources
+libvaladoc_sources += importer_sources
+libvaladoc_sources += parser_sources
+libvaladoc_sources += taglets_sources
libvaladoc_lib = shared_library(
'valadoc@0@'.format(vala_version_suffix),
libvaladoc_sources,
- dependencies: [gmodule_dep, valacore_dep, libgvc_dep],
+ dependencies: [gmodule_dep, valacore_lib_deps, libgvc_dep,
+ inc_libvalarooth_dep,
+ inc_libvalah_dep,
+ inc_libvalacodegenh_dep,
+ inc_libvalaccodeh_dep,
+ inc_libvalageeh_dep],
version: '0.0.0',
install: true,
install_dir: [
@@ -147,7 +55,10 @@ libvaladoc_lib = shared_library(
link_with: valacore_lib
)
-libvaladoc_dep = declare_dependency(link_with: [libvaladoc_lib], dependencies: [gmodule_dep, valacore_dep,
libgvc_dep], include_directories: include_directories('.'))
+libvaladoc_dep = declare_dependency(
+ link_with: [libvaladoc_lib],
+ dependencies: [gmodule_dep, valacore_lib_deps, libgvc_dep],
+ include_directories: include_directories('.'))
configure_file(input: 'valadoc.deps.in', output: 'valadoc@0@.deps'.format(vala_version_suffix),
configuration: pkgconf)
diff --git a/libvaladoc/parser/meson.build b/libvaladoc/parser/meson.build
new file mode 100644
index 000000000..73f227458
--- /dev/null
+++ b/libvaladoc/parser/meson.build
@@ -0,0 +1,13 @@
+parser_sources = files([
+ 'manyrule.vala',
+ 'oneofrule.vala',
+ 'optionalrule.vala',
+ 'parser.vala',
+ 'parsercallback.vala',
+ 'rule.vala',
+ 'scanner.vala',
+ 'sequencerule.vala',
+ 'stubrule.vala',
+ 'token.vala',
+ 'tokentype.vala',
+])
diff --git a/libvaladoc/taglets/meson.build b/libvaladoc/taglets/meson.build
new file mode 100644
index 000000000..839d377a9
--- /dev/null
+++ b/libvaladoc/taglets/meson.build
@@ -0,0 +1,11 @@
+taglets_sources = files([
+ 'tagletdeprecated.vala',
+ 'tagletinheritdoc.vala',
+ 'tagletinit.vala',
+ 'tagletlink.vala',
+ 'tagletparam.vala',
+ 'tagletreturn.vala',
+ 'tagletsee.vala',
+ 'tagletsince.vala',
+ 'tagletthrows.vala',
+])
diff --git a/meson.build b/meson.build
index d5c03bce4..391b46191 100644
--- a/meson.build
+++ b/meson.build
@@ -129,6 +129,7 @@ glib_dep = dependency('glib-2.0', version: '>= @0@'.format(glib_version_required
gobject_dep = dependency('gobject-2.0', version: '>= @0@'.format(glib_version_required))
gmodule_dep = dependency('gmodule-2.0', version: '>= @0@'.format(glib_version_required))
libgvc_dep = dependency('libgvc', version: '>= @0@'.format(libgvc_version_required), required:
valadoc_enabled)
+gio_dep = dependency('gio-2.0', version: '>= @0@'.format(glib_version_required))
# Check for CGraph support of libgvc
if valadoc_enabled and cc.run('''#include <gvc.h>
diff --git a/vala/meson.build b/vala/meson.build
index 5ab690179..996450ba2 100644
--- a/vala/meson.build
+++ b/vala/meson.build
@@ -163,11 +163,14 @@ foreach f : valacore_sources
nf = af[0] + '.c'
message ('Setting up: '+nf)
valacore_sources_c += nf
+ else
+ valacore_sources_c += f
endif
endforeach
valacore_sources_c += valaccode_sources_c
valacore_sources_c += valacodegen_sources_c
+valacore_sources_c += valagee_sources_c
if not get_option ('bootstrap')
# https://github.com/mesonbuild/meson/issues/688
@@ -197,11 +200,10 @@ endif
valacore_lib_deps = [
glib_dep,
gobject_dep,
- gmodule_dep,
- valagee_dep
+ gmodule_dep
]
-valacore_lib = shared_library(
+valacore_lib = library(
'vala@0@'.format(vala_version_suffix),
valacore_sources_c,
valaversion_source,
@@ -216,7 +218,7 @@ valacore_lib = shared_library(
install: true,
vala_args: ['--use-header'],
vala_header: 'vala.h',
- vala_vapi: 'vala.vapi',
+ vala_vapi: 'vala'+vala_version_suffix+'.vapi',
install_dir: install_dirs,
)
@@ -226,20 +228,3 @@ valacore_lib_dep = declare_dependency(
include_directories: inc_libvalah,
)
-if not get_option('bootstrap')
-libvala_vapi = custom_target(
- 'libvala@0@.vapi'.format(vala_version_suffix),
- command: [
- find_program('cat'),
- join_paths(meson.build_root(), 'gee', 'gee.vapi'),
- join_paths(meson.current_build_dir(), 'vala.vapi'),
- ],
- depends: [valagee_lib, valacore_lib],
- capture: true,
- output: 'libvala@0@.vapi'.format(vala_version_suffix),
-)
-else
-libvala_vapi = join_paths(meson.current_source_dir(), 'libvala'+vala_version_suffix+'.vapi')
-endif
-
-install_data(libvala_vapi, install_dir: join_paths('share', 'vala', 'vapi'))
diff --git a/valadoc/doclets/devhelp/meson.build b/valadoc/doclets/devhelp/meson.build
index ba228925c..d145e702e 100644
--- a/valadoc/doclets/devhelp/meson.build
+++ b/valadoc/doclets/devhelp/meson.build
@@ -5,8 +5,16 @@ doclet_devhelp_sources = files(
shared_module(
'doclet',
doclet_devhelp_sources,
- dependencies: [gobject_dep, libvaladoc_dep],
+ dependencies: [
+ gobject_dep,
+ libvaladoc_dep,
+ inc_libvalarooth_dep,
+ inc_libvalah_dep,
+ inc_libvalacodegenh_dep,
+ inc_libvalaccodeh_dep,
+ inc_libvalageeh_dep],
install: true,
install_dir: join_paths(get_option('libdir'), 'valadoc', 'doclets', 'devhelp'),
c_args: ['-DPACKAGE_VALADOC_ICONDIR="@0@"'.format(join_paths(get_option('prefix'),
get_option('datadir'), 'valadoc', 'icons'))],
+ link_with: [libvaladoc_lib, valacore_lib]
)
diff --git a/valadoc/doclets/gtkdoc/meson.build b/valadoc/doclets/gtkdoc/meson.build
index 68739dc25..e02f50eb3 100644
--- a/valadoc/doclets/gtkdoc/meson.build
+++ b/valadoc/doclets/gtkdoc/meson.build
@@ -10,7 +10,15 @@ doclet_gtkdoc_sources = files(
shared_module(
'doclet',
doclet_gtkdoc_sources,
- dependencies: [gobject_dep, libvaladoc_dep],
+ dependencies: [
+ gobject_dep,
+ libvaladoc_dep,
+ inc_libvalarooth_dep,
+ inc_libvalah_dep,
+ inc_libvalacodegenh_dep,
+ inc_libvalaccodeh_dep,
+ inc_libvalageeh_dep],
install: true,
install_dir: join_paths(get_option('libdir'), 'valadoc', 'doclets', 'gtkdoc'),
+ link_with: [libvaladoc_lib, valacore_lib]
)
diff --git a/valadoc/doclets/html/meson.build b/valadoc/doclets/html/meson.build
index 70a29921c..2085bc314 100644
--- a/valadoc/doclets/html/meson.build
+++ b/valadoc/doclets/html/meson.build
@@ -5,8 +5,16 @@ doclet_html_sources = files(
shared_module(
'doclet',
doclet_html_sources,
- dependencies: [gobject_dep, libvaladoc_dep],
+ dependencies: [
+ gobject_dep,
+ libvaladoc_dep,
+ inc_libvalarooth_dep,
+ inc_libvalah_dep,
+ inc_libvalacodegenh_dep,
+ inc_libvalaccodeh_dep,
+ inc_libvalageeh_dep],
install: true,
install_dir: join_paths(get_option('libdir'), 'valadoc', 'doclets', 'html'),
c_args: ['-DPACKAGE_VALADOC_ICONDIR="@0@"'.format(join_paths(get_option('prefix'),
get_option('datadir'), 'valadoc', 'icons'))],
+ link_with: [libvaladoc_lib, valacore_lib]
)
diff --git a/valadoc/meson.build b/valadoc/meson.build
index d4413b647..e6fe407ec 100644
--- a/valadoc/meson.build
+++ b/valadoc/meson.build
@@ -11,9 +11,14 @@ valadoc_name = 'valadoc@0@'.format(vala_version_suffix)
valadoc_exe = executable(
valadoc_name,
valadoc_sources,
- dependencies: [gobject_dep, valacore_dep, libvaladoc_dep],
+ dependencies: [gobject_dep, valacore_lib_deps, libvaladoc_dep,
+ inc_libvalarooth_dep,
+ inc_libvalah_dep,
+ inc_libvalacodegenh_dep,
+ inc_libvalaccodeh_dep,
+ inc_libvalageeh_dep],
install: true,
- link_with: valacore_lib
+ link_with: [ valacore_lib, libvaladoc_lib]
)
# https://github.com/mesonbuild/meson/issues/1602
diff --git a/valadoc/tests/meson.build b/valadoc/tests/meson.build
index 49e4dcc6d..904242b6a 100644
--- a/valadoc/tests/meson.build
+++ b/valadoc/tests/meson.build
@@ -60,7 +60,15 @@ driver_exe = executable('driver',
join_paths(meson.source_root(), 'valadoc/treebuilder.vala'),
),
c_args: '-DTOP_SRC_DIR="@0@"'.format(meson.source_root()),
- dependencies: [gobject_dep, valacore_dep, libvaladoc_dep],
+ dependencies: [
+ gobject_dep,
+ valacore_lib_deps,
+ libvaladoc_dep,
+ inc_libvalarooth_dep,
+ inc_libvalah_dep,
+ inc_libvalacodegenh_dep,
+ inc_libvalaccodeh_dep,
+ inc_libvalageeh_dep],
install: false,
link_with: [ libvaladoc_lib, valacore_lib]
)
diff --git a/vapigen/meson.build b/vapigen/meson.build
index 0c83c5336..84f91d73f 100644
--- a/vapigen/meson.build
+++ b/vapigen/meson.build
@@ -11,6 +11,8 @@ foreach f : vapigen_sources
af = f.split('.vala')
nf = join_paths (meson.current_source_dir (), af[0] + '.c')
vapigen_sources_c += nf
+ else
+ vapigen_sources_c += f
endif
endforeach
@@ -44,6 +46,8 @@ foreach f : vapicheck_sources
af = f.split('.vala')
nf = join_paths (meson.current_source_dir (), af[0] + '.c')
vapicheck_sources_c += nf
+ else
+ vapicheck_sources_c += f
endif
endforeach
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
