[telegnome] Stop using deprecated ACLOCAL_AMFLAGS
- From: Colin Watson <cjwatson src gnome org>
- To: commits-list gnome org
- Cc: 
- Subject: [telegnome] Stop using deprecated ACLOCAL_AMFLAGS
- Date: Wed,  6 Jul 2016 00:13:35 +0000 (UTC)
commit d2aa8f7adc16cc2f66260079f7582cf24057c2ff
Author: Colin Watson <cjwatson debian org>
Date:   Wed Jul 6 01:11:48 2016 +0100
    Stop using deprecated ACLOCAL_AMFLAGS
    
    Automake 1.13 can trace AC_CONFIG_MACRO_DIRS instead.
    
    * configure.ac: Use AC_CONFIG_MACRO_DIRS rather than older
    AC_CONFIG_MACRO_DIR.  Require Automake 1.13.
    * Makefile.am (ACLOCAL_AMFLAGS): Remove.
 Makefile.am  |    2 --
 configure.ac |    4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d56cb23..ab0f949 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,8 +23,6 @@ appstream_DATA = $(appstream_in_files:.xml.in=.xml)
 EXTRA_DIST += $(apps_in_files) $(appstream_in_files)
 CLEANFILES = $(apps_DATA) $(appstream_DATA)
 
-ACLOCAL_AMFLAGS = -I m4
-
 # Build ChangeLog from git history
 ChangeLog:
        $(AM_V_GEN) if test -d "$(top_srcdir)/.git"; then \
diff --git a/configure.ac b/configure.ac
index bfaae8c..839ce05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 AC_INIT([TeleGNOME], [0.3.2], [cjwatson debian org], [telegnome])
 AC_PREREQ(2.50)
 AC_CONFIG_SRCDIR([src/main.vala])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4])
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([dist-xz no-dist-gzip])
+AM_INIT_AUTOMAKE([1.13 dist-xz no-dist-gzip])
 
 AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
[
Date Prev][
Date Next]   [
Thread Prev][
Thread Next]   
[
Thread Index]
[
Date Index]
[
Author Index]