diff options
| author | Stefano Karapetsas <[email protected]> | 2013-10-22 08:11:59 -0700 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-10-22 08:11:59 -0700 |
| commit | 9d9aa2b9986edd94a3b72a593be7fd588fc031a0 (patch) | |
| tree | 8f65ce2c70943e21e7a03784466e7a4f3bfae1be | |
| parent | 0656ca9fb350ebcf05d205dc861cacc875067dd7 (diff) | |
| parent | 14d28b255c8e9fc26cc6e6bf0fc96d938f88fa27 (diff) | |
| download | mate-notification-daemon-9d9aa2b9986edd94a3b72a593be7fd588fc031a0.tar.bz2 mate-notification-daemon-9d9aa2b9986edd94a3b72a593be7fd588fc031a0.tar.xz | |
Merge pull request #22 from infirit/master
New option to disable icon cache generation and small autofoo fixes
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | data/Makefile.am | 8 |
3 files changed, 18 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 969b5c5..b0996e4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = data po src ACLOCAL_AMFLAGS = -I macros ${ACLOCAL_FLAGS} EXTRA_DIST = \ - AUTHORS NEWS INSTALL COPYING README \ + AUTHORS NEWS COPYING README \ ChangeLog \ autogen.sh \ configure.ac \ @@ -16,6 +16,8 @@ $(OBJECTS): libtool libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck +DISTCHECK_CONFIGURE_FLAGS = --disable-icon-update + DISTCLEANFILES = \ intltool-extract \ intltool-merge \ diff --git a/configure.ac b/configure.ac index a622f23..c40cc48 100644 --- a/configure.ac +++ b/configure.ac @@ -243,6 +243,16 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then else AC_MSG_RESULT(no) fi + +dnl --------------------------------------------------------------------------- +dnl Enabel/disable icon cache generation +dnl --------------------------------------------------------------------------- +AC_ARG_ENABLE(icon-update, AC_HELP_STRING([--disable-icon-update], + [Disable icon cache update])) +if (test "$enable_icon_update" != no); then + AC_PATH_PROG(UPDATE_ICON_CACHE, [gtk-update-icon-cache]) +fi +AM_CONDITIONAL([ICON_UPDATE], [test -n "$UPDATE_ICON_CACHE"]) AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS $WARNINGCFLAGS" AM_CXXFLAGS="$AM_CXXFLAGS $WARN_CXXFLAGS" diff --git a/data/Makefile.am b/data/Makefile.am index dd8beb6..1aec612 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -27,7 +27,7 @@ convertdir = $(datadir)/MateConf/gsettings convert_DATA = mate-notification-daemon.convert EXTRA_DIST = \ - $(gsettings_SCHEMAS_in_in) \ + $(gsettings_SCHEMAS).in.in \ $(convert_DATA) \ $(service_DATA) \ $(icon16_DATA) \ @@ -37,12 +37,14 @@ EXTRA_DIST = \ $(icon48_DATA) \ $(iconscalable_DATA) -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor +CLEANFILES = $(gsettings_SCHEMAS) + +gtk_update_icon_cache = $(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 \ + @-if test -z "$(DESTDIR)" && ICON_UPDATE; then \ echo "Updating Gtk icon cache."; \ $(gtk_update_icon_cache); \ else \ |