diff options
| author | Diego Escalante Urrelo <descalante@igalia.com> | 2010-07-25 07:59:55 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@gnome.org> | 2010-10-08 17:09:11 +0800 |
| commit | 5df7af9e3041102a5f5601d60faa11c38b48de75 (patch) | |
| tree | fe0306b87e0874a8541a082fe844f4a487331161 /data/Makefile.am | |
| parent | 60d08f64c2466ce8eda20d832239ec6defc9ef06 (diff) | |
| download | gsoc2013-epiphany-5df7af9e3041102a5f5601d60faa11c38b48de75.tar gsoc2013-epiphany-5df7af9e3041102a5f5601d60faa11c38b48de75.tar.gz gsoc2013-epiphany-5df7af9e3041102a5f5601d60faa11c38b48de75.tar.bz2 gsoc2013-epiphany-5df7af9e3041102a5f5601d60faa11c38b48de75.tar.lz gsoc2013-epiphany-5df7af9e3041102a5f5601d60faa11c38b48de75.tar.xz gsoc2013-epiphany-5df7af9e3041102a5f5601d60faa11c38b48de75.tar.zst gsoc2013-epiphany-5df7af9e3041102a5f5601d60faa11c38b48de75.zip | |
gsettings: port epiphany to gsettings
Adds our own schemas, a migration file and removes old gconf API and files.
Bug #624485
Diffstat (limited to 'data/Makefile.am')
| -rw-r--r-- | data/Makefile.am | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 87f8c1d8e..e6ab83e4a 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,16 +2,21 @@ SUBDIRS = art glade icons ui @INTLTOOL_SERVER_RULE@ @INTLTOOL_DESKTOP_RULE@ -@INTLTOOL_SCHEMAS_RULE@ -@INTLTOOL_XML_RULE@ desktop_in_files = epiphany.desktop.in.in bme.desktop.in.in desktopdir = $(datadir)/applications desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) -schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_in_files = epiphany.schemas.in epiphany-lockdown.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) +convertdir = $(datarootdir)/GConf/gsettings +convert_DATA = epiphany.convert + +gsettings_ENUM_NAMESPACE = org.gnome.Epiphany +gsettings_ENUM_FILES = $(top_srcdir)/lib/ephy-prefs.h + +gsettings_files = org.gnome.epiphany.gschema.xml.in +gsettings_SCHEMAS = $(gsettings_files:.xml.in=.xml) +@INTLTOOL_XML_NOMERGE_RULE@ +@GSETTINGS_RULES@ aboutdir = $(pkgdatadir) about_DATA = epiphany.xhtml @@ -53,19 +58,9 @@ $(default_bookmarks_DATA): $(default_bookmarks_in_files) Makefile $(INTLTOOL_MER sed -e "s|\@pkgdatadir\@|$(pkgdatadir)|g" $@.tmp > $@ || rm -f $@.tmp rm -f $@.tmp -install-data-local: $(schema_DATA) -if GCONF_SCHEMAS_INSTALL - if test -z "$(DESTDIR)" ; then \ - for p in $^ ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \ - done \ - fi -endif - EXTRA_DIST = \ $(aboutdialog_DATA) \ $(service_in_files) \ - $(schema_in_files) \ $(desktop_in_files) \ $(about_DATA) \ $(mimepermission_DATA) \ @@ -74,12 +69,14 @@ EXTRA_DIST = \ $(service_DATA) \ $(m4data_DATA) \ $(default_bookmarks_in_files) \ + $(gsettings_files) \ + $(convert_DATA) \ epiphany-service.xml \ check-mime.py DISTCLEANFILES = \ - $(service_DATA) \ - $(schema_in_files:.schemas.in=.schemas) \ - $(pkgconfig_DATA) \ - $(desktop_DATA) \ - $(default_bookmarks_DATA) + $(service_DATA) \ + $(pkgconfig_DATA) \ + $(desktop_DATA) \ + $(default_bookmarks_DATA) \ + $(gsettings_SCHEMAS) |