diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | data/Makefile.am | 8 | ||||
| -rw-r--r-- | src/capplet/Makefile.am | 2 | ||||
| -rw-r--r-- | src/daemon/Makefile.am | 2 | ||||
| -rw-r--r-- | src/themes/standard/Makefile.am | 2 |
6 files changed, 22 insertions, 8 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 39d5d8c..5f88508 100644 --- a/configure.ac +++ b/configure.ac @@ -41,7 +41,7 @@ AC_DEFINE_UNQUOTED(NOTIFICATION_DAEMON_VERSION, "$NOTIFICATION_DAEMON_VERSION", dnl ################################################################ dnl # Initialize automake dnl ################################################################ -AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2]) +AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-xz foreign]) AM_MAINTAINER_MODE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -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 \ diff --git a/src/capplet/Makefile.am b/src/capplet/Makefile.am index 3a15e6d..dfd31f2 100644 --- a/src/capplet/Makefile.am +++ b/src/capplet/Makefile.am @@ -14,7 +14,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) man_MANS = mate-notification-properties.1 -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/src/daemon \ $(NOTIFICATION_CAPPLET_CFLAGS) \ diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index 4f9471c..ce476e5 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -18,7 +18,7 @@ notificationdaemon-dbus-glue.h: notificationdaemon.xml dbus-binding-tool --mode=glib-server --prefix=notification_daemon \ $(srcdir)/notificationdaemon.xml > notificationdaemon-dbus-glue.h -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(NOTIFICATION_DAEMON_CFLAGS) \ -DENGINES_DIR=\"$(libdir)/mate-notification-daemon/engines\" diff --git a/src/themes/standard/Makefile.am b/src/themes/standard/Makefile.am index d5b4a2a..c31098c 100644 --- a/src/themes/standard/Makefile.am +++ b/src/themes/standard/Makefile.am @@ -6,6 +6,6 @@ libstandard_la_SOURCES = theme.c libstandard_la_LDFLAGS = -module -avoid-version -no-undefined libstandard_la_LIBADD = $(NOTIFICATION_DAEMON_LIBS) -INCLUDES = $(NOTIFICATION_DAEMON_CFLAGS) +AM_CPPFLAGS = $(NOTIFICATION_DAEMON_CFLAGS) -include $(top_srcdir)/git.mk |