summaryrefslogtreecommitdiffstats
path: root/kbx
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2001-12-18 20:35:12 +0100
committerWerner Koch <wk@gnupg.org>2001-12-18 20:35:12 +0100
commit86521773dffaed785de0eebd1a05040e673ee638 (patch)
tree6135c362e375e1e31a2870416a312820591ab25f /kbx
parentChanges to be used with the new libksba interface. (diff)
downloadgnupg2-86521773dffaed785de0eebd1a05040e673ee638.tar.xz
gnupg2-86521773dffaed785de0eebd1a05040e673ee638.zip
* Makefile.am (AM_CPPFLAGS): Add flags for libksbaNEWPG-0-0-0
* Makefile.am (AM_CPPFLAGS): Include flags for gcrypt and ksba * Makefile.am: Use LIBGCRYPT macros
Diffstat (limited to 'kbx')
-rw-r--r--kbx/ChangeLog2
-rw-r--r--kbx/Makefile.am6
2 files changed, 4 insertions, 4 deletions
diff --git a/kbx/ChangeLog b/kbx/ChangeLog
index f35742829..3498c9d53 100644
--- a/kbx/ChangeLog
+++ b/kbx/ChangeLog
@@ -1,5 +1,7 @@
2001-12-18 Werner Koch <wk@gnupg.org>
+ * Makefile.am (AM_CPPFLAGS): Add flags for libksba
+
* keybox-blob.c (_keybox_create_x509_blob): Use
gcry_sexp_canon_len to get the length of the serial number.
(_keybox_release_blob): Need to use a new serialbuf to free the memory.
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
index 4c783fc1e..5226077bc 100644
--- a/kbx/Makefile.am
+++ b/kbx/Makefile.am
@@ -20,7 +20,7 @@
## Process this file with automake to produce Makefile.in
EXTRA_DIST = mkerrors
-INCLUDES = -I.. -I$(top_srcdir)/include
+AM_CPPFLAGS = $(LIBKSBA_CFLAGS) $(LIBGCRYPT_CLFAGS)
BUILT_SOURCES = keybox-errors.c
noinst_LIBRARIES = libkeybox.a
@@ -41,9 +41,7 @@ common_sources = \
libkeybox_a_SOURCES = $(common_sources)
kbxutil_SOURCES = kbxutil.c $(common_sources)
-kbxutil_LDADD = ../jnlib/libjnlib.a \
- ../../libksba/src/.libs/libksba.a \
- ../../libgcrypt/src/.libs/libgcrypt.so.1
+kbxutil_LDADD = ../jnlib/libjnlib.a $(LIBKSBA_LIBS) $(LIBGCRYPT_LIBS)
keybox-errors.c : keybox.h mkerrors
$(srcdir)/mkerrors < $(srcdir)/keybox.h > keybox-errors.c