[epiphany] Revert "build: Add dependency on generated header"



commit 4b3029639241b80eab69d403b1efc942b68a2fae
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Mon Aug 28 09:29:54 2017 -0500

    Revert "build: Add dependency on generated header"
    
    This reverts commit 13d3aa20ceb1911616956e308057475105e4e4f0.

 lib/meson.build         |    8 +++-----
 lib/widgets/meson.build |    9 +++------
 2 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/lib/meson.build b/lib/meson.build
index 9582995..aa10557 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -4,14 +4,12 @@ types_headers = [
   'history/ephy-history-types.h'
 ]
 
-lib_enums = gnome.mkenums('ephy-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',
@@ -49,7 +47,7 @@ libephymisc_sources = [
   'history/ephy-history-service-urls-table.c',
   'history/ephy-history-service-visits-table.c',
   'history/ephy-history-types.c',
-  lib_enums
+  enums
 ]
 
 libephymisc_deps = [
@@ -89,7 +87,7 @@ ephymisc_dep = declare_dependency(
   link_with: libephymisc,
   include_directories: libephymisc_includes,
   dependencies: libephymisc_deps,
-  sources: lib_enums
+  sources: enums
 )
 
 subdir('sync')
diff --git a/lib/widgets/meson.build b/lib/widgets/meson.build
index cc3da48..5669df6 100644
--- a/lib/widgets/meson.build
+++ b/lib/widgets/meson.build
@@ -2,7 +2,7 @@ types_headers = [
   'ephy-location-entry.h'
 ]
 
-widget_enums = gnome.mkenums('ephy-widgets',
+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',
-  widget_enums
+  enums
 ]
 
 libephywidgets_deps = [
@@ -55,8 +55,5 @@ ephywidgets_dep = declare_dependency(
   link_with: libephywidgets,
   include_directories: libephywidgets_includes,
   dependencies: libephywidgets_deps,
-  sources: [
-    ephy_lib_type_builtins_h,
-    widget_enums
-  ]
+  sources: enums
 )


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