[dualscreen] fix crash on ctrl+w and fix control window closing

[evince.git] / data / Makefile.am

diff --git a/data/Makefile.am b/data/Makefile.am
index a3c4e2293aa8252166c468ffc66e9dcd63041c8a..f4295df5a0daeec5204e287fd532dca71ef9c825 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,8 +1,7 @@
 SUBDIRS = icons
 NULL=
 
-install-data-local: install-schemas update-icon-cache
-uninstall-local: uninstall-schemas
+install-data-local: update-icon-cache
 
 #
 # man file
@@ -49,46 +48,21 @@ $(service_DATA): $(service_in_files) Makefile
 endif
 
 #
-# GConf schema
+# GSettings schema
 #
+gsettingsschema_in_files = org.gnome.Evince.gschema.xml.in
+# gsettings_SCHEMAS is a list of all the schemas you want to install
+gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
 
-if WITH_GCONF
-@INTLTOOL_SCHEMAS_RULE@
+.PRECIOUS: $(gsettings_SCHEMAS)
 
-schema_in_files = evince.schemas.in
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+@INTLTOOL_XML_NOMERGE_RULE@
 
-install-schemas: $(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 \
-                       $(top_builddir)/data/$$p; \
-       done \
-       fi
-endif
-
-uninstall-schemas: $(schema_DATA)
-if GCONF_SCHEMAS_INSTALL
-       if test -z "$(DESTDIR)" ; then \
-       for p in $^ ; do \
-               GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
-                       $(GCONFTOOL) \
-                       --makefile-uninstall-rule \
-                       $(top_builddir)/data/$$p; \
-       done \
-       fi
-endif
+# include the appropriate makefile rules for schema handling
+@GSETTINGS_RULES@
 
-else
-
-install-schemas:
-uninstall-schemas:
-
-endif
+gsettingsconvertdir = $(datadir)/GConf/gsettings
+gsettingsconvert_DATA = evince.convert
 
 #
 # GTK icon cache
@@ -116,9 +90,11 @@ update-icon-cache:
 EXTRA_DIST =                                   \
        $(ui_DATA)                              \
        $(DESKTOP_IN_FILES)                     \
-       $(schema_in_files)                      \
+       $(gsettingsschema_in_files)             \
        org.gnome.evince.Daemon.service.in      \
        $(man_MANS)                             \
+       evince.ico                              \
+       evince.convert                          \
        $(NULL)
 
 #
@@ -127,7 +103,7 @@ EXTRA_DIST =                                        \
 
 DISTCLEANFILES = \
        $(DESKTOP_FILES)        \
-       $(schema_DATA)          \
+       $(gsettings_SCHEMAS)    \
        $(service_DATA)
 
 -include $(top_srcdir)/git.mk