summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2015-05-15 13:20:52 +0200
committerWerner Koch <wk@gnupg.org>2015-05-15 13:20:52 +0200
commit43ea8f5d884dd108bb27d8e1610fa28802295a06 (patch)
treeb3dbab95d4cc7c23f9a74e625e395baed70cdb5a /Makefile.am
parentPost release updates. (diff)
downloadgnupg2-43ea8f5d884dd108bb27d8e1610fa28802295a06.tar.xz
gnupg2-43ea8f5d884dd108bb27d8e1610fa28802295a06.zip
build: Make --disable-gpgsm work.
* Makefile.am: Always build kbx/ * g10/Makefile.am (AM_CFLAGS): Include KSBA_CFLAGS. -- Note that "make check" still prints a warning. Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am9
1 files changed, 1 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index 57529b6c5..0613545dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,13 +47,6 @@ EXTRA_DIST = build-aux/config.rpath build-aux/potomo autogen.sh autogen.rc \
DISTCLEANFILES = g10defs.h
-if BUILD_GPGSM
-kbx = kbx
-else
-kbx =
-endif
-
-
if BUILD_GPG
gpg = g10
else
@@ -101,7 +94,7 @@ else
tests =
endif
-SUBDIRS = m4 common ${kbx} \
+SUBDIRS = m4 common kbx \
${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
${tools} po ${doc} ${tests}