diff options
| author | Werner Koch <[email protected]> | 2013-06-27 07:22:00 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2013-06-27 07:27:32 +0000 |
| commit | 043e2728c813299fafcf62cd125ecf872b26179e (patch) | |
| tree | 031877c258041d94e60fce07cb353190d73fd9d3 | |
| parent | Update AUTHORS. (diff) | |
| download | gnupg-043e2728c813299fafcf62cd125ecf872b26179e.tar.gz gnupg-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.
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | kbx/Makefile.am | 12 |
3 files changed, 13 insertions, 10 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 diff --git a/configure.ac b/configure.ac index 5335e56d4..01530e06c 100644 --- a/configure.ac +++ b/configure.ac @@ -63,10 +63,12 @@ PACKAGE=$PACKAGE_NAME PACKAGE_GT=${PACKAGE_NAME}2 VERSION=$PACKAGE_VERSION -AC_CONFIG_AUX_DIR(scripts) -AC_CONFIG_SRCDIR(sm/gpgsm.c) -AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) +AC_CONFIG_AUX_DIR([scripts]) +AC_CONFIG_SRCDIR([sm/gpgsm.c]) +AC_CONFIG_HEADER([config.h]) +# Note: For automake 1.13 add the option +# serial-tests +AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip]) AC_CANONICAL_HOST AB_INIT diff --git a/kbx/Makefile.am b/kbx/Makefile.am index 894924e5c..d7edb2544 100644 --- a/kbx/Makefile.am +++ b/kbx/Makefile.am @@ -18,12 +18,14 @@ ## Process this file with automake to produce Makefile.in -localedir = $(datadir)/locale -INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\" - EXTRA_DIST = mkerrors -AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl \ - $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) + +AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common \ + -I$(top_srcdir)/intl + +include $(top_srcdir)/am/cmacros.am + +AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) noinst_LIBRARIES = libkeybox.a bin_PROGRAMS = kbxutil |