[epiphany] build: Add dependency on generated header

[Emmanuele Bassi <ebassi src gnome org>]

commit 13d3aa20ceb1911616956e308057475105e4e4f0
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Mon Aug 28 10:57:19 2017 +0100

    build: Add dependency on generated header
    
    The ephy-widgets sub-library depends on the generated enumeration header
    file on its parent directory. If this dependency is not appropriately
    expressed, there's no guarantee that the header will be generated before
    the sources in the widgets library are compiled, which means there will
    be occasional and non-deterministic build failure — say, for instance,
    on highly parallel builds on fast machines like the one that runs the
    Continuous integration build for GNOME.

 lib/meson.build         |    8 +++++---
 lib/widgets/meson.build |    9 ++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/lib/meson.build b/lib/meson.build
index aa10557..9582995 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -4,12 +4,14 @@ types_headers = [
   'history/ephy-history-types.h'
 ]
 
-enums = gnome.mkenums('ephy-lib',
+lib_enums = gnome.mkenums('ephy-lib',
   sources: types_headers,
   h_template: 'ephy-lib-type-builtins.h.in',
   c_template: 'ephy-lib-type-builtins.c.in'
 )
 
+ephy_lib_type_builtins_h = lib_enums[1]
+
 libephymisc_sources = [
   'contrib/eggtreemultidnd.c',
   'contrib/gvdb/gvdb-builder.c',
@@ -47,7 +49,7 @@ libephymisc_sources = [
   'history/ephy-history-service-urls-table.c',
   'history/ephy-history-service-visits-table.c',
   'history/ephy-history-types.c',
-  enums
+  lib_enums
 ]
 
 libephymisc_deps = [
@@ -87,7 +89,7 @@ ephymisc_dep = declare_dependency(
   link_with: libephymisc,
   include_directories: libephymisc_includes,
   dependencies: libephymisc_deps,
-  sources: enums
+  sources: lib_enums
 )
 
 subdir('sync')
diff --git a/lib/widgets/meson.build b/lib/widgets/meson.build
index 5669df6..cc3da48 100644
--- a/lib/widgets/meson.build
+++ b/lib/widgets/meson.build
@@ -2,7 +2,7 @@ types_headers = [
   'ephy-location-entry.h'
 ]
 
-enums = gnome.mkenums('ephy-widgets',
+widget_enums = gnome.mkenums('ephy-widgets',
   sources: types_headers,
   h_template: 'ephy-widgets-type-builtins.h.in',
   c_template: 'ephy-widgets-type-builtins.c.in'
@@ -21,7 +21,7 @@ libephywidgets_sources = [
   'ephy-security-popover.c',
   'ephy-title-box.c',
   'ephy-title-widget.c',
-  enums
+  widget_enums
 ]
 
 libephywidgets_deps = [
@@ -55,5 +55,8 @@ ephywidgets_dep = declare_dependency(
   link_with: libephywidgets,
   include_directories: libephywidgets_includes,
   dependencies: libephywidgets_deps,
-  sources: enums
+  sources: [
+    ephy_lib_type_builtins_h,
+    widget_enums
+  ]
 )