summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.am2
-rw-r--r--tools/call-dirmngr.c8
-rw-r--r--tools/gpg-check-pattern.c6
-rw-r--r--tools/gpg-connect-agent.c2
-rw-r--r--tools/gpg-wks-client.c22
-rw-r--r--tools/gpgconf-comp.c10
-rw-r--r--tools/gpgconf.c4
-rw-r--r--tools/gpgsplit.c4
-rw-r--r--tools/gpgtar-create.c2
-rw-r--r--tools/gpgtar-extract.c2
-rw-r--r--tools/gpgtar-list.c2
-rw-r--r--tools/gpgtar.c6
-rw-r--r--tools/mime-maker.c4
-rw-r--r--tools/mime-parser.c2
-rw-r--r--tools/send-mail.c6
-rw-r--r--tools/wks-receive.c6
-rw-r--r--tools/wks-util.c10
17 files changed, 49 insertions, 49 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 38abd7c8c..0c828a7bd 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -23,7 +23,7 @@ EXTRA_DIST = \
ccidmon.c ChangeLog-2011 gpg-connect-agent-w32info.rc
-AM_CPPFLAGS = -I$(top_srcdir)/common
+AM_CPPFLAGS =
include $(top_srcdir)/am/cmacros.am
if HAVE_W32_SYSTEM
diff --git a/tools/call-dirmngr.c b/tools/call-dirmngr.c
index 51f1fa146..9e3e493ee 100644
--- a/tools/call-dirmngr.c
+++ b/tools/call-dirmngr.c
@@ -29,10 +29,10 @@
#endif
#include <assuan.h>
-#include "util.h"
-#include "i18n.h"
-#include "asshelp.h"
-#include "mbox-util.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
+#include "../common/asshelp.h"
+#include "../common/mbox-util.h"
#include "./call-dirmngr.h"
static struct
diff --git a/tools/gpg-check-pattern.c b/tools/gpg-check-pattern.c
index a3224ab9d..719734090 100644
--- a/tools/gpg-check-pattern.c
+++ b/tools/gpg-check-pattern.c
@@ -40,9 +40,9 @@
#include <regex.h>
#include <ctype.h>
-#include "util.h"
-#include "i18n.h"
-#include "sysutils.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
#include "../common/init.h"
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index 59e219217..ef71d2733 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -29,7 +29,7 @@
#include <unistd.h>
#include <assert.h>
-#include "i18n.h"
+#include "../common/i18n.h"
#include "../common/util.h"
#include "../common/asshelp.h"
#include "../common/sysutils.h"
diff --git a/tools/gpg-wks-client.c b/tools/gpg-wks-client.c
index c31e3a1b0..c57810543 100644
--- a/tools/gpg-wks-client.c
+++ b/tools/gpg-wks-client.c
@@ -22,17 +22,17 @@
#include <stdlib.h>
#include <string.h>
-#include "util.h"
-#include "status.h"
-#include "i18n.h"
-#include "sysutils.h"
-#include "init.h"
-#include "asshelp.h"
-#include "userids.h"
-#include "ccparray.h"
-#include "exectool.h"
-#include "mbox-util.h"
-#include "name-value.h"
+#include "../common/util.h"
+#include "../common/status.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
+#include "../common/init.h"
+#include "../common/asshelp.h"
+#include "../common/userids.h"
+#include "../common/ccparray.h"
+#include "../common/exectool.h"
+#include "../common/mbox-util.h"
+#include "../common/name-value.h"
#include "call-dirmngr.h"
#include "mime-maker.h"
#include "send-mail.h"
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 0c939e5e0..105521281 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -44,12 +44,12 @@
#endif
/* For log_logv(), asctimestamp(), gnupg_get_time (). */
-#include "util.h"
-#include "i18n.h"
-#include "exechelp.h"
-#include "sysutils.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
+#include "../common/exechelp.h"
+#include "../common/sysutils.h"
-#include "gc-opt-flags.h"
+#include "../common/gc-opt-flags.h"
#include "gpgconf.h"
/* There is a problem with gpg 1.4 under Windows: --gpgconf-list
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index a9f4607bf..c6fb24e61 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -26,8 +26,8 @@
#include <unistd.h>
#include "gpgconf.h"
-#include "i18n.h"
-#include "sysutils.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
#include "../common/init.h"
diff --git a/tools/gpgsplit.c b/tools/gpgsplit.c
index 3b4bb15a9..ce2777d3a 100644
--- a/tools/gpgsplit.c
+++ b/tools/gpgsplit.c
@@ -40,8 +40,8 @@
#endif
#define INCLUDED_BY_MAIN_MODULE 1
-#include "util.h"
-#include "openpgpdefs.h"
+#include "../common/util.h"
+#include "../common/openpgpdefs.h"
static int opt_verbose;
static const char *opt_prefix = "";
diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c
index ffd239f42..c622a6672 100644
--- a/tools/gpgtar-create.c
+++ b/tools/gpgtar-create.c
@@ -35,7 +35,7 @@
#endif /*!HAVE_W32_SYSTEM*/
#include <assert.h>
-#include "i18n.h"
+#include "../common/i18n.h"
#include "../common/exectool.h"
#include "../common/sysutils.h"
#include "../common/ccparray.h"
diff --git a/tools/gpgtar-extract.c b/tools/gpgtar-extract.c
index f9a50e747..b0e17cb10 100644
--- a/tools/gpgtar-extract.c
+++ b/tools/gpgtar-extract.c
@@ -27,7 +27,7 @@
#include <unistd.h>
#include <assert.h>
-#include "i18n.h"
+#include "../common/i18n.h"
#include "../common/exectool.h"
#include "../common/sysutils.h"
#include "../common/ccparray.h"
diff --git a/tools/gpgtar-list.c b/tools/gpgtar-list.c
index 8286d0861..0e10be8a0 100644
--- a/tools/gpgtar-list.c
+++ b/tools/gpgtar-list.c
@@ -24,7 +24,7 @@
#include <string.h>
#include <assert.h>
-#include "i18n.h"
+#include "../common/i18n.h"
#include "gpgtar.h"
#include "../common/exectool.h"
#include "../common/ccparray.h"
diff --git a/tools/gpgtar.c b/tools/gpgtar.c
index 3dff176e1..2757ab011 100644
--- a/tools/gpgtar.c
+++ b/tools/gpgtar.c
@@ -34,9 +34,9 @@
#include <string.h>
#include <assert.h>
-#include "util.h"
-#include "i18n.h"
-#include "sysutils.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
#include "../common/openpgpdefs.h"
#include "../common/init.h"
#include "../common/strlist.h"
diff --git a/tools/mime-maker.c b/tools/mime-maker.c
index 2e3206964..0332f3169 100644
--- a/tools/mime-maker.c
+++ b/tools/mime-maker.c
@@ -22,8 +22,8 @@
#include <stdlib.h>
#include <string.h>
-#include "util.h"
-#include "zb32.h"
+#include "../common/util.h"
+#include "../common/zb32.h"
#include "mime-maker.h"
diff --git a/tools/mime-parser.c b/tools/mime-parser.c
index 169ea2b1e..08b021925 100644
--- a/tools/mime-parser.c
+++ b/tools/mime-parser.c
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <string.h>
-#include "util.h"
+#include "../common/util.h"
#include "rfc822parse.h"
#include "mime-parser.h"
diff --git a/tools/send-mail.c b/tools/send-mail.c
index 56f250029..34d47c16d 100644
--- a/tools/send-mail.c
+++ b/tools/send-mail.c
@@ -22,9 +22,9 @@
#include <stdlib.h>
#include <string.h>
-#include "util.h"
-#include "exectool.h"
-#include "sysutils.h"
+#include "../common/util.h"
+#include "../common/exectool.h"
+#include "../common/sysutils.h"
#include "send-mail.h"
diff --git a/tools/wks-receive.c b/tools/wks-receive.c
index 94f8bc6a9..49a15179b 100644
--- a/tools/wks-receive.c
+++ b/tools/wks-receive.c
@@ -22,9 +22,9 @@
#include <stdlib.h>
#include <string.h>
-#include "util.h"
-#include "ccparray.h"
-#include "exectool.h"
+#include "../common/util.h"
+#include "../common/ccparray.h"
+#include "../common/exectool.h"
#include "gpg-wks.h"
#include "rfc822parse.h"
#include "mime-parser.h"
diff --git a/tools/wks-util.c b/tools/wks-util.c
index e6f6b7acd..389d4a4da 100644
--- a/tools/wks-util.c
+++ b/tools/wks-util.c
@@ -22,11 +22,11 @@
#include <stdlib.h>
#include <string.h>
-#include "util.h"
-#include "status.h"
-#include "ccparray.h"
-#include "exectool.h"
-#include "mbox-util.h"
+#include "../common/util.h"
+#include "../common/status.h"
+#include "../common/ccparray.h"
+#include "../common/exectool.h"
+#include "../common/mbox-util.h"
#include "mime-maker.h"
#include "send-mail.h"
#include "gpg-wks.h"
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-07 02:21:05 +0100