[tracker/wip/sam/resource: 16/22] Move tracker-namespace to libtracker-sparql

[Sam Thursfield <sthursfield src gnome org>]

commit bf6f3ce31deb5dda38e779af745d133581c998a6
Author: Sam Thursfield <sam afuera me uk>
Date:   Fri Apr 8 17:28:23 2016 +0100

    Move tracker-namespace to libtracker-sparql
    
    This means it's now public API. It's needed for TrackerResource.

 src/libtracker-data/Makefile.am                    |    2 --
 src/libtracker-data/tracker-class.c                |    1 -
 src/libtracker-data/tracker-data-manager.c         |    1 -
 src/libtracker-data/tracker-data.h                 |    1 -
 src/libtracker-data/tracker-ontologies.h           |    3 ++-
 src/libtracker-data/tracker-property.c             |    1 -
 src/libtracker-sparql-backend/Makefile.am          |    2 +-
 src/libtracker-sparql/Makefile.am                  |    3 +++
 .../tracker-namespace.c                            |    0
 .../tracker-namespace.h                            |   10 +++++-----
 src/libtracker-sparql/tracker-sparql.h             |    1 +
 11 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am
index 7835d1f..ffa83fe 100644
--- a/src/libtracker-data/Makefile.am
+++ b/src/libtracker-data/Makefile.am
@@ -39,7 +39,6 @@ libtracker_data_la_SOURCES =                           \
        tracker-db-manager.c                           \
        tracker-db-journal.c                           \
        tracker-db-backup.c                            \
-       tracker-namespace.c                            \
        tracker-ontology.c                             \
        tracker-ontologies.c                           \
        tracker-property.c
@@ -71,7 +70,6 @@ noinst_HEADERS =                                       \
        tracker-db-manager.h                           \
        tracker-db-journal.h                           \
        tracker-db-backup.h                            \
-       tracker-namespace.h                            \
        tracker-ontology.h                             \
        tracker-ontologies.h                           \
        tracker-property.h                             \
diff --git a/src/libtracker-data/tracker-class.c b/src/libtracker-data/tracker-class.c
index 3048560..f980579 100644
--- a/src/libtracker-data/tracker-class.c
+++ b/src/libtracker-data/tracker-class.c
@@ -26,7 +26,6 @@
 #include <glib.h>
 
 #include "tracker-class.h"
-#include "tracker-namespace.h"
 #include "tracker-ontologies.h"
 
 #define GET_PRIV(obj) (((TrackerClass*) obj)->priv)
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index 5a811bd..5338fc6 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -42,7 +42,6 @@
 #include "tracker-db-interface-sqlite.h"
 #include "tracker-db-manager.h"
 #include "tracker-db-journal.h"
-#include "tracker-namespace.h"
 #include "tracker-ontologies.h"
 #include "tracker-ontology.h"
 #include "tracker-property.h"
diff --git a/src/libtracker-data/tracker-data.h b/src/libtracker-data/tracker-data.h
index e25feb3..be6f68b 100644
--- a/src/libtracker-data/tracker-data.h
+++ b/src/libtracker-data/tracker-data.h
@@ -36,7 +36,6 @@
 #include "tracker-db-interface-sqlite.h"
 #include "tracker-db-journal.h"
 #include "tracker-db-manager.h"
-#include "tracker-namespace.h"
 #include "tracker-ontology.h"
 #include "tracker-ontologies.h"
 #include "tracker-property.h"
diff --git a/src/libtracker-data/tracker-ontologies.h b/src/libtracker-data/tracker-ontologies.h
index a0f7668..57fd9eb 100644
--- a/src/libtracker-data/tracker-ontologies.h
+++ b/src/libtracker-data/tracker-ontologies.h
@@ -23,8 +23,9 @@
 
 #include <glib-object.h>
 
+#include <libtracker-sparql/tracker-sparql.h>
+
 #include "tracker-class.h"
-#include "tracker-namespace.h"
 #include "tracker-ontology.h"
 #include "tracker-property.h"
 
diff --git a/src/libtracker-data/tracker-property.c b/src/libtracker-data/tracker-property.c
index 3f14c38..9dc533c 100644
--- a/src/libtracker-data/tracker-property.c
+++ b/src/libtracker-data/tracker-property.c
@@ -26,7 +26,6 @@
 
 #include <libtracker-sparql/tracker-sparql.h>
 
-#include "tracker-namespace.h"
 #include "tracker-ontologies.h"
 #include "tracker-property.h"
 
