diff options
author | Werner Koch <wk@gnupg.org> | 2013-06-27 09:22:00 +0200 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2013-06-27 09:27:32 +0200 |
commit | 043e2728c813299fafcf62cd125ecf872b26179e (patch) | |
tree | 031877c258041d94e60fce07cb353190d73fd9d3 /Makefile.am | |
parent | Update AUTHORS. (diff) | |
download | gnupg2-043e2728c813299fafcf62cd125ecf872b26179e.tar.xz gnupg2-043e2728c813299fafcf62cd125ecf872b26179e.zip |
Prepare for newer automake versions.
* configure.ac (AM_INIT_AUTOMAKE): Replace 2 argument form by the
option form. Add options from the top Makefile.
(AM_CONFIG_HEADER): Rename to AC_CONFIG_HEADER.
* Makefile.am (AUTOMAKE_OPTIONS): Remove.
* kbx/Makefile.am: Remove INCLUDES. Include cmacros.am. FActor some
AM_CPPFLAGS options to AM_CFLAGS.
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index c5ac11c4e..c9a7b507d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,6 @@ ## Process this file with automake to produce Makefile.in ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto --enable-gpgtar GITLOG_TO_CHANGELOG=gitlog-to-changelog |