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 /kbx | |
| 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 'kbx')
| -rw-r--r-- | kbx/Makefile.am | 12 |
1 files changed, 7 insertions, 5 deletions
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 |