X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=data%2FMakefile.am;h=5e05397145716e9cb644482ee57595cd05eb3a5a;hb=1dd619d11cc65d17b3fd08b650668fb3f85e35e9;hp=66f9bb2740dcbe1835bd9cd5e606c5339ae6242a;hpb=1d618ef40aedb77832eb05e038ba3599f5cae982;p=evince.git

diff --git a/data/Makefile.am b/data/Makefile.am
index 66f9bb27..5e053971 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,30 +1,61 @@
+SUBDIRS = icons
+
 @INTLTOOL_DESKTOP_RULE@
+@INTLTOOL_SCHEMAS_RULE@
 
-NULL =
+NULL=
 
 uidir = $(pkgdatadir)
 ui_DATA =				\
 	evince-ui.xml			\
+	evince-toolbar.xml		\
+	evince-preview-toolbar.xml		\
+	hand-open.png			\
 	$(NULL)
 
 gladedir = $(pkgdatadir)
 glade_DATA = 				\
 	evince-password.glade		\
+	evince-properties.glade		\
 	$(NULL)
 
-stockdir = $(datadir)/pixmaps/evince
-stock_DATA =				\
-        ev-stock-zoom-fit-width.png	\
-	$(NULL)
-
-DESKTOP_IN_FILES= evince.desktop.in
-DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in=.desktop)
+DESKTOP_IN_FILES= evince.desktop.in.in
+DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in.in=.desktop)
 
 desktopdir = $(datadir)/applications
 desktop_DATA = $(DESKTOP_FILES)
 
+schema_in_files = evince.schemas.in
+schemadir = $(GCONF_SCHEMA_FILE_DIR)
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+if GCONF_SCHEMAS_INSTALL
+	if test -z "$(DESTDIR)" ; then \
+	for p in $(schema_DATA) ; do \
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p >&1 > /dev/null; \
+	done \
+	fi
+endif
+	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 "***   $(gtk_update_icon_cache)"; \
+	        fi
+
 EXTRA_DIST =				\
-	$(stock_DATA)			\
 	$(glade_DATA)			\
 	$(ui_DATA)			\
-	$(NULL)
+	$(DESKTOP_IN_FILES)		\
+	$(schema_in_files)		\
+	$(NULL)				
+
+DISTCLEANFILES = \
+	$(DESKTOP_FILES)	\
+	$(schema_DATA)
+
+