[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 df65d949e0435d3f144f0c6bfd7a10d69428934e..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
@@ -18,18 +17,11 @@ uidir = $(pkgdatadir)
 ui_DATA =                              \
        evince-ui.xml                   \
        evince-toolbar.xml              \
-       hand-open.png                   \
-       $(NULL)
-
-#
-# Glade
-#
+       hand-open.png
 
-gladedir = $(pkgdatadir)
-glade_DATA =                           \
-       evince-password.glade           \
-       evince-properties.glade         \
-       $(NULL)
+if ENABLE_PREVIEWER
+ui_DATA += evince-previewer-ui.xml
+endif
 
 #
 # Desktop file
@@ -43,40 +35,34 @@ DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in.in=.desktop)
 desktopdir = $(datadir)/applications
 desktop_DATA = $(DESKTOP_FILES)
 
+#
+# DBus servide file
+#
+if ENABLE_DBUS
+servicedir = $(datadir)/dbus-1/services
+service_in_files = org.gnome.evince.Daemon.service.in
+service_DATA = $(service_in_files:.service.in=.service)
+
+$(service_DATA): $(service_in_files) Makefile
+       $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+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)
 
-@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
+# include the appropriate makefile rules for schema handling
+@GSETTINGS_RULES@
 
-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
+gsettingsconvertdir = $(datadir)/GConf/gsettings
+gsettingsconvert_DATA = evince.convert
 
 #
 # GTK icon cache
@@ -84,12 +70,15 @@ endif
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+
 update-icon-cache:
        if test -z "$(DESTDIR)"; then \
                echo "Updating Gtk icon cache."; \
                $(gtk_update_icon_cache); \
        else \
-               echo "*** Icon cache not updated.  After install, run this:"; \
+               echo "*** Icon cache not updated.  After (un)install, run this:"; \
                echo "***   $(gtk_update_icon_cache)"; \
                fi
 
@@ -98,13 +87,15 @@ update-icon-cache:
 # Extra files to be included in the tarball
 #
 
-EXTRA_DIST =                           \
-       $(glade_DATA)                   \
-       $(ui_DATA)                      \
-       $(DESKTOP_IN_FILES)             \
-       $(schema_in_files)              \
-       $(man_MANS)                     \
-       $(NULL)                         
+EXTRA_DIST =                                   \
+       $(ui_DATA)                              \
+       $(DESKTOP_IN_FILES)                     \
+       $(gsettingsschema_in_files)             \
+       org.gnome.evince.Daemon.service.in      \
+       $(man_MANS)                             \
+       evince.ico                              \
+       evince.convert                          \
+       $(NULL)
 
 #
 # Clean up properly
@@ -112,6 +103,7 @@ EXTRA_DIST =                                \
 
 DISTCLEANFILES = \
        $(DESKTOP_FILES)        \
-       $(schema_DATA)
-
+       $(gsettings_SCHEMAS)    \
+       $(service_DATA)
 
+-include $(top_srcdir)/git.mk