Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--data/Makefile.am64
2 files changed, 64 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 345a2e8..d00a797 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-14 Wouter Bolsterlee <wbolster@cvs.gnome.org>
+
+ * data/Makefile.am:
+
+ Cleaned up/slightly refactored Makefile.am. Added GConf
+ schemas uninstallation as well.
+
2006-12-13 Wouter Bolsterlee <wbolster@cvs.gnome.org>
* Makefile.am:
diff --git a/data/Makefile.am b/data/Makefile.am
index 5e05397..94ec87c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,9 +1,12 @@
SUBDIRS = icons
+NULL=
-@INTLTOOL_DESKTOP_RULE@
-@INTLTOOL_SCHEMAS_RULE@
+install-data-local: install-schemas update-icon-cache
+uninstall-local: uninstall-schemas
-NULL=
+#
+# UI descriptions
+#
uidir = $(pkgdatadir)
ui_DATA = \
@@ -13,32 +16,70 @@ ui_DATA = \
hand-open.png \
$(NULL)
+#
+# Glade
+#
+
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)
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)
-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
+
+update-icon-cache:
if test -z "$(DESTDIR)"; then \
echo "Updating Gtk icon cache."; \
$(gtk_update_icon_cache); \
@@ -47,6 +88,11 @@ endif
echo "*** $(gtk_update_icon_cache)"; \
fi
+
+#
+# Extra files to be included in the tarball
+#
+
EXTRA_DIST = \
$(glade_DATA) \
$(ui_DATA) \
@@ -54,6 +100,10 @@ EXTRA_DIST = \
$(schema_in_files) \
$(NULL)
+#
+# Clean up properly
+#
+
DISTCLEANFILES = \
$(DESKTOP_FILES) \
$(schema_DATA)