Migrated org.gnome.evolution.shell.network-config.gschema.xml.in to data/ directory.

The gsettings schemas need to all be stored and installed from the data/
directory, this is because we compile them locally in-tree and set the
GSETTINGS_SCHEMA_DIR to a local directory in order to run our tests
at make check time (tests dont work without this, instead GSettings wants
to abort for a missing schema).

diff --git a/data/Makefile.am b/data/Makefile.am
index 31a90ab..0da5e8a 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,8 @@
 gsettings_SCHEMAS =                                            \
        org.gnome.Evolution.DefaultSources.gschema.xml          \
        org.gnome.evolution-data-server.calendar.gschema.xml    \
-       org.gnome.evolution-data-server.addressbook.gschema.xml
+       org.gnome.evolution-data-server.addressbook.gschema.xml \
+       org.gnome.evolution.shell.network-config.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
 

diff --git a/services/evolution-source-registry/org.gnome.evolution.shell.network-config.gschema.xml.in b/data/org.gnome.evolution.shell.network-config.gschema.xml.in
similarity index 100%
rename from services/evolution-source-registry/org.gnome.evolution.shell.network-config.gschema.xml.in
rename to data/org.gnome.evolution.shell.network-config.gschema.xml.in

diff --git a/services/evolution-source-registry/Makefile.am b/services/evolution-source-registry/Makefile.am
index 6d0e5c0..8eafbd8 100644 (file)
--- a/services/evolution-source-registry/Makefile.am
+++ b/services/evolution-source-registry/Makefile.am
@@ -24,30 +24,20 @@ builtin_sources = $(builtin_sources_in_files:.source.in=.source)
 %.source: %.source.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)
        $(AM_V_GEN) $(MKDIR_P) builtin && LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
 
-gsettings_SCHEMAS = org.gnome.evolution.shell.network-config.gschema.xml
-@INTLTOOL_XML_NOMERGE_RULE@
-@GSETTINGS_RULES@
-
 service_in_files = org.gnome.evolution.dataserver.Sources.service.in
 servicedir = $(datadir)/dbus-1/services
 service_DATA = $(service_in_files:.service.in=.service)
 @EVO_SUBST_SERVICE_RULE@
 
-DISTCLEANFILES = \
-       $(gsettings_SCHEMAS) \
-       $(NULL)
-
 CLEANFILES = \
        $(BUILT_SOURCES) \
        $(builtin_sources) \
-       $(gsettings_SCHEMAS:.xml=.valid) \
        $(service_DATA) \
        $(NULL)
 
 EXTRA_DIST = \
        evolution-source-registry-resource.xml \
        $(builtin_sources_in_files) \
-       $(gsettings_SCHEMAS:.xml=.xml.in) \
        $(service_in_files) \
        $(NULL)