diff options
| author | infirit <[email protected]> | 2014-02-10 21:12:17 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-02-10 21:12:17 +0100 |
| commit | 80a4a263c6aa37d41b5aa08953b55c96822630c3 (patch) | |
| tree | ed8497165fcf699b4617b47318ea9e2bb1f0c0ee | |
| parent | 8b912b74eab509351c1969f2a4e4db52c5974667 (diff) | |
| download | mate-indicator-applet-80a4a263c6aa37d41b5aa08953b55c96822630c3.tar.bz2 mate-indicator-applet-80a4a263c6aa37d41b5aa08953b55c96822630c3.tar.xz | |
Fix several autotool warnings
| -rw-r--r-- | Makefile.am | 41 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 19 insertions, 30 deletions
diff --git a/Makefile.am b/Makefile.am index 72e0c08..825a62e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,10 @@ - SUBDIRS = \ src \ data \ po +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall DISTCLEANFILES = \ @@ -13,28 +14,16 @@ DISTCLEANFILES = \ EXTRA_DIST = \ COPYING.LGPL -#dist-hook: -# @if test -d "$(top_srcdir)/.bzr"; \ -# then \ -# echo Creating ChangeLog && \ -# ( cd "$(top_srcdir)" && \ -# echo '# Generated by Makefile. Do not edit.'; echo; \ -# $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \ -# && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ -# || (rm -f ChangeLog.tmp; \ -# echo Failed to generate ChangeLog >&2 ); \ -# else \ -# echo Failed to generate ChangeLog: not a branch >&2; \ -# fi -# @if test -d "$(top_srcdir)/.bzr"; \ -# then \ -# echo Creating AUTHORS && \ -# ( cd "$(top_srcdir)" && \ -# echo '# Generated by Makefile. Do not edit.'; echo; \ -# $(top_srcdir)/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \ -# && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \ -# || (rm -f AUTHORS.tmp; \ -# echo Failed to generate AUTHORS >&2 ); \ -# else \ -# echo Failed to generate AUTHORS: not a branch >&2; \ -# fi +dist-hook: + @if test -d "$(srcdir)/.git"; \ + then \ + echo Creating ChangeLog && \ + ( cd "$(top_srcdir)" && \ + echo '# Generated by Makefile. Do not edit.'; echo; \ + $(top_srcdir)/missing --run git log --stat ) > ChangeLog.tmp \ + && mv -f ChangeLog.tmp $(distdir)/ChangeLog \ + || ( rm -f ChangeLog.tmp ; \ + echo Failed to generate ChangeLog >&2 ); \ + else \ + echo A git clone is required to generate a ChangeLog >&2; \ + fi diff --git a/configure.ac b/configure.ac index 92d4a0e..2fcd634 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ - -AC_INIT(src/applet-main.c) - AC_PREREQ(2.53) +AC_INIT([mate-indicator-appler], [1.6.0], [https://github.com/mate-desktop/mate-indicator-applet/issues]) +AC_CONFIG_SRCDIR(src/applet-main.c) + AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(mate-indicator-applet, 1.6.0) +AM_INIT_AUTOMAKE([no-dist-gzip dist-xz]) AM_MAINTAINER_MODE m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES]) |