X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=data%2FMakefile.am;h=9df94a971bcc07a8a63163f27f802f74ebb7a3f6;hb=d0acc2a2df4469f8d69d396d6d0f4a6f9a716cdf;hp=35bb0a12d10ca99b0bd4093e30455c5ed77d9545;hpb=56886c0c28b85bc69f210ac5b69b2a993bd441b4;p=evince.git

diff --git a/data/Makefile.am b/data/Makefile.am
index 35bb0a12..9df94a97 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,18 @@
-@INTLTOOL_DESKTOP_RULE@
-@INTLTOOL_SCHEMAS_RULE@
+SUBDIRS = icons
+NULL=
+
+install-data-local: install-schemas update-icon-cache
+uninstall-local: uninstall-schemas
+
+#
+# man file
+#
 
-NULL =
+man_MANS=evince.1
+
+#
+# UI descriptions
+#
 
 uidir = $(pkgdatadir)
 ui_DATA =				\
@@ -10,11 +21,11 @@ ui_DATA =				\
 	hand-open.png			\
 	$(NULL)
 
-gladedir = $(pkgdatadir)
-glade_DATA = 				\
-	evince-password.glade		\
-	evince-properties.glade		\
-	$(NULL)
+#
+# Desktop file
+#
+
+@INTLTOOL_DESKTOP_RULE@
 
 DESKTOP_IN_FILES= evince.desktop.in.in
 DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in.in=.desktop)
@@ -22,47 +33,75 @@ DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in.in=.desktop)
 desktopdir = $(datadir)/applications
 desktop_DATA = $(DESKTOP_FILES)
 
+
+#
+# GConf schema
+#
+
+@INTLTOOL_SCHEMAS_RULE@
+
 schema_in_files = evince.schemas.in
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
-icon_16dir = $(datadir)/icons/hicolor/16x16/apps
-icon_16_DATA = evince-16.png
-icon_22dir = $(datadir)/icons/hicolor/22x22/apps
-icon_22_DATA = evince-22.png
-icondir = $(datadir)/icons/hicolor/48x48/apps
-icon_DATA = evince.png
-svgicondir = $(datadir)/icons/hicolor/scalable/apps
-svgicon_DATA = evince.svg
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+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
 
-install-data-hook:
+uninstall-schemas: $(schema_DATA)
 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; \
+	for p in $^ ; do \
+		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
+			$(GCONFTOOL) \
+			--makefile-uninstall-rule \
+			$(top_builddir)/data/$$p; \
 	done \
 	fi
 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
 
+
+#
+# Extra files to be included in the tarball
+#
+
 EXTRA_DIST =				\
-	$(glade_DATA)			\
 	$(ui_DATA)			\
 	$(DESKTOP_IN_FILES)		\
 	$(schema_in_files)		\
-	$(icon_16_DATA)			\
-	$(icon_22_DATA)			\
-	$(icon_DATA)			\
-	$(svgicon_DATA)			\
+	$(man_MANS)			\
 	$(NULL)				
 
+#
+# Clean up properly
+#
+
 DISTCLEANFILES = \
 	$(DESKTOP_FILES)	\
 	$(schema_DATA)