[epiphany/mcatanzaro/gvdb: 2/2] Move gvdb to third-party

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 8afb88c63547329daefb54998961a62ba9bb2bda
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Wed Mar 18 13:58:01 2020 -0500

    Move gvdb to third-party

 embed/meson.build                                 |  1 -
 lib/meson.build                                   |  3 ---
 meson.build                                       |  2 +-
 src/meson.build                                   |  1 +
 {lib/contrib => third-party}/gvdb/README.epiphany |  0
 {lib/contrib => third-party}/gvdb/gvdb-builder.c  |  0
 {lib/contrib => third-party}/gvdb/gvdb-builder.h  |  0
 {lib/contrib => third-party}/gvdb/gvdb-format.h   |  0
 {lib/contrib => third-party}/gvdb/gvdb-reader.c   |  0
 {lib/contrib => third-party}/gvdb/gvdb-reader.h   |  0
 third-party/meson.build                           | 26 +++++++++++++++++++++++
 11 files changed, 28 insertions(+), 5 deletions(-)
---
diff --git a/embed/meson.build b/embed/meson.build
index 47a38c499..bab0617ca 100644
--- a/embed/meson.build
+++ b/embed/meson.build
@@ -50,7 +50,6 @@ libephyembed_includes = include_directories(
   '..',
   '../lib',
   '../lib/contrib',
-  '../lib/contrib/gvdb',
   '../lib/history',
   '../lib/sync',
   '../lib/widgets',
diff --git a/lib/meson.build b/lib/meson.build
index a9f651a7a..616e7da0a 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -12,8 +12,6 @@ enums = gnome.mkenums_simple('ephy-lib-type-builtins',
 libephymisc_sources = [
   'contrib/eggtreemultidnd.c',
   'contrib/gnome-languages.c',
-  'contrib/gvdb/gvdb-builder.c',
-  'contrib/gvdb/gvdb-reader.c',
   'ephy-debug.c',
   'ephy-dnd.c',
   'ephy-favicon-helpers.c',
@@ -75,7 +73,6 @@ libephymisc_includes = include_directories(
   '.',
   '..',
   'contrib',
-  'contrib/gvdb',
   'history',
   'safe-browsing'
 )
diff --git a/meson.build b/meson.build
index 8e53643e1..b2143440d 100644
--- a/meson.build
+++ b/meson.build
@@ -117,9 +117,9 @@ add_project_arguments(cflags,
 subdir('data')
 subdir('help')
 subdir('po')
+subdir('third-party')
 subdir('lib')
 subdir('embed')
-subdir('third-party')
 subdir('src')
 subdir('tests')
 
diff --git a/src/meson.build b/src/meson.build
index 95ff9fdd1..29ed698bf 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -64,6 +64,7 @@ libephymain_deps = [
   ephysync_dep,
   ephywidgets_dep,
   gdk_dep,
+  gvdb_dep,
   libhandy_dep,
   libnotify_dep
 ]
diff --git a/lib/contrib/gvdb/README.epiphany b/third-party/gvdb/README.epiphany
similarity index 100%
rename from lib/contrib/gvdb/README.epiphany
rename to third-party/gvdb/README.epiphany
diff --git a/lib/contrib/gvdb/gvdb-builder.c b/third-party/gvdb/gvdb-builder.c
similarity index 100%
rename from lib/contrib/gvdb/gvdb-builder.c
rename to third-party/gvdb/gvdb-builder.c
diff --git a/lib/contrib/gvdb/gvdb-builder.h b/third-party/gvdb/gvdb-builder.h
similarity index 100%
rename from lib/contrib/gvdb/gvdb-builder.h
rename to third-party/gvdb/gvdb-builder.h
diff --git a/lib/contrib/gvdb/gvdb-format.h b/third-party/gvdb/gvdb-format.h
similarity index 100%
rename from lib/contrib/gvdb/gvdb-format.h
rename to third-party/gvdb/gvdb-format.h
diff --git a/lib/contrib/gvdb/gvdb-reader.c b/third-party/gvdb/gvdb-reader.c
similarity index 100%
rename from lib/contrib/gvdb/gvdb-reader.c
rename to third-party/gvdb/gvdb-reader.c
diff --git a/lib/contrib/gvdb/gvdb-reader.h b/third-party/gvdb/gvdb-reader.h
similarity index 100%
rename from lib/contrib/gvdb/gvdb-reader.h
rename to third-party/gvdb/gvdb-reader.h
diff --git a/third-party/meson.build b/third-party/meson.build
index 6b3f3309b..c09000a47 100644
--- a/third-party/meson.build
+++ b/third-party/meson.build
@@ -4,3 +4,29 @@ pdfjs_resources = gnome.compile_resources('pdfjs-resources',
     c_name: 'pdfjs',
     source_dir: 'pdfjs'
 )
+
+libgvdb_sources = [
+  'gvdb/gvdb-builder.c',
+  'gvdb/gvdb-reader.c'
+]
+
+libgvdb_deps = [
+  gio_dep,
+  glib_dep
+]
+
+libgvdb_includes = [
+  'gvdb/'
+]
+
+libgvdb = static_library('gvdb',
+  libgvdb_sources,
+  dependencies: libgvdb_deps,
+  include_directories: libgvdb_includes
+)
+
+gvdb_dep = declare_dependency(
+  link_with: libgvdb,
+  include_directories: libgvdb_includes,
+  dependencies: libgvdb_deps
+)