diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/Makefile.am | 2 | ||||
| -rw-r--r-- | g10/main.h | 1 | ||||
| -rw-r--r-- | g10/packet.h | 2 | ||||
| -rw-r--r-- | g10/rmd160.c | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 121d57356..b77ed8d9c 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2010-03-10 Werner Koch <[email protected]> + + * Makefile.am (needed_libs): Remove libjnlib.a. + + * main.h: Remove "estream.h". + 2010-03-08 Werner Koch <[email protected]> * main.h: Include "estream.h" diff --git a/g10/Makefile.am b/g10/Makefile.am index 3a0529293..b89ff8ee6 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -27,7 +27,7 @@ include $(top_srcdir)/am/cmacros.am AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) -needed_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a +needed_libs = $(libcommon) ../gl/libgnu.a bin_PROGRAMS = gpg2 gpgv2 noinst_PROGRAMS = $(module_tests) diff --git a/g10/main.h b/g10/main.h index f0f1edc7c..ec09124bd 100644 --- a/g10/main.h +++ b/g10/main.h @@ -25,7 +25,6 @@ #include "cipher.h" #include "keydb.h" #include "util.h" -#include "../common/estream.h" /* It could be argued that the default cipher should be 3DES rather than CAST5, and the default compression should be 0 diff --git a/g10/packet.h b/g10/packet.h index a97fe07a3..54f8295c1 100644 --- a/g10/packet.h +++ b/g10/packet.h @@ -23,7 +23,7 @@ #include "types.h" #include "../common/iobuf.h" -#include "../jnlib/strlist.h" +#include "../common/strlist.h" #include "cipher.h" #include "filter.h" #include "../common/openpgpdefs.h" diff --git a/g10/rmd160.c b/g10/rmd160.c index f89193707..febfa618a 100644 --- a/g10/rmd160.c +++ b/g10/rmd160.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include <string.h> -#include "../jnlib/types.h" +#include "../common/types.h" #include "rmd160.h" /* |