summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2010-06-09 18:53:51 +0200
committerWerner Koch <wk@gnupg.org>2010-06-09 18:53:51 +0200
commitc3f08dcb7266efeac84f5f720ec0a353a45e950d (patch)
tree51501aa7d0e6dadb80576a1e982fdfde871bd2ad /Makefile.am
parent2010-06-08 Marcus Brinkmann <marcus@g10code.de> (diff)
downloadgnupg2-c3f08dcb7266efeac84f5f720ec0a353a45e950d.tar.xz
gnupg2-c3f08dcb7266efeac84f5f720ec0a353a45e950d.zip
Merged Dirmngr with GnuPG.
A few code changes to support dirmngr.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am8
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index a51b5ffd3..1bda6ffde 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,6 +61,11 @@ g13 = g13
else
g13 =
endif
+if BUILD_DIRMNGR
+dirmngr = dirmngr
+else
+dirmngr =
+endif
if BUILD_TOOLS
tools = tools
else
@@ -79,7 +84,8 @@ tests = tests
endif
SUBDIRS = m4 gl include common ${kbx} \
- ${gpg} ${keyserver} ${sm} ${agent} ${scd} ${g13} ${tools} po ${doc} ${tests}
+ ${gpg} ${keyserver} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
+ ${tools} po ${doc} ${tests}
dist_doc_DATA = README