[gnome-dictionary/ebassi/merge-gdict: 1/7] Merge libgdict with the rest of the application

[Emmanuele Bassi <ebassi src gnome org>]

commit 297110cbd695b2bd0a740153ffb11961b573b5ed
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Mon Sep 21 23:47:28 2020 +0100

    Merge libgdict with the rest of the application
    
    There's no point in keeping it into a separate directory, when it's a
    static library that isn't installed any more.

 libgdict/meson.build                              | 91 -----------------------
 meson.build                                       |  2 -
 po/POTFILES.in                                    | 16 ++--
 {libgdict => src}/gdict-client-context.c          |  0
 {libgdict => src}/gdict-client-context.h          |  0
 {libgdict => src}/gdict-context-private.h         |  0
 {libgdict => src}/gdict-context.c                 |  0
 {libgdict => src}/gdict-context.h                 |  0
 {libgdict => src}/gdict-database-chooser-button.c |  0
 {libgdict => src}/gdict-database-chooser-button.h |  0
 {libgdict => src}/gdict-database-chooser.c        |  0
 {libgdict => src}/gdict-database-chooser.h        |  0
 {libgdict => src}/gdict-debug.h                   |  0
 {libgdict => src}/gdict-defbox.c                  |  0
 {libgdict => src}/gdict-defbox.h                  |  0
 {libgdict => src}/gdict-enum-types.c.in           |  0
 {libgdict => src}/gdict-enum-types.h.in           |  0
 {libgdict => src}/gdict-marshal.list              |  0
 {libgdict => src}/gdict-private.h                 |  0
 {libgdict => src}/gdict-source-chooser.c          |  0
 {libgdict => src}/gdict-source-chooser.h          |  0
 {libgdict => src}/gdict-source-loader.c           |  0
 {libgdict => src}/gdict-source-loader.h           |  0
 {libgdict => src}/gdict-source.c                  |  0
 {libgdict => src}/gdict-source.h                  |  0
 {libgdict => src}/gdict-speller.c                 |  0
 {libgdict => src}/gdict-speller.h                 |  0
 {libgdict => src}/gdict-strategy-chooser.c        |  0
 {libgdict => src}/gdict-strategy-chooser.h        |  0
 {libgdict => src}/gdict-utils.c                   |  0
 {libgdict => src}/gdict-utils.h                   |  0
 {libgdict => src}/gdict.h                         |  0
 src/meson.build                                   | 56 +++++++++++++-
 33 files changed, 61 insertions(+), 104 deletions(-)
---
diff --git a/meson.build b/meson.build
index 3be6c46..08ff333 100644
--- a/meson.build
+++ b/meson.build
@@ -133,7 +133,6 @@ endif
 conf.set10('ENABLE_IPV6', use_ipv6)
 
 root_inc = include_directories('.')
-libgdict_inc = include_directories('libgdict')
 src_inc = include_directories('src')
 po_dir = join_paths(meson.current_source_dir(), 'po')
 
@@ -145,7 +144,6 @@ gtk_dep = dependency('gtk+-3.0', version: '>= 3.21.2')
 gnome = import('gnome')
 i18n = import('i18n')
 
-subdir('libgdict')
 subdir('src')
 subdir('po')
 subdir('data')
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 95ada05..07fd624 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,21 +6,21 @@ data/org.gnome.Dictionary.desktop.in.in
 data/org.gnome.dictionary.gschema.xml
 data/spanish.desktop.in
 data/thai.desktop.in
-libgdict/gdict-client-context.c
-libgdict/gdict-database-chooser.c
-libgdict/gdict-defbox.c
-libgdict/gdict-source.c
-libgdict/gdict-source-chooser.c
-libgdict/gdict-speller.c
-libgdict/gdict-strategy-chooser.c
-libgdict/gdict-utils.c
 src/gdict-about.c
 src/gdict-app-menus.ui
 src/gdict-app-window.ui
 src/gdict-app.c
+src/gdict-client-context.c
+src/gdict-database-chooser.c
+src/gdict-defbox.c
 src/gdict-pref-dialog.c
 src/gdict-pref-dialog.ui
 src/gdict-print.c
+src/gdict-source-chooser.c
 src/gdict-source-dialog.c
 src/gdict-source-dialog.ui
+src/gdict-source.c
+src/gdict-speller.c
+src/gdict-strategy-chooser.c
 src/gdict-window.c
