[tracker/wip/sam/meson: 88/90] Improvements

[Sam Thursfield <sthursfield src gnome org>]

commit c539de4b5985fe1d2a2bd83e8ac7777d41c49695
Author: Sam Thursfield <sam afuera me uk>
Date:   Mon Nov 21 21:54:23 2016 +0000

    Improvements

 docs/reference/libtracker-miner/meson.build  |    1 +
 docs/reference/libtracker-sparql/meson.build |    1 +
 meson.build                                  |   19 +++++++++----------
 src/libtracker-bus/meson.build               |    2 --
 src/libtracker-sparql-backend/meson.build    |   10 ++++++++--
 src/libtracker-sparql/meson.build            |   18 ++++++++++++++++++
 src/meson.build                              |    1 +
 7 files changed, 38 insertions(+), 14 deletions(-)
---
diff --git a/docs/reference/libtracker-miner/meson.build b/docs/reference/libtracker-miner/meson.build
index 699a37f..6a2a33b 100644
--- a/docs/reference/libtracker-miner/meson.build
+++ b/docs/reference/libtracker-miner/meson.build
@@ -5,4 +5,5 @@ configure_file(input: 'version.xml.in',
 gnome.gtkdoc('libtracker-miner',
     src_dir: '../../../src/libtracker-miner',
     main_sgml: 'libtracker-miner-docs.sgml',
+    content_files: ['overview.sgml'],
     install: true)
diff --git a/docs/reference/libtracker-sparql/meson.build b/docs/reference/libtracker-sparql/meson.build
index 56e25a2..522c339 100644
--- a/docs/reference/libtracker-sparql/meson.build
+++ b/docs/reference/libtracker-sparql/meson.build
@@ -5,4 +5,5 @@ configure_file(input: 'version.xml.in',
 gnome.gtkdoc('libtracker-sparql',
     src_dir: '../../../src/libtracker-sparql',
     main_sgml: 'libtracker-sparql-docs.sgml',
+    content_files: ['overview.sgml', 'examples.sgml'],
     install: true)
diff --git a/meson.build b/meson.build
index b1cb98a..7de5cca 100644
--- a/meson.build
+++ b/meson.build
@@ -1,12 +1,14 @@
 # Experimental, incomplete build instructions for Tracker using
 # Meson: http://www.mesonbuild.com/
 #
+# Requires Meson 0.36.0 or newer.
+#
 # Open questions:
 #   - is the installed version identical to an installed
 #     autotools build?
 #   - does crossbuilding (e.g. in Buildroot) work correctly?
 
-project('tracker', 'c', 'vala', 'cpp', version: '1.11.0')
+project('tracker', 'c', 'vala', 'cpp', version: '1.11.1')
 
 gnome = import('gnome')
 i18n = import('i18n')
@@ -44,6 +46,7 @@ gupnp_dlna = dependency('gupnp-dlna-2.0', version: '> 0.9.4', required: false)
 hal = dependency('hal', version: '> 0.5', required: false)
 icu_i18n = dependency('icu-i18n', version: '> 4.8.1.1', required: false)
 icu_uc = dependency('icu-uc', version: '> 4.8.1.1', required: false)
+json_glib = dependency('json-glib-1.0', version: '>= 1.0', required: true)
 libemail_utils = dependency('libemail-utils', required: false)
 libemail_engine = dependency('libemail-engine', required: false)
 libexif = dependency('libexif', version: '> 0.6', required: false)
@@ -53,6 +56,7 @@ libiptcdata = dependency('libiptcdata', required: false)
 libmediaart = dependency('libmediaart', version: '> 1.9.0', required: false)
 libosinfo = dependency('libosinfo', version: '> 0.2.9', required: false)
 libpng = dependency('libpng', version: '> 0.89', required: false)
+libsoup = dependency('libsoup-2.4', version: '> 2.40', required: true)
 libtiff = dependency('libtiff-4', required: false)
 libxml2 = dependency('libxml-2.0', version: '> 2.6')
 libvorbis = dependency('vorbisfile', version: '> 0.22')
@@ -273,15 +277,10 @@ elif sqlite.version().version_compare('3.8.4.2')
   sqlite_safe = false
 endif
 
-message('Build Configuration:\n')
-message('    Prefix:                                 ' + get_option('prefix'))
-message('    Source code location:                   ' + meson.source_root())
-message('    Compiler:                               ' + meson.get_compiler('c').get_id())
-
-#>---Enable gtk doc (for documentation):     $enable_gtk_doc
-#
-#>---Enable functional tests:                $enable_functional_tests
-#>---Enable unit tests:                      $have_unit_tests
+summary = 'Build Configuration:\n'
+summary += '    Prefix:                                 ' + get_option('prefix')
+summary += '    Source code location:                   ' + meson.source_root()
+summary += '    Compiler:                               ' + meson.get_compiler('c').get_id()
 
 message('Feature Support:\n')
 #message('    Support for HAL:                        $have_hal')
diff --git a/src/libtracker-bus/meson.build b/src/libtracker-bus/meson.build
index 47d1efc..a13f307 100644
--- a/src/libtracker-bus/meson.build
+++ b/src/libtracker-bus/meson.build
@@ -4,8 +4,6 @@ libtracker_bus = static_library('tracker-bus',
     'tracker-array-cursor.vala',
     'tracker-bus-fd-cursor.vala',
     '../libtracker-common/libtracker-common.vapi',
-    #link_with: [libtracker_common, libtracker_sparql_intermediate, libtracker_sparql_intermediate_vala],
-    #dependencies: [gio, gio_unix],
     dependencies: [tracker_common_dep, tracker_sparql_intermediate_dep],
     c_args: [
         '-DNO_LIBDBUS',
diff --git a/src/libtracker-sparql-backend/meson.build b/src/libtracker-sparql-backend/meson.build
index e519076..aa66457 100644
--- a/src/libtracker-sparql-backend/meson.build
+++ b/src/libtracker-sparql-backend/meson.build
@@ -1,8 +1,14 @@
 libtracker_sparql = library('tracker-sparql-' + tracker_api_version,
     'tracker-backend.vala',
-    dependencies: [tracker_common_dep, tracker_bus_dep, tracker_direct_dep],
+    dependencies: [
+        tracker_common_dep, tracker_bus_dep, tracker_direct_dep,
+        tracker_remote_dep
+    ]
 )
 tracker_sparql_dep = declare_dependency(
     link_with: [libtracker_sparql, libtracker_common],
-    dependencies: [tracker_common_dep, tracker_data_dep, tracker_sparql_intermediate_dep],
+    dependencies: [
+        tracker_common_dep, tracker_data_dep, tracker_sparql_intermediate_dep,
+        json_glib, libsoup, libxml2
+    ],
 )
diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build
index 58d8814..732282c 100644
--- a/src/libtracker-sparql/meson.build
+++ b/src/libtracker-sparql/meson.build
@@ -1,5 +1,21 @@
 tracker_sparql_intermediate_dependencies = [tracker_common_dep]
 
+
+tracker_sparql_enum_types_header = custom_target('tracker-sparql-enum-types-header',
+    input: ['tracker-sparql -enum-types.h.template', 'tracker-sparql-enums.h'],
+    output: 'tracker-sparql-enum-types.h',
+    command: [glib_mkenums, '--template', '@INPUT0@', '@INPUT1@'],
+    capture: true
+)
+
+tracker_sparql_enum_types_code = custom_target('tracker-sparql-enum-types-code',
+    input: ['tracker-sparql-enum-types.c.template', 'tracker-sparql-enums.h'],
+    output: 'tracker-sparql-enum-types.c',
+    command: [glib_mkenums, '--template', '@INPUT0@', '@INPUT1@'],
+    capture: true
+)
+
+
 libtracker_sparql_intermediate = static_library('tracker-sparql-' + tracker_api_version,
     'tracker-namespace.vala',
     'tracker-builder.vala',
@@ -7,7 +23,9 @@ libtracker_sparql_intermediate = static_library('tracker-sparql-' + tracker_api_
     'tracker-cursor.vala',
     'tracker-utils.vala',
     'tracker-namespace-manager.c',
+    'tracker-notifier.c',
     'tracker-resource.c',
+    'tracker-sparql-enum-types.c',
     'tracker-uri.c',
     'tracker-version.c',
     vala_header: 'tracker-generated.h',
diff --git a/src/meson.build b/src/meson.build
index e70a7d3..95d436d 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -14,6 +14,7 @@ subdir('libtracker-data')
 # Public libtracker-sparql library
 subdir('libtracker-bus')
 subdir('libtracker-direct')
+subdir('libtracker-remote')
 subdir('libtracker-sparql-backend')
 
 # Public libtracker-miner library