[epiphany] Require meson 0.42.0 and use gnome.mkenums_simple
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Require meson 0.42.0 and use gnome.mkenums_simple
- Date: Thu, 5 Oct 2017 10:08:21 +0000 (UTC)
commit 6764e88d67bbca9ff14ae6d5dc42385f962c2f4f
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Thu Oct 5 11:55:14 2017 +0200
Require meson 0.42.0 and use gnome.mkenums_simple
embed/ephy-embed-type-builtins.c.in | 42 ---------------------------
embed/ephy-embed-type-builtins.h.in | 22 --------------
embed/meson.build | 6 +--
lib/ephy-lib-type-builtins.c.in | 42 ---------------------------
lib/ephy-lib-type-builtins.h.in | 22 --------------
lib/meson.build | 6 +--
lib/widgets/ephy-widgets-type-builtins.c.in | 42 ---------------------------
lib/widgets/ephy-widgets-type-builtins.h.in | 22 --------------
lib/widgets/meson.build | 6 +--
meson.build | 2 +-
src/ephy-type-builtins.c.in | 42 ---------------------------
src/ephy-type-builtins.h.in | 22 --------------
src/meson.build | 6 +--
13 files changed, 9 insertions(+), 273 deletions(-)
---
diff --git a/embed/meson.build b/embed/meson.build
index 7c84495..c9d863c 100644
--- a/embed/meson.build
+++ b/embed/meson.build
@@ -6,10 +6,8 @@ types_headers = [
'ephy-web-view.h'
]
-enums = gnome.mkenums('ephy-embed',
- sources: types_headers,
- h_template: 'ephy-embed-type-builtins.h.in',
- c_template: 'ephy-embed-type-builtins.c.in'
+enums = gnome.mkenums_simple('ephy-embed-type-builtins',
+ sources: types_headers
)
libephyembed_sources = [
diff --git a/lib/meson.build b/lib/meson.build
index 1af66d1..3b62fd0 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -4,10 +4,8 @@ types_headers = [
'history/ephy-history-types.h'
]
-enums = gnome.mkenums('ephy-lib',
- sources: types_headers,
- h_template: 'ephy-lib-type-builtins.h.in',
- c_template: 'ephy-lib-type-builtins.c.in'
+enums = gnome.mkenums_simple('ephy-lib-type-builtins',
+ sources: types_headers
)
libephymisc_sources = [
diff --git a/lib/widgets/meson.build b/lib/widgets/meson.build
index 6b82a1f..c927648 100644
--- a/lib/widgets/meson.build
+++ b/lib/widgets/meson.build
@@ -2,10 +2,8 @@ types_headers = [
'ephy-location-entry.h'
]
-enums = gnome.mkenums('ephy-widgets',
- sources: types_headers,
- h_template: 'ephy-widgets-type-builtins.h.in',
- c_template: 'ephy-widgets-type-builtins.c.in'
+enums = gnome.mkenums_simple('ephy-widgets-type-builtins',
+ sources: types_headers
)
libephywidgets_sources = [
diff --git a/meson.build b/meson.build
index 88bbc8f..3337f41 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
project('epiphany', 'c',
license: 'GPL3+',
version: '3.26.0',
- meson_version: '>= 0.37.0',
+ meson_version: '>= 0.42.0',
default_options: ['c_std=gnu11']
)
diff --git a/src/meson.build b/src/meson.build
index 23835bf..1373b58 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -6,10 +6,8 @@ types_headers = [
'ephy-window.h'
]
-enums = gnome.mkenums('ephy',
- sources: types_headers,
- h_template: 'ephy-type-builtins.h.in',
- c_template: 'ephy-type-builtins.c.in'
+enums = gnome.mkenums_simple('ephy-type-builtins',
+ sources: types_headers
)
libephymain_sources = [
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]