From f98b8bd0d7e4f98951e8d460c1f1b30538da697f Mon Sep 17 00:00:00 2001 From: Sam Spilsbury Date: Tue, 21 Jul 2015 08:16:14 +0800 Subject: [PATCH] Makefile: Move to AM_DISTCHECK_CONFIGURE_FLAGS Since automake 1.11.2 it is recommended that packages use AM_DISTCHECK_CONFIGURE_FLAGS instead of DISTCHECK_CONFIGURE_FLAGS as the latter is intended to be a user variable. https://bugzilla.gnome.org/show_bug.cgi?id=766298 Closes: #293 Approved by: cgwalters --- Makefile-decls.am | 2 +- Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile-decls.am b/Makefile-decls.am index d8ec5ab4..f7ebd422 100644 --- a/Makefile-decls.am +++ b/Makefile-decls.am @@ -18,7 +18,7 @@ # Common variables AM_CPPFLAGS = AM_CFLAGS = -DISTCHECK_CONFIGURE_FLAGS = +AM_DISTCHECK_CONFIGURE_FLAGS = SUBDIRS = NULL = BUILT_SOURCES = diff --git a/Makefile.am b/Makefile.am index cf67c4ba..a003af25 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,7 +28,7 @@ AM_CPPFLAGS += -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"' \ -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_40 \ -DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_2_40 -DSOUP_VERSION_MAX_ALLOWED=SOUP_VERSION_2_48 AM_CFLAGS += -std=gnu99 $(WARN_CFLAGS) -DISTCHECK_CONFIGURE_FLAGS += --enable-gtk-doc --disable-maintainer-mode +AM_DISTCHECK_CONFIGURE_FLAGS += --enable-gtk-doc --disable-maintainer-mode GITIGNOREFILES = aclocal.m4 build-aux/ buildutil/*.m4 config.h.in gtk-doc.make