diff --git a/src/libtracker-sparql-backend/Makefile.am b/src/libtracker-sparql-backend/Makefile.am
index 2f0b14d..7ebe6a2 100644
--- a/src/libtracker-sparql-backend/Makefile.am
+++ b/src/libtracker-sparql-backend/Makefile.am
@@ -25,5 +25,5 @@ libtracker_sparql_ TRACKER_API_VERSION@_la_LIBADD =    \
 
 libtracker_sparql_ TRACKER_API_VERSION@_la_LDFLAGS =   \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-       -export-symbols-regex 
'^(tracker_sparql_(connection|cursor|builder|escape|error|value|get)_.*|tracker_resource_*)'
+       -export-symbols-regex 
'^(tracker_sparql_(connection|cursor|builder|escape|error|value|get)_.*|tracker_namespace_.*|tracker_resource_.*)'
 
diff --git a/src/libtracker-sparql/Makefile.am b/src/libtracker-sparql/Makefile.am
index becb1c2..593cd63 100644
--- a/src/libtracker-sparql/Makefile.am
+++ b/src/libtracker-sparql/Makefile.am
@@ -22,6 +22,8 @@ libtracker_sparql_la_SOURCES =   \
        tracker-builder.vala                           \
        tracker-connection.vala                        \
        tracker-cursor.vala                            \
+       tracker-namespace.c                            \
+       tracker-namespace.h                            \
        tracker-resource.c                             \
        tracker-resource.h                             \
        tracker-utils.vala                             \
@@ -50,6 +52,7 @@ tracker-sparql-$(TRACKER_API_VERSION).vapi: tracker-sparql.vapi
 
 libtracker_sparqlinclude_HEADERS =                     \
        $(vala_header)                                 \
+       tracker-namespace.h                            \
        tracker-ontologies.h \
        tracker-resource.h                             \
        tracker-sparql.h                               \
diff --git a/src/libtracker-data/tracker-namespace.c b/src/libtracker-sparql/tracker-namespace.c
similarity index 100%
rename from src/libtracker-data/tracker-namespace.c
rename to src/libtracker-sparql/tracker-namespace.c
diff --git a/src/libtracker-data/tracker-namespace.h b/src/libtracker-sparql/tracker-namespace.h
similarity index 90%
rename from src/libtracker-data/tracker-namespace.h
rename to src/libtracker-sparql/tracker-namespace.h
index 6d1cc7d..4806886 100644
--- a/src/libtracker-data/tracker-namespace.h
+++ b/src/libtracker-sparql/tracker-namespace.h
@@ -17,15 +17,15 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#ifndef __LIBTRACKER_DATA_NAMESPACE_H__
-#define __LIBTRACKER_DATA_NAMESPACE_H__
+#ifndef __LIBTRACKER_SPARQL_NAMESPACE_H__
+#define __LIBTRACKER_SPARQL_NAMESPACE_H__
 
 #include <glib-object.h>
 
 G_BEGIN_DECLS
 
-#if !defined (__LIBTRACKER_DATA_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-data/tracker-data.h> must be included directly."
+#if !defined (__LIBTRACKER_SPARQL_INSIDE__) && !defined (TRACKER_COMPILATION)
+#error "only <libtracker-sparql/tracker-sparql.h> must be included directly."
 #endif
 
 #define TRACKER_TYPE_NAMESPACE         (tracker_namespace_get_type ())
@@ -64,5 +64,5 @@ void              tracker_namespace_set_is_new    (TrackerNamespace *namespace_,
 
 G_END_DECLS
 
-#endif /* __LIBTRACKER_DATA_NAMESPACE_H__ */
+#endif /* __LIBTRACKER_SPARQL_NAMESPACE_H__ */
 
diff --git a/src/libtracker-sparql/tracker-sparql.h b/src/libtracker-sparql/tracker-sparql.h
index 4de6f1f..c1a92ba 100644
--- a/src/libtracker-sparql/tracker-sparql.h
+++ b/src/libtracker-sparql/tracker-sparql.h
@@ -24,6 +24,7 @@
 
 #include <libtracker-sparql/tracker-version.h>
 #include <libtracker-sparql/tracker-uri.h>
+#include <libtracker-sparql/tracker-namespace.h>
 #include <libtracker-sparql/tracker-ontologies.h>
 #include <libtracker-sparql/tracker-resource.h>
 #include <libtracker-sparql/tracker-generated.h>