From 86521773dffaed785de0eebd1a05040e673ee638 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 18 Dec 2001 19:35:12 +0000 Subject: * Makefile.am (AM_CPPFLAGS): Add flags for libksba * Makefile.am (AM_CPPFLAGS): Include flags for gcrypt and ksba * Makefile.am: Use LIBGCRYPT macros --- kbx/ChangeLog | 2 ++ kbx/Makefile.am | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'kbx') 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 + * 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 -- cgit v1.2.3