diff options
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/ChangeLog | 6 | ||||
| -rw-r--r-- | agent/Makefile.am | 4 | ||||
| -rw-r--r-- | agent/command-ssh.c | 1 | ||||
| -rw-r--r-- | agent/minip12.c | 6 | ||||
| -rw-r--r-- | agent/protect-tool.c | 1 | ||||
| -rw-r--r-- | agent/trustlist.c | 1 |
6 files changed, 11 insertions, 8 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index 0c68c1436..e4fbe073b 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,9 @@ +2010-03-10 Werner Koch <[email protected]> + + * Makefile.am (common_libs): Remove libjnlib.a. + + * trustlist.c, protect-tool.c, command-ssh.c: Remove estream.h. + 2010-02-17 Werner Koch <[email protected]> * call-pinentry.c (start_pinentry): Always free OPTSTR. Send diff --git a/agent/Makefile.am b/agent/Makefile.am index 38200c1d8..4f5c08ef9 100644 --- a/agent/Makefile.am +++ b/agent/Makefile.am @@ -45,8 +45,8 @@ gpg_agent_SOURCES = \ call-scd.c \ learncard.c -common_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a -commonpth_libs = $(libcommonpth) ../jnlib/libjnlib.a ../gl/libgnu.a +common_libs = $(libcommon) ../gl/libgnu.a +commonpth_libs = $(libcommonpth) ../gl/libgnu.a pwquery_libs = ../common/libsimple-pwquery.a #if HAVE_W32_SYSTEM diff --git a/agent/command-ssh.c b/agent/command-ssh.c index 12fe60a15..077d93209 100644 --- a/agent/command-ssh.c +++ b/agent/command-ssh.c @@ -32,7 +32,6 @@ #include "agent.h" -#include "estream.h" #include "i18n.h" diff --git a/agent/minip12.c b/agent/minip12.c index 247171773..6f512e9e5 100644 --- a/agent/minip12.c +++ b/agent/minip12.c @@ -32,8 +32,8 @@ #include <unistd.h> #endif -#include "../jnlib/logging.h" -#include "../jnlib/utf8conv.h" +#include "../common/logging.h" +#include "../common/utf8conv.h" #include "minip12.h" #ifndef DIM @@ -2354,7 +2354,7 @@ main (int argc, char **argv) /* Local Variables: -compile-command: "gcc -Wall -O0 -g -DTEST=1 -o minip12 minip12.c ../jnlib/libjnlib.a -L /usr/local/lib -lgcrypt -lgpg-error" +compile-command: "gcc -Wall -O0 -g -DTEST=1 -o minip12 minip12.c ../common/libcommon.a -L /usr/local/lib -lgcrypt -lgpg-error" End: */ #endif /* TEST */ diff --git a/agent/protect-tool.c b/agent/protect-tool.c index dc040f9d8..4008a8867 100644 --- a/agent/protect-tool.c +++ b/agent/protect-tool.c @@ -44,7 +44,6 @@ #include "i18n.h" #include "get-passphrase.h" #include "sysutils.h" -#include "estream.h" enum cmd_and_opt_values diff --git a/agent/trustlist.c b/agent/trustlist.c index be5406b05..3236ae425 100644 --- a/agent/trustlist.c +++ b/agent/trustlist.c @@ -31,7 +31,6 @@ #include "agent.h" #include <assuan.h> /* fixme: need a way to avoid assuan calls here */ #include "i18n.h" -#include "estream.h" /* A structure to store the information from the trust file. */ |