+src/gdict-utils.c
diff --git a/libgdict/gdict-client-context.c b/src/gdict-client-context.c
similarity index 100%
rename from libgdict/gdict-client-context.c
rename to src/gdict-client-context.c
diff --git a/libgdict/gdict-client-context.h b/src/gdict-client-context.h
similarity index 100%
rename from libgdict/gdict-client-context.h
rename to src/gdict-client-context.h
diff --git a/libgdict/gdict-context-private.h b/src/gdict-context-private.h
similarity index 100%
rename from libgdict/gdict-context-private.h
rename to src/gdict-context-private.h
diff --git a/libgdict/gdict-context.c b/src/gdict-context.c
similarity index 100%
rename from libgdict/gdict-context.c
rename to src/gdict-context.c
diff --git a/libgdict/gdict-context.h b/src/gdict-context.h
similarity index 100%
rename from libgdict/gdict-context.h
rename to src/gdict-context.h
diff --git a/libgdict/gdict-database-chooser-button.c b/src/gdict-database-chooser-button.c
similarity index 100%
rename from libgdict/gdict-database-chooser-button.c
rename to src/gdict-database-chooser-button.c
diff --git a/libgdict/gdict-database-chooser-button.h b/src/gdict-database-chooser-button.h
similarity index 100%
rename from libgdict/gdict-database-chooser-button.h
rename to src/gdict-database-chooser-button.h
diff --git a/libgdict/gdict-database-chooser.c b/src/gdict-database-chooser.c
similarity index 100%
rename from libgdict/gdict-database-chooser.c
rename to src/gdict-database-chooser.c
diff --git a/libgdict/gdict-database-chooser.h b/src/gdict-database-chooser.h
similarity index 100%
rename from libgdict/gdict-database-chooser.h
rename to src/gdict-database-chooser.h
diff --git a/libgdict/gdict-debug.h b/src/gdict-debug.h
similarity index 100%
rename from libgdict/gdict-debug.h
rename to src/gdict-debug.h
diff --git a/libgdict/gdict-defbox.c b/src/gdict-defbox.c
similarity index 100%
rename from libgdict/gdict-defbox.c
rename to src/gdict-defbox.c
diff --git a/libgdict/gdict-defbox.h b/src/gdict-defbox.h
similarity index 100%
rename from libgdict/gdict-defbox.h
rename to src/gdict-defbox.h
diff --git a/libgdict/gdict-enum-types.c.in b/src/gdict-enum-types.c.in
similarity index 100%
rename from libgdict/gdict-enum-types.c.in
rename to src/gdict-enum-types.c.in
diff --git a/libgdict/gdict-enum-types.h.in b/src/gdict-enum-types.h.in
similarity index 100%
rename from libgdict/gdict-enum-types.h.in
rename to src/gdict-enum-types.h.in
diff --git a/libgdict/gdict-marshal.list b/src/gdict-marshal.list
similarity index 100%
rename from libgdict/gdict-marshal.list
rename to src/gdict-marshal.list
diff --git a/libgdict/gdict-private.h b/src/gdict-private.h
similarity index 100%
rename from libgdict/gdict-private.h
rename to src/gdict-private.h
diff --git a/libgdict/gdict-source-chooser.c b/src/gdict-source-chooser.c
similarity index 100%
rename from libgdict/gdict-source-chooser.c
rename to src/gdict-source-chooser.c
diff --git a/libgdict/gdict-source-chooser.h b/src/gdict-source-chooser.h
similarity index 100%
rename from libgdict/gdict-source-chooser.h
rename to src/gdict-source-chooser.h
diff --git a/libgdict/gdict-source-loader.c b/src/gdict-source-loader.c
similarity index 100%
rename from libgdict/gdict-source-loader.c
rename to src/gdict-source-loader.c
diff --git a/libgdict/gdict-source-loader.h b/src/gdict-source-loader.h
similarity index 100%
rename from libgdict/gdict-source-loader.h
rename to src/gdict-source-loader.h
diff --git a/libgdict/gdict-source.c b/src/gdict-source.c
similarity index 100%
rename from libgdict/gdict-source.c
rename to src/gdict-source.c
diff --git a/libgdict/gdict-source.h b/src/gdict-source.h
similarity index 100%
rename from libgdict/gdict-source.h
rename to src/gdict-source.h
diff --git a/libgdict/gdict-speller.c b/src/gdict-speller.c
similarity index 100%
rename from libgdict/gdict-speller.c
rename to src/gdict-speller.c
diff --git a/libgdict/gdict-speller.h b/src/gdict-speller.h
similarity index 100%
rename from libgdict/gdict-speller.h
rename to src/gdict-speller.h
diff --git a/libgdict/gdict-strategy-chooser.c b/src/gdict-strategy-chooser.c
similarity index 100%
rename from libgdict/gdict-strategy-chooser.c
rename to src/gdict-strategy-chooser.c
diff --git a/libgdict/gdict-strategy-chooser.h b/src/gdict-strategy-chooser.h
similarity index 100%
rename from libgdict/gdict-strategy-chooser.h
rename to src/gdict-strategy-chooser.h
diff --git a/libgdict/gdict-utils.c b/src/gdict-utils.c
similarity index 100%
rename from libgdict/gdict-utils.c
rename to src/gdict-utils.c
diff --git a/libgdict/gdict-utils.h b/src/gdict-utils.h
similarity index 100%
rename from libgdict/gdict-utils.h
rename to src/gdict-utils.h
diff --git a/libgdict/gdict.h b/src/gdict.h
similarity index 100%
rename from libgdict/gdict.h
rename to src/gdict.h
diff --git a/src/meson.build b/src/meson.build
index 915331a..5f5dc99 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,23 +1,68 @@
+libgdict_version = meson.project_version().split('.')
+libgdict_major = libgdict_version[0].to_int()
+libgdict_minor = libgdict_version[1] in ['alpha', 'beta', 'rc'] ? 0 : libgdict_version[1].to_int()
+libgdict_micro = 0
+
+gdict_headers = [
+  'gdict-context.h',
+  'gdict-client-context.h',
+  'gdict-database-chooser.h',
+  'gdict-database-chooser-button.h',
+  'gdict-defbox.h',
+  'gdict-source-chooser.h',
+  'gdict-source-loader.h',
+  'gdict-source.h',
+  'gdict-speller.h',
+  'gdict-strategy-chooser.h',
+  'gdict-utils.h',
+]
+
 app_sources = [
   'gdict-about.c',
   'gdict-app.c',
   'gdict-app.h',
+  'gdict-client-context.c',
   'gdict-common.c',
+  'gdict-context.c',
+  'gdict-database-chooser.c',
+  'gdict-database-chooser-button.c',
+  'gdict-defbox.c',
   'gdict-pref-dialog.c',
   'gdict-print.c',
   'gdict-sidebar.c',
+  'gdict-source-chooser.c',
   'gdict-source-dialog.c',
+  'gdict-source-loader.c',
+  'gdict-source.c',
+  'gdict-speller.c',
+  'gdict-strategy-chooser.c',
+  'gdict-utils.c',
   'gdict-window.c',
   'main.c',
 ]
 
