GNOME.org
 

[tracker/data-in-binary-dirs: 8/10] data: Moved data/gschemas to module specific directories

commit f4736aada7fadb4955db128053bad4f84b9335ab
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Sep 25 17:54:09 2014 +0100

    data: Moved data/gschemas to module specific directories

 configure.ac                                       |    1 -
 data/Makefile.am                                   |    2 +-
 data/gschemas/Makefile.am                          |   29 --------------------
 src/libtracker-data/.gitignore                     |    2 +
 src/libtracker-data/Makefile.am                    |   21 +++++++++++---
 .../org.freedesktop.Tracker.DB.gschema.xml.in      |    0
 {data/gschemas => src/libtracker-fts}/.gitignore   |    0
 src/libtracker-fts/Makefile.am                     |   14 +++++++++
 .../org.freedesktop.Tracker.FTS.gschema.xml.in     |    0
 src/miners/fs/.gitignore                           |    2 +
 src/miners/fs/Makefile.am                          |   16 +++++++++-
 ....freedesktop.Tracker.Miner.Files.gschema.xml.in |    0
 src/tracker-extract/.gitignore                     |    2 +
 src/tracker-extract/Makefile.am                    |   15 +++++++++-
 .../org.freedesktop.Tracker.Extract.gschema.xml.in |    0
 src/tracker-store/.gitignore                       |    2 +
 src/tracker-store/Makefile.am                      |   17 ++++++++++-
 .../org.freedesktop.Tracker.Store.gschema.xml.in   |    0
 .../org.freedesktop.Tracker.gschema.xml.in         |    0
 src/tracker-writeback/.gitignore                   |    2 +
 src/tracker-writeback/Makefile.am                  |   14 ++++++++-
 ...rg.freedesktop.Tracker.Writeback.gschema.xml.in |    0
 22 files changed, 96 insertions(+), 43 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e35104a..20c8dc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2556,7 +2556,6 @@ AM_CONDITIONAL(HAVE_ARTWORK, test "x$have_artwork" = "xyes")
 ##################################################################
 
 AC_CONFIG_FILES([
-       data/gschemas/Makefile
        data/Makefile
        data/miners/Makefile
        docs/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 1c1b51a..c22d56d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1 +1 @@
-SUBDIRS = miners gschemas
+SUBDIRS = miners
diff --git a/src/libtracker-data/.gitignore b/src/libtracker-data/.gitignore
index 26dc729..79d98d4 100644
--- a/src/libtracker-data/.gitignore
+++ b/src/libtracker-data/.gitignore
@@ -4,3 +4,5 @@ tracker-sparql-query.[ch]
 tracker-sparql-query.vapi
 tracker-sparql-scanner.c
 tracker-turtle-reader.c
+*.xml
+*.valid
diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am
index 2a54454..f1b28d1 100644
--- a/src/libtracker-data/Makefile.am
+++ b/src/libtracker-data/Makefile.am
@@ -74,8 +74,21 @@ noinst_HEADERS =                                       \
        tracker-property.h                             \
        tracker-sparql-query.h
 
-BUILT_SOURCES =                                        \
-       libtracker_data_la_vala.stamp
+# Configuration / GSettings
+gsettings_ENUM_NAMESPACE = org.freedesktop.Tracker
+gsettings_ENUM_FILES = $(top_srcdir)/src/libtracker-common/tracker-enums.h
 
-EXTRA_DIST =                                           \
-       libtracker-data.vapi
+gsettings_SCHEMAS = org.freedesktop.Tracker.DB.gschema.xml
+
+ INTLTOOL_XML_NOMERGE_RULE@
+
+ GSETTINGS_RULES@
+
+# Dist / Clean rules for all data
+BUILT_SOURCES = \
+       libtracker_data_la_vala.stamp \
+       $(gsettings_SCHEMAS)
+
+EXTRA_DIST = \
+       libtracker-data.vapi \
+       $(gsettings_SCHEMAS:.xml=.xml.in)
diff --git a/data/gschemas/org.freedesktop.Tracker.DB.gschema.xml.in 
b/src/libtracker-data/org.freedesktop.Tracker.DB.gschema.xml.in
similarity index 100%
rename from data/gschemas/org.freedesktop.Tracker.DB.gschema.xml.in
rename to src/libtracker-data/org.freedesktop.Tracker.DB.gschema.xml.in
diff --git a/data/gschemas/.gitignore b/src/libtracker-fts/.gitignore
similarity index 100%
rename from data/gschemas/.gitignore
rename to src/libtracker-fts/.gitignore
diff --git a/src/libtracker-fts/Makefile.am b/src/libtracker-fts/Makefile.am
index f5a23a3..322365e 100644
--- a/src/libtracker-fts/Makefile.am
+++ b/src/libtracker-fts/Makefile.am
@@ -54,3 +54,17 @@ libtracker_fts_la_LIBADD =                             \
        $(LIBTRACKER_FTS_LIBS)
 
 EXTRA_DIST = $(fts4_sources)
+
+# Configuration / GSettings
+gsettings_ENUM_NAMESPACE = org.freedesktop.Tracker
+gsettings_ENUM_FILES = $(top_srcdir)/src/libtracker-common/tracker-enums.h
+
+gsettings_SCHEMAS = org.freedesktop.Tracker.FTS.gschema.xml
+
+ INTLTOOL_XML_NOMERGE_RULE@
+
+ GSETTINGS_RULES@
+
+# Dist / Clean rules for all data
+CLEANFILES = $(gsettings_SCHEMAS)
+EXTRA_DIST += $(gsettings_SCHEMAS:.xml=.xml.in)
diff --git a/data/gschemas/org.freedesktop.Tracker.FTS.gschema.xml.in 
b/src/libtracker-fts/org.freedesktop.Tracker.FTS.gschema.xml.in
similarity index 100%
rename from data/gschemas/org.freedesktop.Tracker.FTS.gschema.xml.in
rename to src/libtracker-fts/org.freedesktop.Tracker.FTS.gschema.xml.in
diff --git a/src/miners/fs/.gitignore b/src/miners/fs/.gitignore
index 064ac11..b554dc2 100644
--- a/src/miners/fs/.gitignore
+++ b/src/miners/fs/.gitignore
@@ -1,2 +1,4 @@
 tracker-miner-fs
 *.service
+*.xml
+*.valid
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index 495d724..747a02c 100644
--- a/src/miners/fs/Makefile.am
+++ b/src/miners/fs/Makefile.am
@@ -81,5 +81,17 @@ autostart_DATA = tracker-miner-fs.desktop
 
 @INTLTOOL_DESKTOP_RULE@
 
-CLEANFILES = $(autostart_DATA) $(desktop_in_files) $(service_DATA)
-EXTRA_DIST = $(desktop_in_in_files) $(config_DATA) $(service_in_files)
+# Configuration / GSettings
+gsettings_ENUM_NAMESPACE = org.freedesktop.Tracker
+gsettings_ENUM_FILES = $(top_srcdir)/src/libtracker-common/tracker-enums.h
+
+gsettings_SCHEMAS = org.freedesktop.Tracker.Miner.Files.gschema.xml
+
+ INTLTOOL_XML_NOMERGE_RULE@
+
+ GSETTINGS_RULES@
+
+# Dist / Clean rules for all data
+CLEANFILES = $(autostart_DATA) $(desktop_in_files) $(service_DATA) $(gsettings_SCHEMAS)
+EXTRA_DIST = $(desktop_in_in_files) $(config_DATA) $(service_in_files) $(gsettings_SCHEMAS:.xml=.xml.in)
+
diff --git a/data/gschemas/org.freedesktop.Tracker.Miner.Files.gschema.xml.in 
b/src/miners/fs/org.freedesktop.Tracker.Miner.Files.gschema.xml.in
similarity index 100%
rename from data/gschemas/org.freedesktop.Tracker.Miner.Files.gschema.xml.in
rename to src/miners/fs/org.freedesktop.Tracker.Miner.Files.gschema.xml.in
diff --git a/src/tracker-extract/.gitignore b/src/tracker-extract/.gitignore
index 0ec6299..7e3acbd 100644
--- a/src/tracker-extract/.gitignore
+++ b/src/tracker-extract/.gitignore
@@ -3,3 +3,5 @@ tracker-extract-priority-dbus-stamp
 tracker-extract-priority-dbus.c
 tracker-extract-priority-dbus.h
 *.service
+*.xml
+*.valid
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index 2c1adb1..b191978 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -616,5 +616,16 @@ autostart_DATA = tracker-extract.desktop
 
 @INTLTOOL_DESKTOP_RULE@
 
-CLEANFILES += $(autostart_DATA) $(desktop_in_files) $(service_DATA)
-EXTRA_DIST += $(desktop_in_in_files) $(config_DATA) $(service_in_files)
+# Configuration / GSettings
+gsettings_ENUM_NAMESPACE = org.freedesktop.Tracker
+gsettings_ENUM_FILES = $(top_srcdir)/src/libtracker-common/tracker-enums.h
+
+gsettings_SCHEMAS = org.freedesktop.Tracker.Extract.gschema.xml
+
+ INTLTOOL_XML_NOMERGE_RULE@
+
+ GSETTINGS_RULES@
+
+# Dist / Clean rules for all data
+CLEANFILES += $(autostart_DATA) $(desktop_in_files) $(service_DATA) $(gsettings_SCHEMAS)
+EXTRA_DIST += $(desktop_in_in_files) $(config_DATA) $(service_in_files) $(gsettings_SCHEMAS:.xml=.xml.in)
diff --git a/data/gschemas/org.freedesktop.Tracker.Extract.gschema.xml.in 
b/src/tracker-extract/org.freedesktop.Tracker.Extract.gschema.xml.in
similarity index 100%
rename from data/gschemas/org.freedesktop.Tracker.Extract.gschema.xml.in
rename to src/tracker-extract/org.freedesktop.Tracker.Extract.gschema.xml.in
diff --git a/src/tracker-store/.gitignore b/src/tracker-store/.gitignore
index 38b95cb..4045ead 100644
--- a/src/tracker-store/.gitignore
+++ b/src/tracker-store/.gitignore
@@ -9,3 +9,5 @@ tracker-steroids.c
 tracker-store.c
 tracker-store.h
 *.service
+*.xml
+*.valid
diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am
index 1e47ad2..91c38f0 100644
--- a/src/tracker-store/Makefile.am
+++ b/src/tracker-store/Makefile.am
@@ -94,7 +94,20 @@ autostart_DATA = tracker-store.desktop
 
 @INTLTOOL_DESKTOP_RULE@
 
-CLEANFILES = $(autostart_DATA) $(desktop_in_files) $(service_DATA)
-EXTRA_DIST += $(desktop_in_in_files) $(service_in_files) $(config_DATA)
+# Configuration / GSettings
+gsettings_ENUM_NAMESPACE = org.freedesktop.Tracker
+gsettings_ENUM_FILES = $(top_srcdir)/src/libtracker-common/tracker-enums.h
+
+gsettings_SCHEMAS = \
+       org.freedesktop.Tracker.gschema.xml \
+       org.freedesktop.Tracker.Store.gschema.xml
+
+ INTLTOOL_XML_NOMERGE_RULE@
+
+ GSETTINGS_RULES@
+
+# Dist / Clean rules for all data
+CLEANFILES = $(autostart_DATA) $(desktop_in_files) $(service_DATA) $(gsettings_SCHEMAS)
+EXTRA_DIST += $(desktop_in_in_files) $(service_in_files) $(config_DATA) $(gsettings_SCHEMAS:.xml=.xml.in)
 
 
diff --git a/data/gschemas/org.freedesktop.Tracker.Store.gschema.xml.in 
b/src/tracker-store/org.freedesktop.Tracker.Store.gschema.xml.in
similarity index 100%
rename from data/gschemas/org.freedesktop.Tracker.Store.gschema.xml.in
rename to src/tracker-store/org.freedesktop.Tracker.Store.gschema.xml.in
diff --git a/data/gschemas/org.freedesktop.Tracker.gschema.xml.in 
b/src/tracker-store/org.freedesktop.Tracker.gschema.xml.in
similarity index 100%
rename from data/gschemas/org.freedesktop.Tracker.gschema.xml.in
rename to src/tracker-store/org.freedesktop.Tracker.gschema.xml.in
diff --git a/src/tracker-writeback/.gitignore b/src/tracker-writeback/.gitignore
index 7d4fd4f..a6d2e38 100644
--- a/src/tracker-writeback/.gitignore
+++ b/src/tracker-writeback/.gitignore
@@ -1,2 +1,4 @@
 tracker-writeback
 *.service
+*.xml
+*.valid
diff --git a/src/tracker-writeback/Makefile.am b/src/tracker-writeback/Makefile.am
index a00fcdb..391c7eb 100644
--- a/src/tracker-writeback/Makefile.am
+++ b/src/tracker-writeback/Makefile.am
@@ -75,6 +75,16 @@ service_in_files = org.freedesktop.Tracker1.Writeback.service.in
 servicedir = $(DBUS_SERVICES_DIR)
 service_DATA = org.freedesktop.Tracker1.Writeback.service
 
-EXTRA_DIST = $(service_in_files) $(config_DATA)
+# Configuration / GSettings
+gsettings_ENUM_NAMESPACE = org.freedesktop.Tracker
+gsettings_ENUM_FILES = $(top_srcdir)/src/libtracker-common/tracker-enums.h
 
-CLEANFILES = $(service_DATA)
+gsettings_SCHEMAS = org.freedesktop.Tracker.Writeback.gschema.xml
+
+ INTLTOOL_XML_NOMERGE_RULE@
+
+ GSETTINGS_RULES@
+
+# Dist / Clean rules for all data
+CLEANFILES = $(service_DATA) $(gsettings_SCHEMA)
+EXTRA_DIST = $(service_in_files) $(config_DATA) $(gsettings_SCHEMAS:.xml=.xml.in)
diff --git a/data/gschemas/org.freedesktop.Tracker.Writeback.gschema.xml.in 
b/src/tracker-writeback/org.freedesktop.Tracker.Writeback.gschema.xml.in
similarity index 100%
rename from data/gschemas/org.freedesktop.Tracker.Writeback.gschema.xml.in
rename to src/tracker-writeback/org.freedesktop.Tracker.Writeback.gschema.xml.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]