diff options
Diffstat (limited to 'sm')
| -rw-r--r-- | sm/ChangeLog | 6 | ||||
| -rw-r--r-- | sm/Makefile.am | 3 | ||||
| -rw-r--r-- | sm/gpgsm.h | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/sm/ChangeLog b/sm/ChangeLog index ba5047a82..104f6caaf 100644 --- a/sm/ChangeLog +++ b/sm/ChangeLog @@ -1,3 +1,9 @@ +2010-03-10 Werner Koch <[email protected]> + + * Makefile.am (common_libs): Remove libjnlib.a. Change order. + + * gpgsm.h: Remove "estream.h". + 2010-03-08 Werner Koch <[email protected]> * certreqgen.c (gpgsm_genkey): Change OUT_FP to an estream_t diff --git a/sm/Makefile.am b/sm/Makefile.am index 2bbdd1b59..ba194811d 100644 --- a/sm/Makefile.am +++ b/sm/Makefile.am @@ -52,8 +52,7 @@ gpgsm_SOURCES = \ qualified.c -common_libs = $(libcommon) ../kbx/libkeybox.a ../jnlib/libjnlib.a \ - ../gl/libgnu.a +common_libs = ../kbx/libkeybox.a $(libcommon) ../gl/libgnu.a gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \ diff --git a/sm/gpgsm.h b/sm/gpgsm.h index 7e0353060..542c292ac 100644 --- a/sm/gpgsm.h +++ b/sm/gpgsm.h @@ -31,7 +31,6 @@ #include <ksba.h> #include "../common/util.h" #include "../common/status.h" -#include "../common/estream.h" #include "../common/audit.h" #include "../common/session-env.h" |