[gnome-builder] meson-build: Keep in sync with autotools



commit 34696814ca206dbca808e793fc84521ba2c5a9c0
Author: Patrick Griffis <tingping tingping se>
Date:   Thu Mar 16 20:13:40 2017 -0400

    meson-build: Keep in sync with autotools

 contrib/egg/meson.build     |    2 ++
 libide/meson.build          |    2 ++
 meson.build                 |    1 +
 meson_options.txt           |    1 +
 plugins/meson.build         |    1 +
 plugins/sysprof/meson.build |    2 +-
 6 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/contrib/egg/meson.build b/contrib/egg/meson.build
index 12b0214..742b8f1 100644
--- a/contrib/egg/meson.build
+++ b/contrib/egg/meson.build
@@ -16,6 +16,7 @@ libegg_headers = [
   'egg-pill-box.h',
   'egg-priority-box.h',
   'egg-private.h',
+  'egg-progress-button.h',
   'egg-radio-box.h',
   'egg-scrolled-window.h',
   'egg-search-bar.h',
@@ -57,6 +58,7 @@ libegg_sources = [
   'egg-menu-manager.c',
   'egg-pill-box.c',
   'egg-priority-box.c',
+  'egg-progress-button.c',
   'egg-radio-box.c',
   'egg-scrolled-window.c',
   'egg-search-bar.c',
diff --git a/libide/meson.build b/libide/meson.build
index ee0cf86..677d614 100644
--- a/libide/meson.build
+++ b/libide/meson.build
@@ -203,6 +203,7 @@ libide_public_headers = [
   'workbench/ide-omni-bar.h',
   'workbench/ide-perspective.h',
   'workbench/ide-workbench-addin.h',
+  'workbench/ide-workbench-message.h',
   'workbench/ide-workbench-header-bar.h',
   'workbench/ide-workbench.h',
   'workers/ide-worker.h',
@@ -410,6 +411,7 @@ libide_public_sources = [
   'workbench/ide-omni-bar.c',
   'workbench/ide-perspective.c',
   'workbench/ide-workbench-addin.c',
+  'workbench/ide-workbench-message.c',
   'workbench/ide-workbench-header-bar.c',
   'workbench/ide-workbench-open.c',
   'workbench/ide-workbench.c',
diff --git a/meson.build b/meson.build
index 2f46685..86205ac 100644
--- a/meson.build
+++ b/meson.build
@@ -19,6 +19,7 @@ conf.set_quoted('PACKAGE_NAME', 'gnome-builder')
 conf.set_quoted('PACKAGE_VERSION', meson.project_version())
 conf.set_quoted('PACKAGE_STRING', 'gnome-builder-' + meson.project_version())
 conf.set_quoted('PACKAGE_DATADIR', join_paths(get_option('prefix'), get_option('datadir')))
+conf.set_quoted('PACKAGE_DOCDIR', join_paths(get_option('prefix'), get_option('datadir'), 
'doc/gnome-builder'))
 conf.set_quoted('PACKAGE_LIBDIR', join_paths(get_option('prefix'), get_option('libdir')))
 conf.set_quoted('PACKAGE_LOCALE_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'locale'))
 conf.set_quoted('PACKAGE_LIBEXECDIR', join_paths(get_option('prefix'), get_option('libexecdir')))
diff --git a/meson_options.txt b/meson_options.txt
index 8a0ab03..e066b34 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -46,6 +46,7 @@ option('with_meson', type: 'boolean')
 option('with_meson_templates', type: 'boolean', value: false)
 option('with_mingw', type: 'boolean')
 option('with_mono', type: 'boolean')
+option('with_phpize', type: 'boolean')
 option('with_project_tree', type: 'boolean')
 option('with_python_gi_imports_completion', type: 'boolean')
 option('with_python_pack', type: 'boolean')
diff --git a/plugins/meson.build b/plugins/meson.build
index a40f799..c7ddc37 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -40,6 +40,7 @@ subdir('meson')
 subdir('meson-templates')
 subdir('mingw')
 subdir('mono')
+subdir('phpize')
 subdir('project-tree')
 subdir('python-gi-imports-completion')
 subdir('python-pack')
diff --git a/plugins/sysprof/meson.build b/plugins/sysprof/meson.build
index c8faf66..6e3ca20 100644
--- a/plugins/sysprof/meson.build
+++ b/plugins/sysprof/meson.build
@@ -17,7 +17,7 @@ sysprof_sources = [
 ]
 
 sysprof_deps = plugin_deps + [
-  dependency('sysprof-ui-2', version: '>=3.21.90'),
+  dependency('sysprof-ui-2', version: '>= 3.23.91'),
 ]
 
 shared_module('sysprof-plugin', sysprof_sources,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]