From c88b2e459400bc9f4bcdac18a467d21c403e4b3f Mon Sep 17 00:00:00 2001 From: infirit Date: Tue, 22 Oct 2013 13:58:20 +0200 Subject: Add update-icon-cache config option for makedistcheck --- Makefile.am | 2 ++ configure.ac | 10 ++++++++++ data/Makefile.am | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 969b5c5..00cc0e9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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..e6760de 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..e5c218e 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -37,12 +37,12 @@ EXTRA_DIST = \ $(icon48_DATA) \ $(iconscalable_DATA) -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor +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 \ -- cgit v1.2.1 From fb1debc3df1d4da410afbd1a7284d2b596d5a667 Mon Sep 17 00:00:00 2001 From: infirit Date: Tue, 22 Oct 2013 13:59:04 +0200 Subject: Remove non existing INSTALL file from EXTRA_DIST --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 00cc0e9..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 \ -- cgit v1.2.1 From bde933886e3f2c46968b91c2307d0b8e451af009 Mon Sep 17 00:00:00 2001 From: infirit Date: Tue, 22 Oct 2013 14:03:05 +0200 Subject: Fix EXTRA_DIST gsettings variable --- data/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/Makefile.am b/data/Makefile.am index e5c218e..c9205a0 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) \ -- cgit v1.2.1 From 7a10d7b877956fdee0c3a738b92690da7a0757c0 Mon Sep 17 00:00:00 2001 From: infirit Date: Tue, 22 Oct 2013 14:06:42 +0200 Subject: Add CLEANFILES to delete generated schema file --- data/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/Makefile.am b/data/Makefile.am index c9205a0..6087e57 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -37,6 +37,8 @@ EXTRA_DIST = \ $(icon48_DATA) \ $(iconscalable_DATA) +CLEANFILES = $(gsettings_SCHEMAS) + gtk_update_icon_cache = $(UPDATE_ICON_CACHE) -f -t $(datadir)/icons/hicolor install-data-hook: update-icon-cache -- cgit v1.2.1 From 1d63e22f57a1fd1e8a9b00f29e4412ecd0fb4f4e Mon Sep 17 00:00:00 2001 From: infirit Date: Tue, 8 Oct 2013 04:05:18 +0200 Subject: Make automake happy: INCLUDES->AM_CPPFLAGS --- src/capplet/Makefile.am | 2 +- src/daemon/Makefile.am | 2 +- src/themes/standard/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 -- cgit v1.2.1 From 305b377b6caa29395572c036611e50f9c319e501 Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Sat, 12 Oct 2013 22:06:06 +0200 Subject: let 'make dist' create tar.gz and tar.xv tarballs --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index e6760de..2022693 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.9 tar-ustar dist-xz foreign]) AM_MAINTAINER_MODE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -- cgit v1.2.1 From 037ba2b786323591cefd7d03fc49e36c9f4ad3f3 Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Thu, 17 Oct 2013 11:53:10 +0200 Subject: remove creating gz tarballs --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 2022693..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.9 tar-ustar dist-xz foreign]) +AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-xz foreign]) AM_MAINTAINER_MODE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -- cgit v1.2.1 From 6db62a08b3b1b3af4d125fe01cf0263ed548ed3d Mon Sep 17 00:00:00 2001 From: infirit Date: Tue, 22 Oct 2013 14:27:11 +0200 Subject: Correct typo --- data/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/Makefile.am b/data/Makefile.am index 6087e57..1aec612 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -44,7 +44,7 @@ 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)" $$ ICON_UPDATE; then \ + @-if test -z "$(DESTDIR)" && ICON_UPDATE; then \ echo "Updating Gtk icon cache."; \ $(gtk_update_icon_cache); \ else \ -- cgit v1.2.1