-resources = gnome.compile_resources ('gdict-resources',
+gdict_enums = gnome.mkenums('gdict-enum-types',
+  sources: gdict_headers,
+  h_template: 'gdict-enum-types.h.in',
+  c_template: 'gdict-enum-types.c.in',
+  install_header: false,
+)
+
+gdict_marshal = gnome.genmarshal('gdict-marshal',
+  sources: 'gdict-marshal.list',
+  prefix: 'gdict_marshal',
+)
+
+gdict_resources = gnome.compile_resources('gdict-resources',
   'gdict.gresource.xml',
   source_dir: '.',
   c_name: 'gdict',
 )
 
 gdict_cflags = [
+  '-D_GNU_SOURCE',
+  '-DG_LOG_DOMAIN="Gdict"',
+  '-DG_LOG_USE_STRUCTURED=1',
   '-DPREFIX="@0@"'.format(gdict_prefix),
   '-DSYSCONFDIR="@0@"'.format(gdict_sysconfdir),
   '-DLIBDIR="@0@"'.format(gdict_libdir),
@@ -25,6 +70,11 @@ gdict_cflags = [
   '-DPKGDATADIR="@0@"'.format(join_paths(gdict_datadir, 'gnome-dictionary')),
   '-DGNOMELOCALEDIR="@0@"'.format(join_paths(gdict_datadir, 'locale')),
   '-DAPPLICATION_ID="@0@"'.format(application_id),
+  '-DGDICTSOURCESDIR="@0@"'.format(join_paths(gdict_datadir, 'gdict-1.0', 'sources')),
+  '-DGDICT_ENABLE_INTERNALS=1',
+  '-DGDICT_MAJOR_VERSION=@0@'.format(libgdict_major),
+  '-DGDICT_MINOR_VERSION=@0@'.format(libgdict_minor),
+  '-DGDICT_MICRO_VERSION=@0@'.format(libgdict_micro),
 ]
 
 if profile == 'devel' or gdict_minor_version in ['alpha', 'beta', 'rc']
@@ -36,9 +86,9 @@ endif
 mathlib = cc.find_library('m', required: false)
 
 executable('gnome-dictionary',
-  sources: app_sources + resources,
+  sources: [ app_sources, gdict_enums, gdict_marshal, gdict_resources ],
   c_args: gdict_cflags,
-  dependencies: [ libgdict_dep, mathlib ],
+  dependencies: [ gio_dep, gtk_dep, ipv6_deps, mathlib ],
   include_directories: root_inc,
   install: true,
 )