X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=data%2FMakefile.am;h=883a3aa697f3ddc1cd6b774fc054866e46d883ed;hb=03a4afa9aeab342a63530db46888e405ea1c8afc;hp=669742c878f0117737ac61f3e8078e7ebd767b70;hpb=794bbc93d05e090d7fef7b39f6f0237cbb26fa31;p=evince.git

diff --git a/data/Makefile.am b/data/Makefile.am
index 669742c8..883a3aa6 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -18,19 +18,11 @@ uidir = $(pkgdatadir)
 ui_DATA =				\
 	evince-ui.xml			\
 	evince-toolbar.xml		\
-	evince-preview-toolbar.xml		\
-	hand-open.png			\
-	$(NULL)
+	hand-open.png
 
-#
-# Glade
-#
-
-gladedir = $(pkgdatadir)
-glade_DATA = 				\
-	evince-password.glade		\
-	evince-properties.glade		\
-	$(NULL)
+if ENABLE_PREVIEWER
+ui_DATA += evince-previewer-ui.xml
+endif
 
 #
 # Desktop file
@@ -49,6 +41,7 @@ desktop_DATA = $(DESKTOP_FILES)
 # GConf schema
 #
 
+if WITH_GCONF
 @INTLTOOL_SCHEMAS_RULE@
 
 schema_in_files = evince.schemas.in
@@ -79,18 +72,28 @@ if GCONF_SCHEMAS_INSTALL
 	fi
 endif
 
+else
+
+install-schemas:
+uninstall-schemas:
+
+endif
+
 #
 # GTK icon cache
 #
 
 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
 
@@ -100,7 +103,6 @@ update-icon-cache:
 #
 
 EXTRA_DIST =				\
-	$(glade_DATA)			\
 	$(ui_DATA)			\
 	$(DESKTOP_IN_FILES)		\
 	$(schema_in_files)		\
@@ -114,5 +116,3 @@ EXTRA_DIST =				\
 DISTCLEANFILES = \
 	$(DESKTOP_FILES)	\
 	$(schema_DATA)
-
-