Remove -I option to common.
authorNIIBE Yutaka <gniibe@fsij.org>
Tue, 7 Mar 2017 11:21:23 +0000 (20:21 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Tue, 7 Mar 2017 11:25:54 +0000 (20:25 +0900)
* dirmngr/Makefile.am (AM_CPPFLAGS): Remove -I$(top_srcdir)/common.
* g10/Makefile.am (AM_CPPFLAGS): Ditto.
* g13/Makefile.am (AM_CPPFLAGS): Ditto.
* kbx/Makefile.am (AM_CPPFLAGS): Ditto.
* scd/Makefile.am (AM_CPPFLAGS): Ditto.
* sm/Makefile.am (AM_CPPFLAGS): Ditto.
* tools/Makefile.am (AM_CPPFLAGS): Ditto.
* Throughout: Follow the change.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
164 files changed:
dirmngr/Makefile.am
dirmngr/dirmngr-client.c
dirmngr/dirmngr.c
dirmngr/dirmngr_ldap.c
dirmngr/dns-stuff.c
dirmngr/http.c
dirmngr/ks-engine-finger.c
dirmngr/ks-engine-hkp.c
dirmngr/ks-engine-kdns.c
dirmngr/ks-engine-ldap.c
dirmngr/ldap-parse-uri.c
dirmngr/ldap-parse-uri.h
dirmngr/ldap-wrapper.c
dirmngr/ldap.c
dirmngr/misc.c
dirmngr/server.c
dirmngr/t-dns-stuff.c
dirmngr/t-http.c
g10/Makefile.am
g10/armor.c
g10/build-packet.c
g10/call-agent.c
g10/call-dirmngr.c
g10/card-util.c
g10/cipher.c
g10/compress-bz2.c
g10/compress.c
g10/cpr.c
g10/dearmor.c
g10/decrypt-data.c
g10/decrypt.c
g10/delkey.c
g10/ecdh.c
g10/encrypt.c
g10/exec.c
g10/export.c
g10/filter.h
g10/free-packet.c
g10/getkey.c
g10/gpg.c
g10/gpgsql.c
g10/gpgv.c
g10/helptext.c
g10/import.c
g10/kbnode.c
g10/keydb.c
g10/keydb.h
g10/keyedit.c
g10/keygen.c
g10/keyid.c
g10/keylist.c
g10/keyring.c
g10/keyserver-internal.h
g10/keyserver.c
g10/main.h
g10/mainproc.c
g10/mdfilter.c
g10/migrate.c
g10/misc.c
g10/openfile.c
g10/options.h
g10/packet.h
g10/parse-packet.c
g10/passphrase.c
g10/photoid.c
g10/pkclist.c
g10/pkglue.c
g10/plaintext.c
g10/progress.c
g10/pubkey-enc.c
g10/revoke.c
g10/server.c
g10/seskey.c
g10/sig-check.c
g10/sign.c
g10/skclist.c
g10/t-stutter.c
g10/tdbdump.c
g10/tdbio.c
g10/tdbio.h
g10/test-stubs.c
g10/textfilter.c
g10/tofu.c
g10/trust.c
g10/trustdb.c
g10/verify.c
g13/Makefile.am
g13/backend.c
g13/be-dmcrypt.c
g13/be-encfs.c
g13/be-truecrypt.c
g13/call-syshelp.c
g13/create.c
g13/g13-common.c
g13/g13-syshelp.c
g13/g13.c
g13/keyblob.c
g13/mount.c
g13/mountinfo.c
g13/runner.c
g13/server.c
g13/sh-blockdev.c
g13/sh-cmd.c
g13/sh-dmcrypt.c
g13/suspend.c
g13/t-g13tuple.c
kbx/Makefile.am
kbx/kbxutil.c
kbx/keybox-dump.c
kbx/keybox-openpgp.c
kbx/keybox-search.c
kbx/keybox-util.c
scd/Makefile.am
scd/apdu.c
scd/app-dinsig.c
scd/app-geldkarte.c
scd/app-help.c
scd/app-nks.c
scd/app-openpgp.c
scd/app-p15.c
scd/app-sc-hsm.c
scd/app.c
scd/command.c
scd/scdaemon.c
sm/Makefile.am
sm/call-agent.c
sm/call-dirmngr.c
sm/certchain.c
sm/certcheck.c
sm/certdump.c
sm/certlist.c
sm/certreqgen-ui.c
sm/certreqgen.c
sm/decrypt.c
sm/delete.c
sm/encrypt.c
sm/export.c
sm/fingerprint.c
sm/gpgsm.c
sm/import.c
sm/keydb.c
sm/keylist.c
sm/misc.c
sm/qualified.c
sm/server.c
sm/sign.c
sm/verify.c
tools/Makefile.am
tools/call-dirmngr.c
tools/gpg-check-pattern.c
tools/gpg-connect-agent.c
tools/gpg-wks-client.c
tools/gpgconf-comp.c
tools/gpgconf.c
tools/gpgsplit.c
tools/gpgtar-create.c
tools/gpgtar-extract.c
tools/gpgtar-list.c
tools/gpgtar.c
tools/mime-maker.c
tools/mime-parser.c
tools/send-mail.c
tools/wks-receive.c
tools/wks-util.c

index 93880f8..34f2c5d 100644 (file)
@@ -31,7 +31,7 @@ endif
 noinst_PROGRAMS = $(module_tests) $(module_net_tests) $(module_maint_tests)
 TESTS = $(module_tests) $(module_net_tests)
 
-AM_CPPFLAGS = -I$(top_srcdir)/common
+AM_CPPFLAGS =
 
 include $(top_srcdir)/am/cmacros.am
 
index 01cface..c1ff635 100644 (file)
@@ -38,9 +38,9 @@
 #include "../common/strlist.h"
 #include "../common/asshelp.h"
 
-#include "i18n.h"
-#include "util.h"
-#include "init.h"
+#include "../common/i18n.h"
+#include "../common/util.h"
+#include "../common/init.h"
 
 
 /* Constants for the options.  */
index f05bdd1..e3e02fe 100644 (file)
 #if USE_LDAP
 # include "ldapserver.h"
 #endif
-#include "asshelp.h"
+#include "../common/asshelp.h"
 #if USE_LDAP
 # include "ldap-wrapper.h"
 #endif
 #include "../common/init.h"
-#include "gc-opt-flags.h"
+#include "../common/gc-opt-flags.h"
 #include "dns-stuff.h"
 #include "http-common.h"
 
index a0acb8e..836ced0 100644 (file)
@@ -56,8 +56,8 @@
 #include "../common/mischelp.h"
 #include "../common/strlist.h"
 
-#include "i18n.h"
-#include "util.h"
+#include "../common/i18n.h"
+#include "../common/util.h"
 #include "../common/init.h"
 
 /* With the ldap wrapper, there is no need for the npth_unprotect and leave
index 57b3b7e..ec9a095 100644 (file)
@@ -68,8 +68,8 @@
 #endif
 
 #include "./dirmngr-err.h"
-#include "util.h"
-#include "host2net.h"
+#include "../common/util.h"
+#include "../common/host2net.h"
 #include "dns-stuff.h"
 
 #ifdef USE_NPTH
index 0f11af7..3adf6e5 100644 (file)
@@ -96,8 +96,8 @@
 
 #include <assuan.h>  /* We need the socket wrapper.  */
 
-#include "util.h"
-#include "i18n.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
 #include "dns-stuff.h"
 #include "http.h"
 #include "http-common.h"
index 811b72d..82ef7a5 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "dirmngr.h"
 #include "misc.h"
-#include "userids.h"
+#include "../common/userids.h"
 #include "ks-engine.h"
 
 /* Print a help output for the schemata supported by this module. */
index b6a0675..ee7d506 100644 (file)
@@ -37,7 +37,7 @@
 
 #include "dirmngr.h"
 #include "misc.h"
-#include "userids.h"
+#include "../common/userids.h"
 #include "dns-stuff.h"
 #include "ks-engine.h"
 
index 9bb0d42..71463fe 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "dirmngr.h"
 #include "misc.h"
-#include "userids.h"
+#include "../common/userids.h"
 #include "ks-engine.h"
 
 /* Print a help output for the schemata supported by this module. */
index f664655..f50ba50 100644 (file)
@@ -45,7 +45,7 @@
 
 #include "dirmngr.h"
 #include "misc.h"
-#include "userids.h"
+#include "../common/userids.h"
 #include "ks-engine.h"
 #include "ldap-parse-uri.h"
 
index 9671496..94d4efd 100644 (file)
@@ -27,7 +27,7 @@
 # include <ldap.h>
 #endif
 
-#include "util.h"
+#include "../common/util.h"
 #include "http.h"
 
 /* Returns 1 if the string is an LDAP URL (begins with ldap:, ldaps:
index bdbb6c3..e9a3f95 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef DIRMNGR_LDAP_PARSE_URI_H
 #define DIRMNGR_LDAP_PARSE_URI_H
 
-#include "util.h"
+#include "../common/util.h"
 #include "http.h"
 
 extern int ldap_uri_p (const char *url);
index b313848..ac4964a 100644 (file)
@@ -58,7 +58,7 @@
 #include <npth.h>
 
 #include "dirmngr.h"
-#include "exechelp.h"
+#include "../common/exechelp.h"
 #include "misc.h"
 #include "ldap-wrapper.h"
 
index a037f5d..d661a68 100644 (file)
 #include <npth.h>
 
 #include "dirmngr.h"
-#include "exechelp.h"
+#include "../common/exechelp.h"
 #include "crlfetch.h"
 #include "ldapserver.h"
 #include "misc.h"
 #include "ldap-wrapper.h"
-#include "host2net.h"
+#include "../common/host2net.h"
 
 
 #define UNENCODED_URL_CHARS "abcdefghijklmnopqrstuvwxyz"   \
index 6d7c963..1716141 100644 (file)
@@ -27,7 +27,7 @@
 #include <errno.h>
 
 #include "dirmngr.h"
-#include "util.h"
+#include "../common/util.h"
 #include "misc.h"
 
 
index 9fa8229..f4aeadb 100644 (file)
@@ -51,9 +51,9 @@
 # include "ldap-parse-uri.h"
 #endif
 #include "dns-stuff.h"
-#include "mbox-util.h"
-#include "zb32.h"
-#include "server-help.h"
+#include "../common/mbox-util.h"
+#include "../common/zb32.h"
+#include "../common/server-help.h"
 
 /* To avoid DoS attacks we limit the size of a certificate to
    something reasonable.  The DoS was actually only an issue back when
index 23c0c6a..5a3ede1 100644 (file)
@@ -24,7 +24,7 @@
 #include <assert.h>
 
 
-#include "util.h"
+#include "../common/util.h"
 #include "dns-stuff.h"
 
 #define PGM "t-dns-stuff"
index 35f5947..622dce5 100644 (file)
@@ -38,8 +38,8 @@
 #include <unistd.h>
 #include <assuan.h>
 
-#include "util.h"
-#include "logging.h"
+#include "../common/util.h"
+#include "../common/logging.h"
 #include "http.h"
 
 #include <ksba.h>
index 604be93..f1d2d17 100644 (file)
@@ -23,7 +23,7 @@ EXTRA_DIST = options.skel dirmngr-conf.skel distsigkey.gpg \
             gpg.w32-manifest.in test.c t-keydb-keyring.kbx \
             t-keydb-get-keyblock.gpg t-stutter-data.asc
 
-AM_CPPFLAGS = -I$(top_srcdir)/common
+AM_CPPFLAGS =
 
 include $(top_srcdir)/am/cmacros.am
 
index 6b7c3f7..7fb9a89 100644 (file)
 #include <ctype.h>
 
 #include "gpg.h"
-#include "status.h"
-#include "iobuf.h"
-#include "util.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
+#include "../common/util.h"
 #include "filter.h"
 #include "packet.h"
 #include "options.h"
 #include "main.h"
-#include "status.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 
 #define MAX_LINELEN 20000
 
index 489fadd..c81c1ab 100644 (file)
 #include <ctype.h>
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "packet.h"
-#include "status.h"
-#include "iobuf.h"
-#include "i18n.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
+#include "../common/i18n.h"
 #include "options.h"
-#include "host2net.h"
+#include "../common/host2net.h"
 
 static int do_user_id( IOBUF out, int ctb, PKT_user_id *uid );
 static int do_key (iobuf_t out, int ctb, PKT_public_key *pk);
index 7c30bdb..7d627bb 100644 (file)
 
 #include "gpg.h"
 #include <assuan.h>
-#include "util.h"
-#include "membuf.h"
+#include "../common/util.h"
+#include "../common/membuf.h"
 #include "options.h"
-#include "i18n.h"
-#include "asshelp.h"
-#include "sysutils.h"
+#include "../common/i18n.h"
+#include "../common/asshelp.h"
+#include "../common/sysutils.h"
 #include "call-agent.h"
-#include "status.h"
+#include "../common/status.h"
 #include "../common/shareddefs.h"
-#include "host2net.h"
+#include "../common/host2net.h"
 
 #define CONTROL_D ('D' - 'A' + 1)
 
index 2f2ba98..a33cdc7 100644 (file)
 
 #include "gpg.h"
 #include <assuan.h>
-#include "util.h"
-#include "membuf.h"
+#include "../common/util.h"
+#include "../common/membuf.h"
 #include "options.h"
-#include "i18n.h"
-#include "asshelp.h"
-#include "keyserver.h"
-#include "status.h"
+#include "../common/i18n.h"
+#include "../common/asshelp.h"
+#include "../common/keyserver.h"
+#include "../common/status.h"
 #include "call-dirmngr.h"
 
 
index 969f6c9..9bc3e25 100644 (file)
 #if GNUPG_MAJOR_VERSION != 1
 # include "gpg.h"
 #endif /*GNUPG_MAJOR_VERSION != 1*/
-#include "util.h"
-#include "i18n.h"
-#include "ttyio.h"
-#include "status.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
+#include "../common/ttyio.h"
+#include "../common/status.h"
 #include "options.h"
 #include "main.h"
 #include "keyserver-internal.h"
index 98f398e..655937f 100644 (file)
 #include <errno.h>
 
 #include "gpg.h"
-#include "status.h"
-#include "iobuf.h"
-#include "util.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
+#include "../common/util.h"
 #include "filter.h"
 #include "packet.h"
 #include "options.h"
 #include "main.h"
-#include "status.h"
+#include "../common/status.h"
 
 
 #define MIN_PARTIAL_SIZE 512
index 22cefd9..4adca9b 100644 (file)
@@ -23,7 +23,7 @@
 #include <bzlib.h>
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "packet.h"
 #include "filter.h"
 #include "main.h"
index a14d107..61bb756 100644 (file)
@@ -38,7 +38,7 @@
 #endif
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "packet.h"
 #include "filter.h"
 #include "main.h"
index 4984e89..3391071 100644 (file)
--- a/g10/cpr.c
+++ b/g10/cpr.c
 #endif
 
 #include "gpg.h"
-#include "util.h"
-#include "status.h"
-#include "ttyio.h"
+#include "../common/util.h"
+#include "../common/status.h"
+#include "../common/ttyio.h"
 #include "options.h"
 #include "main.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 
 #define CONTROL_D ('D' - 'A' + 1)
 
index 6217dda..92239cc 100644 (file)
 #include <errno.h>
 
 #include "gpg.h"
-#include "status.h"
-#include "iobuf.h"
-#include "util.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
+#include "../common/util.h"
 #include "filter.h"
 #include "packet.h"
 #include "options.h"
 #include "main.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 
 /****************
  * Take an armor file and write it out without armor
index 585b150..11a253f 100644 (file)
 #include <string.h>
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "packet.h"
 #include "options.h"
-#include "i18n.h"
-#include "status.h"
+#include "../common/i18n.h"
+#include "../common/status.h"
 
 
 static int mdc_decode_filter ( void *opaque, int control, IOBUF a,
index c99f064..4d6734d 100644 (file)
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "status.h"
-#include "iobuf.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
 #include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
 #include "main.h"
-#include "status.h"
-#include "i18n.h"
+#include "../common/status.h"
+#include "../common/i18n.h"
 
 /* Assume that the input is an encrypted message and decrypt
  * (and if signed, verify the signature on) it.
index 06aca9e..547b40d 100644 (file)
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "status.h"
-#include "iobuf.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
 #include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
 #include "main.h"
 #include "trustdb.h"
 #include "filter.h"
-#include "ttyio.h"
-#include "status.h"
-#include "i18n.h"
+#include "../common/ttyio.h"
+#include "../common/i18n.h"
 #include "call-agent.h"
 
 
index 89e8cf1..6c2a56b 100644 (file)
@@ -24,7 +24,7 @@
 #include <errno.h>
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "pkglue.h"
 #include "main.h"
 #include "options.h"
index 6130ba0..0a892c2 100644 (file)
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "status.h"
-#include "iobuf.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
 #include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
 #include "main.h"
 #include "filter.h"
 #include "trustdb.h"
-#include "i18n.h"
-#include "status.h"
+#include "../common/i18n.h"
+#include "../common/status.h"
 #include "pkglue.h"
 
 
index b868a1f..74a8397 100644 (file)
 
 #include "gpg.h"
 #include "options.h"
-#include "i18n.h"
-#include "iobuf.h"
-#include "util.h"
-#include "membuf.h"
-#include "sysutils.h"
+#include "../common/i18n.h"
+#include "../common/iobuf.h"
+#include "../common/util.h"
+#include "../common/membuf.h"
+#include "../common/sysutils.h"
 #include "exec.h"
 
 #ifdef NO_EXEC
index 323bf17..2da5309 100644 (file)
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "status.h"
+#include "../common/status.h"
 #include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
 #include "main.h"
-#include "i18n.h"
-#include "membuf.h"
-#include "host2net.h"
-#include "zb32.h"
-#include "recsel.h"
-#include "mbox-util.h"
-#include "init.h"
+#include "../common/i18n.h"
+#include "../common/membuf.h"
+#include "../common/host2net.h"
+#include "../common/zb32.h"
+#include "../common/recsel.h"
+#include "../common/mbox-util.h"
+#include "../common/init.h"
 #include "trustdb.h"
 #include "call-agent.h"
 
index 7accd7d..275608d 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef G10_FILTER_H
 #define G10_FILTER_H
 
-#include "types.h"
+#include "../common/types.h"
 #include "dek.h"
 
 typedef struct {
index 6038d26..01db2a0 100644 (file)
@@ -24,7 +24,7 @@
 #include <string.h>
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "packet.h"
 #include "../common/iobuf.h"
 #include "options.h"
index be7367f..548f8bf 100644 (file)
 #include <ctype.h>
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "packet.h"
-#include "iobuf.h"
+#include "../common/iobuf.h"
 #include "keydb.h"
 #include "options.h"
 #include "main.h"
 #include "trustdb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "keyserver-internal.h"
 #include "call-agent.h"
-#include "host2net.h"
-#include "mbox-util.h"
-#include "status.h"
+#include "../common/host2net.h"
+#include "../common/mbox-util.h"
+#include "../common/status.h"
 
 #define MAX_PK_CACHE_ENTRIES   PK_UID_CACHE_SIZE
 #define MAX_UID_CACHE_ENTRIES  PK_UID_CACHE_SIZE
index 654dcb9..eeda60f 100644 (file)
--- a/g10/gpg.c
+++ b/g10/gpg.c
 #include "gpg.h"
 #include <assuan.h>
 #include "../common/iobuf.h"
-#include "util.h"
+#include "../common/util.h"
 #include "packet.h"
-#include "membuf.h"
+#include "../common/membuf.h"
 #include "main.h"
 #include "options.h"
 #include "keydb.h"
 #include "trustdb.h"
 #include "filter.h"
-#include "ttyio.h"
-#include "i18n.h"
-#include "sysutils.h"
-#include "status.h"
+#include "../common/ttyio.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
+#include "../common/status.h"
 #include "keyserver-internal.h"
 #include "exec.h"
-#include "gc-opt-flags.h"
-#include "asshelp.h"
+#include "../common/gc-opt-flags.h"
+#include "../common/asshelp.h"
 #include "call-dirmngr.h"
 #include "tofu.h"
 #include "../common/init.h"
index 661bd35..5b75569 100644 (file)
@@ -23,8 +23,8 @@
 #include <string.h>
 
 #include "gpg.h"
-#include "util.h"
-#include "logging.h"
+#include "../common/util.h"
+#include "../common/logging.h"
 
 #include "gpgsql.h"
 
index a6d1add..5ee26b4 100644 (file)
 
 #define INCLUDED_BY_MAIN_MODULE 1
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "packet.h"
-#include "iobuf.h"
+#include "../common/iobuf.h"
 #include "main.h"
 #include "options.h"
 #include "keydb.h"
 #include "trustdb.h"
 #include "filter.h"
-#include "ttyio.h"
-#include "i18n.h"
-#include "sysutils.h"
-#include "status.h"
+#include "../common/ttyio.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
+#include "../common/status.h"
 #include "call-agent.h"
 #include "../common/init.h"
 
index 730f699..8b85101 100644 (file)
 #include <string.h>
 
 #include "gpg.h"
-#include "util.h"
-#include "ttyio.h"
+#include "../common/util.h"
+#include "../common/ttyio.h"
 #include "main.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 
 
 
index 6383d70..640618a 100644 (file)
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "status.h"
+#include "../common/status.h"
 #include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
 #include "trustdb.h"
 #include "main.h"
-#include "i18n.h"
-#include "ttyio.h"
-#include "status.h"
-#include "recsel.h"
+#include "../common/i18n.h"
+#include "../common/ttyio.h"
+#include "../common/recsel.h"
 #include "keyserver-internal.h"
 #include "call-agent.h"
 #include "../common/membuf.h"
index 6700dc0..153dce2 100644 (file)
@@ -24,7 +24,7 @@
 #include <string.h>
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "../common/init.h"
 #include "packet.h"
 #include "keydb.h"
index 4c5149d..27dacf2 100644 (file)
 #include <unistd.h>
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "options.h"
 #include "main.h" /*try_make_homedir ()*/
 #include "packet.h"
 #include "keyring.h"
 #include "../kbx/keybox.h"
 #include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 
 static int active_handles;
 
index c9f5b1c..6f57583 100644 (file)
@@ -22,8 +22,8 @@
 #ifndef G10_KEYDB_H
 #define G10_KEYDB_H
 
-#include "types.h"
-#include "util.h"
+#include "../common/types.h"
+#include "../common/util.h"
 #include "packet.h"
 
 /* What qualifies as a certification (rather than a signature?) */
index c591600..c10a011 100644 (file)
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "status.h"
-#include "iobuf.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
 #include "keydb.h"
 #include "photoid.h"
-#include "util.h"
+#include "../common/util.h"
 #include "main.h"
 #include "trustdb.h"
 #include "filter.h"
-#include "ttyio.h"
-#include "status.h"
-#include "i18n.h"
+#include "../common/ttyio.h"
+#include "../common/status.h"
+#include "../common/i18n.h"
 #include "keyserver-internal.h"
 #include "call-agent.h"
-#include "host2net.h"
+#include "../common/host2net.h"
 #include "tofu.h"
 
 static void show_prefs (PKT_user_id * uid, PKT_signature * selfsig,
index 201ebaa..44f139a 100644 (file)
 #include <unistd.h>
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "main.h"
 #include "packet.h"
-#include "ttyio.h"
+#include "../common/ttyio.h"
 #include "options.h"
 #include "keydb.h"
 #include "trustdb.h"
-#include "status.h"
-#include "i18n.h"
+#include "../common/status.h"
+#include "../common/i18n.h"
 #include "keyserver-internal.h"
 #include "call-agent.h"
 #include "pkglue.h"
 #include "../common/shareddefs.h"
-#include "host2net.h"
-#include "mbox-util.h"
+#include "../common/host2net.h"
+#include "../common/mbox-util.h"
 
 
 /* The default algorithms.  If you change them remember to change them
index 6e8d97f..1d3f46c 100644 (file)
 #include <time.h>
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "main.h"
 #include "packet.h"
 #include "options.h"
 #include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "rmd160.h"
-#include "host2net.h"
+#include "../common/host2net.h"
 
 
 #define KEYID_STR_SIZE 19
index 2684f59..93b5ee6 100644 (file)
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "status.h"
+#include "../common/status.h"
 #include "keydb.h"
 #include "photoid.h"
-#include "util.h"
-#include "ttyio.h"
+#include "../common/util.h"
+#include "../common/ttyio.h"
 #include "trustdb.h"
 #include "main.h"
-#include "i18n.h"
-#include "status.h"
+#include "../common/i18n.h"
+#include "../common/status.h"
 #include "call-agent.h"
-#include "mbox-util.h"
-#include "zb32.h"
+#include "../common/mbox-util.h"
+#include "../common/zb32.h"
 #include "tofu.h"
 
 
index 9b7b5fd..31f60f9 100644 (file)
 #include <sys/stat.h>
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "keyring.h"
 #include "packet.h"
 #include "keydb.h"
 #include "options.h"
 #include "main.h" /*for check_key_signature()*/
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "../kbx/keybox.h"
 
 
index 77b362e..02452e8 100644 (file)
@@ -23,7 +23,7 @@
 #include <time.h>
 #include "../common/keyserver.h"
 #include "../common/iobuf.h"
-#include "types.h"
+#include "../common/types.h"
 
 int parse_keyserver_options(char *options);
 void free_keyserver_spec(struct keyserver_spec *keyserver);
index c7363c9..0794527 100644 (file)
 #include <errno.h>
 
 #include "gpg.h"
-#include "iobuf.h"
+#include "../common/iobuf.h"
 #include "filter.h"
 #include "keydb.h"
-#include "status.h"
+#include "../common/status.h"
 #include "exec.h"
 #include "main.h"
-#include "i18n.h"
-#include "ttyio.h"
+#include "../common/i18n.h"
+#include "../common/ttyio.h"
 #include "options.h"
 #include "packet.h"
 #include "trustdb.h"
 #include "keyserver-internal.h"
-#include "util.h"
-#include "membuf.h"
-#include "mbox-util.h"
+#include "../common/util.h"
+#include "../common/membuf.h"
+#include "../common/mbox-util.h"
 #include "call-dirmngr.h"
 
 #ifdef HAVE_W32_SYSTEM
index 6837e98..f58f041 100644 (file)
 #ifndef G10_MAIN_H
 #define G10_MAIN_H
 
-#include "types.h"
-#include "iobuf.h"
+#include "../common/types.h"
+#include "../common/iobuf.h"
 #include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
 
 /* It could be argued that the default cipher should be 3DES rather
    than AES128, and the default compression should be 0
index 4f8d0be..2acd51e 100644 (file)
 #include <time.h>
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "packet.h"
-#include "iobuf.h"
+#include "../common/iobuf.h"
 #include "options.h"
 #include "keydb.h"
 #include "filter.h"
 #include "main.h"
-#include "status.h"
-#include "i18n.h"
+#include "../common/status.h"
+#include "../common/i18n.h"
 #include "trustdb.h"
 #include "keyserver-internal.h"
 #include "photoid.h"
-#include "mbox-util.h"
+#include "../common/mbox-util.h"
 #include "call-dirmngr.h"
 
 /* Put an upper limit on nested packets.  The 32 is an arbitrary
index 69b226c..f3318f1 100644 (file)
@@ -24,9 +24,9 @@
 #include <errno.h>
 
 #include "gpg.h"
-#include "status.h"
-#include "iobuf.h"
-#include "util.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
+#include "../common/util.h"
 #include "filter.h"
 
 
index 6ff1014..c52c67a 100644 (file)
@@ -27,7 +27,7 @@
 #include "gpg.h"
 #include "options.h"
 #include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
 #include "main.h"
 #include "call-agent.h"
 
index ac00009..c69f994 100644 (file)
 
 #include "gpg.h"
 #ifdef HAVE_W32_SYSTEM
-# include "status.h"
+# include "../common/status.h"
 #endif /*HAVE_W32_SYSTEM*/
-#include "util.h"
+#include "../common/util.h"
 #include "main.h"
 #include "photoid.h"
 #include "options.h"
 #include "call-agent.h"
-#include "i18n.h"
-#include "zb32.h"
+#include "../common/i18n.h"
+#include "../common/zb32.h"
 
 
 #ifdef ENABLE_SELINUX_HACKS
index f62deec..2257107 100644 (file)
 #include <unistd.h>
 
 #include "gpg.h"
-#include "util.h"
-#include "ttyio.h"
+#include "../common/util.h"
+#include "../common/ttyio.h"
 #include "options.h"
 #include "main.h"
-#include "status.h"
-#include "i18n.h"
+#include "../common/status.h"
+#include "../common/i18n.h"
 
 #ifdef USE_ONLY_8DOT3
 #define SKELEXT ".skl"
index 88a8f32..def6385 100644 (file)
@@ -22,7 +22,7 @@
 #define G10_OPTIONS_H
 
 #include <sys/types.h>
-#include <types.h>
+#include "../common/types.h"
 #include <stdint.h>
 #include "main.h"
 #include "packet.h"
index 9780d93..3457f53 100644 (file)
 #ifndef G10_PACKET_H
 #define G10_PACKET_H
 
-#include "types.h"
+#include "../common/types.h"
 #include "../common/iobuf.h"
 #include "../common/strlist.h"
 #include "dek.h"
 #include "filter.h"
 #include "../common/openpgpdefs.h"
 #include "../common/userids.h"
-#include "util.h"
+#include "../common/util.h"
 
 #define DEBUG_PARSE_PACKET 1
 
index 7f44ce5..06b286b 100644 (file)
 #include <string.h>
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "packet.h"
-#include "iobuf.h"
+#include "../common/iobuf.h"
 #include "filter.h"
 #include "photoid.h"
 #include "options.h"
 #include "main.h"
-#include "i18n.h"
-#include "host2net.h"
+#include "../common/i18n.h"
+#include "../common/host2net.h"
 
 
 /* Maximum length of packets to avoid excessive memory allocation.  */
index 37abc0f..02371fe 100644 (file)
 #endif
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "options.h"
-#include "ttyio.h"
+#include "../common/ttyio.h"
 #include "keydb.h"
 #include "main.h"
-#include "i18n.h"
-#include "status.h"
+#include "../common/i18n.h"
+#include "../common/status.h"
 #include "call-agent.h"
 #include "../common/shareddefs.h"
 
index 8b193b3..bcea64f 100644 (file)
 #endif
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "packet.h"
-#include "status.h"
+#include "../common/status.h"
 #include "exec.h"
 #include "keydb.h"
-#include "i18n.h"
-#include "iobuf.h"
+#include "../common/i18n.h"
+#include "../common/iobuf.h"
 #include "options.h"
 #include "main.h"
 #include "photoid.h"
-#include "ttyio.h"
+#include "../common/ttyio.h"
 #include "trustdb.h"
 
 /* Generate a new photo id packet, or return NULL if canceled.
index 012f751..698794e 100644 (file)
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "status.h"
+#include "../common/status.h"
 #include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
 #include "main.h"
 #include "trustdb.h"
-#include "ttyio.h"
-#include "status.h"
+#include "../common/ttyio.h"
+#include "../common/status.h"
 #include "photoid.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "tofu.h"
 
 #define CONTROL_D ('D' - 'A' + 1)
index ce24a2e..8021a94 100644 (file)
@@ -25,7 +25,7 @@
 #include <errno.h>
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "pkglue.h"
 #include "main.h"
 #include "options.h"
index 40ce603..c5d1ddb 100644 (file)
 #endif
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "options.h"
 #include "packet.h"
-#include "ttyio.h"
+#include "../common/ttyio.h"
 #include "filter.h"
 #include "main.h"
-#include "status.h"
-#include "i18n.h"
+#include "../common/status.h"
+#include "../common/i18n.h"
 
 
 /* Get the output filename.  On success, the actual filename that is
index feb639e..7e777d4 100644 (file)
 #include <stdio.h>
 
 #include "gpg.h"
-#include "iobuf.h"
+#include "../common/iobuf.h"
 #include "filter.h"
-#include "status.h"
-#include "util.h"
+#include "../common/status.h"
+#include "../common/util.h"
 #include "options.h"
 
 /* Create a new context for use with the progress filter.  We need to
index e037c12..cc962cf 100644 (file)
 #include <string.h>
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "packet.h"
 #include "keydb.h"
 #include "trustdb.h"
-#include "status.h"
+#include "../common/status.h"
 #include "options.h"
 #include "main.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "pkglue.h"
 #include "call-agent.h"
-#include "host2net.h"
+#include "../common/host2net.h"
 
 
 static gpg_error_t get_it (PKT_pubkey_enc *k,
index 3a2b068..122699f 100644 (file)
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "status.h"
+#include "../common/status.h"
 #include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
 #include "main.h"
-#include "ttyio.h"
-#include "status.h"
-#include "i18n.h"
+#include "../common/ttyio.h"
+#include "../common/i18n.h"
 #include "call-agent.h"
 
 struct revocation_reason_info {
index e3a3bad..60b447c 100644 (file)
 
 #include "gpg.h"
 #include <assuan.h>
-#include "util.h"
-#include "i18n.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
 #include "options.h"
 #include "../common/server-help.h"
 #include "../common/sysutils.h"
-#include "status.h"
+#include "../common/status.h"
 
 
 #define set_error(e,t) assuan_set_error (ctx, gpg_error (e), (t))
index b2f7169..8617938 100644 (file)
 #include <string.h>
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "options.h"
 #include "main.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 
 
 /* Generate a new session key in *DEK that is appropriate for the
index 4df29af..4e6ca43 100644 (file)
 #include <string.h>
 
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "packet.h"
 #include "keydb.h"
 #include "main.h"
-#include "status.h"
-#include "i18n.h"
+#include "../common/status.h"
+#include "../common/i18n.h"
 #include "options.h"
 #include "pkglue.h"
 
index ff099b3..801c809 100644 (file)
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "status.h"
-#include "iobuf.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
 #include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
 #include "main.h"
 #include "filter.h"
-#include "ttyio.h"
+#include "../common/ttyio.h"
 #include "trustdb.h"
-#include "status.h"
-#include "i18n.h"
+#include "../common/status.h"
+#include "../common/i18n.h"
 #include "pkglue.h"
-#include "sysutils.h"
+#include "../common/sysutils.h"
 #include "call-agent.h"
-#include "mbox-util.h"
+#include "../common/mbox-util.h"
 
 #ifdef HAVE_DOSISH_SYSTEM
 #define LF "\r\n"
index cedbce7..7a791b3 100644 (file)
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "status.h"
+#include "../common/status.h"
 #include "keydb.h"
-#include "util.h"
-#include "i18n.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
 
 
 /* Return true if Libgcrypt's RNG is in faked mode.  */
index 359cdf6..f4a9a59 100644 (file)
@@ -54,7 +54,7 @@
 #include "gpg.h"
 #include "main.h"
 #include "../common/types.h"
-#include "util.h"
+#include "../common/util.h"
 #include "dek.h"
 #include "../common/logging.h"
 
index ab2f072..a5ad32d 100644 (file)
 #include <unistd.h>
 
 #include "gpg.h"
-#include "status.h"
-#include "iobuf.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
 #include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
 #include "trustdb.h"
 #include "options.h"
 #include "packet.h"
 #include "main.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "tdbio.h"
 
 
index c1cb312..a7b7412 100644 (file)
 #include <unistd.h>
 
 #include "gpg.h"
-#include "status.h"
-#include "iobuf.h"
-#include "util.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
+#include "../common/util.h"
 #include "options.h"
 #include "main.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "trustdb.h"
 #include "tdbio.h"
 
index 1f66b03..e2cbbff 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef G10_TDBIO_H
 #define G10_TDBIO_H
 
-#include "host2net.h"
+#include "../common/host2net.h"
 
 #define TRUST_RECORD_LEN 40
 #define SIGS_PER_RECORD        ((TRUST_RECORD_LEN-10)/5)
index a74df20..d541e0d 100644 (file)
 
 #define INCLUDED_BY_MAIN_MODULE 1
 #include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
 #include "packet.h"
-#include "iobuf.h"
+#include "../common/iobuf.h"
 #include "main.h"
 #include "options.h"
 #include "keydb.h"
 #include "trustdb.h"
 #include "filter.h"
-#include "ttyio.h"
-#include "i18n.h"
-#include "sysutils.h"
-#include "status.h"
+#include "../common/ttyio.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
+#include "../common/status.h"
 #include "call-agent.h"
 
 int g10_errors_seen;
index cb5d444..96666cf 100644 (file)
 #include <errno.h>
 
 #include "gpg.h"
-#include "status.h"
-#include "iobuf.h"
-#include "util.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
+#include "../common/util.h"
 #include "filter.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "options.h"
-#include "status.h"
+#include "../common/status.h"
 
 #ifdef HAVE_DOSISH_SYSTEM
 #define LF "\r\n"
index 8c41ad7..9d6a457 100644 (file)
 #include <time.h>
 
 #include "gpg.h"
-#include "types.h"
-#include "logging.h"
-#include "stringhelp.h"
+#include "../common/types.h"
+#include "../common/logging.h"
+#include "../common/stringhelp.h"
 #include "options.h"
-#include "mbox-util.h"
-#include "i18n.h"
-#include "ttyio.h"
+#include "../common/mbox-util.h"
+#include "../common/i18n.h"
+#include "../common/ttyio.h"
 #include "trustdb.h"
-#include "mkdir_p.h"
+#include "../common/mkdir_p.h"
 #include "gpgsql.h"
-#include "status.h"
+#include "../common/status.h"
 #include "sqrtu32.h"
 
 #include "tofu.h"
index d0ea77e..77fde4c 100644 (file)
 
 #include "gpg.h"
 #include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
 #include "options.h"
 #include "packet.h"
 #include "main.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "trustdb.h"
-#include "host2net.h"
+#include "../common/host2net.h"
 
 
 /* Return true if key is disabled.  Note that this is usually used via
index 7443051..a0b9d5f 100644 (file)
 #endif /* !DISABLE_REGEX */
 
 #include "gpg.h"
-#include "status.h"
-#include "iobuf.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
 #include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
 #include "options.h"
 #include "packet.h"
 #include "main.h"
-#include "mbox-util.h"
-#include "i18n.h"
+#include "../common/mbox-util.h"
+#include "../common/i18n.h"
 #include "tdbio.h"
 #include "trustdb.h"
 #include "tofu.h"
index 7327e85..4399f71 100644 (file)
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"
-#include "status.h"
-#include "iobuf.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
 #include "keydb.h"
-#include "util.h"
+#include "../common/util.h"
 #include "main.h"
-#include "status.h"
 #include "filter.h"
-#include "ttyio.h"
-#include "i18n.h"
+#include "../common/ttyio.h"
+#include "../common/i18n.h"
 
 
 /****************
index cc0e6a8..dfacc99 100644 (file)
@@ -26,7 +26,7 @@ sbin_PROGRAMS = g13-syshelp
 noinst_PROGRAMS = $(module_tests)
 TESTS = $(module_tests)
 
-AM_CPPFLAGS = -I$(top_srcdir)/common
+AM_CPPFLAGS =
 
 include $(top_srcdir)/am/cmacros.am
 
index a495f8a..0123b45 100644 (file)
@@ -26,7 +26,7 @@
 #include <sys/stat.h>
 
 #include "g13.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "keyblob.h"
 #include "backend.h"
 #include "be-encfs.h"
index e048b99..59b586d 100644 (file)
@@ -25,7 +25,7 @@
 #include <unistd.h>
 
 #include "g13.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "keyblob.h"
 #include "call-syshelp.h"
 #include "be-dmcrypt.h"
index 6c648ab..0e2c68b 100644 (file)
@@ -26,7 +26,7 @@
 #include <assert.h>
 
 #include "g13.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "keyblob.h"
 #include "be-encfs.h"
 #include "runner.h"
index e75b936..1ce992f 100644 (file)
@@ -25,7 +25,7 @@
 #include <unistd.h>
 
 #include "g13.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "be-truecrypt.h"
 
 
index adffc6e..8a50c3f 100644 (file)
 
 #include "g13.h"
 #include <assuan.h>
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "g13tuple.h"
 #include "keyblob.h"
-#include "membuf.h"
+#include "../common/membuf.h"
 #include "create.h"
 #include "call-syshelp.h"
 
index 573039d..d55b859 100644 (file)
@@ -27,7 +27,7 @@
 #include <assert.h>
 
 #include "g13.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "create.h"
 
 #include "keyblob.h"
index 8370907..35cb131 100644 (file)
@@ -29,8 +29,8 @@
 #include "g13-common.h"
 #include <gcrypt.h>
 #include <assuan.h>
-#include "i18n.h"
-#include "sysutils.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
 
 
 
index 8b8a4a7..bf71ac2 100644 (file)
@@ -36,9 +36,9 @@
 #include <gcrypt.h>
 #include <assuan.h>
 
-#include "i18n.h"
-#include "sysutils.h"
-#include "asshelp.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
+#include "../common/asshelp.h"
 #include "../common/init.h"
 #include "keyblob.h"
 
index 0553c85..4b925ed 100644 (file)
--- a/g13/g13.c
+++ b/g13/g13.c
 #include <gcrypt.h>
 #include <assuan.h>
 
-#include "i18n.h"
-#include "sysutils.h"
-#include "gc-opt-flags.h"
-#include "asshelp.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
+#include "../common/gc-opt-flags.h"
+#include "../common/asshelp.h"
 #include "../common/init.h"
 #include "keyblob.h"
 #include "server.h"
index 81863bb..1fb9be7 100644 (file)
@@ -32,7 +32,7 @@
 
 #include "keyblob.h"
 #include "../common/sysutils.h"
-#include "host2net.h"
+#include "../common/host2net.h"
 
 
 /* Parse the header prefix and return the length of the entire header.  */
index 7814d5c..dc415b1 100644 (file)
@@ -27,7 +27,7 @@
 #include <assert.h>
 
 #include "g13.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "mount.h"
 
 #include "keyblob.h"
@@ -35,7 +35,7 @@
 #include "g13tuple.h"
 #include "mountinfo.h"
 #include "runner.h"
-#include "host2net.h"
+#include "../common/host2net.h"
 #include "server.h"  /*(g13_keyblob_decrypt)*/
 #include "../common/sysutils.h"
 #include "call-syshelp.h"
index 26eca0c..ed898b8 100644 (file)
@@ -27,7 +27,7 @@
 #include <assert.h>
 
 #include "g13.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "mountinfo.h"
 
 #include "keyblob.h"
index af2e836..138269d 100644 (file)
@@ -27,7 +27,7 @@
 #include <npth.h>
 
 #include "g13.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "keyblob.h"
 #include "runner.h"
 #include "../common/exechelp.h"
index e3cb313..bbe42d4 100644 (file)
@@ -27,7 +27,7 @@
 
 #include "g13.h"
 #include <assuan.h>
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "keyblob.h"
 #include "server.h"
 #include "create.h"
index 6c12dde..a477a67 100644 (file)
@@ -28,8 +28,8 @@
 
 #include "g13-syshelp.h"
 #include <assuan.h>
-#include "i18n.h"
-#include "exectool.h"
+#include "../common/i18n.h"
+#include "../common/exectool.h"
 #include "keyblob.h"
 
 #ifndef HAVE_STRTOULL
index 523ec56..b57369d 100644 (file)
@@ -27,7 +27,7 @@
 
 #include "g13-syshelp.h"
 #include <assuan.h>
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "keyblob.h"
 
 
index bbeab65..f7ec797 100644 (file)
@@ -32,9 +32,9 @@
 
 #include "g13-syshelp.h"
 #include <assuan.h>
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "g13tuple.h"
-#include "exectool.h"
+#include "../common/exectool.h"
 #include "keyblob.h"
 
 /* The standard disk block size (logical).  */
index 7bdf738..0aa20f0 100644 (file)
@@ -27,7 +27,7 @@
 #include <assert.h>
 
 #include "g13.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "suspend.h"
 
 #include "keyblob.h"
index bbd9898..2809d23 100644 (file)
@@ -23,7 +23,7 @@
 #include <assert.h>
 
 
-#include "util.h"
+#include "../common/util.h"
 #include "keyblob.h"
 #include "g13tuple.h"
 
index fe7da1b..8fca24a 100644 (file)
@@ -20,7 +20,7 @@
 
 EXTRA_DIST = mkerrors
 
-AM_CPPFLAGS = -I$(top_srcdir)/common
+AM_CPPFLAGS =
 
 include $(top_srcdir)/am/cmacros.am
 
index dd8477c..6094298 100644 (file)
@@ -33,7 +33,7 @@
 #include "../common/argparse.h"
 #include "../common/stringhelp.h"
 #include "../common/utf8conv.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "keybox-defs.h"
 #include "../common/init.h"
 #include <gcrypt.h>
index 0e8f63a..d24f117 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "keybox-defs.h"
 #include <gcrypt.h>
-#include "host2net.h"
+#include "../common/host2net.h"
 
 /* Argg, we can't include ../common/util.h */
 char *bin2hexcolon (const void *buffer, size_t length, char *stringbuf);
index 6885e05..d82c2cb 100644 (file)
@@ -36,7 +36,7 @@
 #include <gcrypt.h>
 
 #include "../common/openpgpdefs.h"
-#include "host2net.h"
+#include "../common/host2net.h"
 
 /* Assume a valid OpenPGP packet at the address pointed to by BUFBTR
    which has a maximum length as stored at BUFLEN.  Return the header
index ec5aad1..cc114c6 100644 (file)
@@ -27,8 +27,8 @@
 
 #include "keybox-defs.h"
 #include <gcrypt.h>
-#include "host2net.h"
-#include "mbox-util.h"
+#include "../common/host2net.h"
+#include "../common/mbox-util.h"
 
 #define xtoi_1(p)   (*(p) <= '9'? (*(p)- '0'): \
                      *(p) <= 'F'? (*(p)-'A'+10):(*(p)-'a'+10))
index 486753c..b71335b 100644 (file)
@@ -27,7 +27,7 @@
 #endif
 
 #include "keybox-defs.h"
-#include "utilproto.h"
+#include "../common/utilproto.h"
 
 
 static void *(*alloc_func)(size_t n) = malloc;
index db096f6..cbd1f9f 100644 (file)
@@ -21,7 +21,7 @@ EXTRA_DIST = ChangeLog-2011 scdaemon-w32info.rc
 
 libexec_PROGRAMS = scdaemon
 
-AM_CPPFLAGS = -I$(top_srcdir)/common $(LIBUSB_CPPFLAGS)
+AM_CPPFLAGS = $(LIBUSB_CPPFLAGS)
 
 include $(top_srcdir)/am/cmacros.am
 
index c8ce684..147bf73 100644 (file)
 /* This is used with GnuPG version < 1.9.  The code has been source
    copied from the current GnuPG >= 1.9  and is maintained over
    there. */
-#include "options.h"
+#include "../common/options.h"
 #include "errors.h"
 #include "memory.h"
-#include "util.h"
-#include "i18n.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
 #include "dynload.h"
 #include "cardglue.h"
 #else /* GNUPG_MAJOR_VERSION != 1 */
 #include "scdaemon.h"
-#include "exechelp.h"
+#include "../common/exechelp.h"
 #endif /* GNUPG_MAJOR_VERSION != 1 */
-#include "host2net.h"
+#include "../common/host2net.h"
 
 #include "iso7816.h"
 #include "apdu.h"
index f7ecc4b..bea2856 100644 (file)
 
 #include "scdaemon.h"
 
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "iso7816.h"
 #include "app-common.h"
-#include "tlv.h"
+#include "../common/tlv.h"
 
 
 static gpg_error_t
index c277171..510beb5 100644 (file)
 
 #include "scdaemon.h"
 
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "iso7816.h"
 #include "app-common.h"
-#include "tlv.h"
+#include "../common/tlv.h"
 
 
 
index 85bcc66..842a73d 100644 (file)
@@ -26,7 +26,7 @@
 #include "scdaemon.h"
 #include "app-common.h"
 #include "iso7816.h"
-#include "tlv.h"
+#include "../common/tlv.h"
 
 
 /* Count the number of bits, assuming the A represents an unsigned big
index 98dd588..9e720f0 100644 (file)
 #include <time.h>
 
 #include "scdaemon.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "iso7816.h"
 #include "app-common.h"
-#include "tlv.h"
+#include "../common/tlv.h"
 #include "apdu.h"
-#include "host2net.h"
+#include "../common/host2net.h"
 
 static char const aid_nks[]  = { 0xD2, 0x76, 0x00, 0x00, 0x03, 0x01, 0x02 };
 static char const aid_sigg[] = { 0xD2, 0x76, 0x00, 0x00, 0x66, 0x01 };
index af81dce..66b235d 100644 (file)
 #include "scdaemon.h"
 #endif /* GNUPG_MAJOR_VERSION != 1 */
 
-#include "util.h"
-#include "i18n.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
 #include "iso7816.h"
 #include "app-common.h"
-#include "tlv.h"
-#include "host2net.h"
-#include "openpgpdefs.h"
+#include "../common/tlv.h"
+#include "../common/host2net.h"
+#include "../common/openpgpdefs.h"
 
 
 /* A table describing the DOs of the card.  */
index 4072fb7..68e8c4f 100644 (file)
@@ -39,7 +39,7 @@
 
 #include "iso7816.h"
 #include "app-common.h"
-#include "tlv.h"
+#include "../common/tlv.h"
 #include "apdu.h" /* fixme: we should move the card detection to a
                      separate file */
 
index dddc8dc..8094b24 100644 (file)
@@ -34,7 +34,7 @@
 
 #include "iso7816.h"
 #include "app-common.h"
-#include "tlv.h"
+#include "../common/tlv.h"
 #include "apdu.h"
 
 
index e1c4e10..472adc7 100644 (file)
--- a/scd/app.c
+++ b/scd/app.c
 #include <npth.h>
 
 #include "scdaemon.h"
-#include "exechelp.h"
+#include "../common/exechelp.h"
 #include "app-common.h"
 #include "iso7816.h"
 #include "apdu.h"
-#include "tlv.h"
+#include "../common/tlv.h"
 
 static npth_mutex_t app_list_lock;
 static app_t app_top;
index b1d5539..56fdf74 100644 (file)
@@ -40,8 +40,8 @@
 #ifdef HAVE_LIBUSB
 #include "ccid-driver.h"
 #endif
-#include "asshelp.h"
-#include "server-help.h"
+#include "../common/asshelp.h"
+#include "../common/server-help.h"
 
 /* Maximum length allowed as a PIN; used for INQUIRE NEEDPIN */
 #define MAXLEN_PIN 100
index 13cf2e6..26e89dd 100644 (file)
 
 #include <assuan.h> /* malloc hooks */
 
-#include "i18n.h"
-#include "sysutils.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
 #include "app-common.h"
 #include "iso7816.h"
 #include "apdu.h"
 #include "ccid-driver.h"
-#include "gc-opt-flags.h"
-#include "asshelp.h"
-#include "exechelp.h"
+#include "../common/gc-opt-flags.h"
+#include "../common/asshelp.h"
+#include "../common/exechelp.h"
 #include "../common/init.h"
 
 #ifndef ENAMETOOLONG
index 4cfb246..ddc2e22 100644 (file)
@@ -23,7 +23,7 @@ bin_PROGRAMS = gpgsm
 
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS)
 
-AM_CPPFLAGS = -I$(top_srcdir)/common -DKEYBOX_WITH_X509=1
+AM_CPPFLAGS = -DKEYBOX_WITH_X509=1
 include $(top_srcdir)/am/cmacros.am
 
 if HAVE_W32_SYSTEM
index 16a2497..0e47c14 100644 (file)
 #include "gpgsm.h"
 #include <gcrypt.h>
 #include <assuan.h>
-#include "i18n.h"
-#include "asshelp.h"
+#include "../common/i18n.h"
+#include "../common/asshelp.h"
 #include "keydb.h" /* fixme: Move this to import.c */
-#include "membuf.h"
-#include "shareddefs.h"
+#include "../common/membuf.h"
+#include "../common/shareddefs.h"
 #include "passphrase.h"
 
 
index 45303e8..5ee15b7 100644 (file)
@@ -32,9 +32,9 @@
 #include <gcrypt.h>
 #include <assuan.h>
 
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "keydb.h"
-#include "asshelp.h"
+#include "../common/asshelp.h"
 
 
 struct membuf {
index b3e8656..a361aca 100644 (file)
@@ -34,8 +34,8 @@
 
 #include "keydb.h"
 #include "../kbx/keybox.h" /* for KEYBOX_FLAG_* */
-#include "i18n.h"
-#include "tlv.h"
+#include "../common/i18n.h"
+#include "../common/tlv.h"
 
 
 /* Object to keep track of certain root certificates. */
index 04b3917..1102bcc 100644 (file)
@@ -31,7 +31,7 @@
 #include <ksba.h>
 
 #include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 
 
 /* Return the number of bits of the Q parameter from the DSA key
index bd37da4..edee76f 100644 (file)
@@ -37,7 +37,7 @@
 #include <ksba.h>
 
 #include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 
 
 struct dn_array_s {
index bfc35ce..e493cda 100644 (file)
@@ -32,7 +32,7 @@
 #include <ksba.h>
 
 #include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 
 
 static const char oid_kp_serverAuth[]     = "1.3.6.1.5.5.7.3.1";
index b50d338..9772a3b 100644 (file)
@@ -29,9 +29,9 @@
 #include "gpgsm.h"
 #include <gcrypt.h>
 
-#include "i18n.h"
-#include "ttyio.h"
-#include "membuf.h"
+#include "../common/i18n.h"
+#include "../common/ttyio.h"
+#include "../common/membuf.h"
 
 
 /* Prompt for lines and append them to MB.  */
index fe35ea8..4431870 100644 (file)
@@ -66,7 +66,7 @@
 #include <ksba.h>
 
 #include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 
 
 enum para_name
index cda4d29..976bd12 100644 (file)
@@ -31,7 +31,7 @@
 #include <ksba.h>
 
 #include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 
 struct decrypt_filter_parm_s
 {
index 3536968..56d5b1f 100644 (file)
@@ -31,7 +31,7 @@
 #include <ksba.h>
 
 #include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 
 
 /* Delete a certificate or an secret key from a key database. */
index 3a7d4bb..c43a9e6 100644 (file)
@@ -32,7 +32,7 @@
 #include <ksba.h>
 
 #include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 
 
 struct dek_s {
index d721d52..29a5ac3 100644 (file)
@@ -31,9 +31,9 @@
 #include <ksba.h>
 
 #include "keydb.h"
-#include "exechelp.h"
-#include "i18n.h"
-#include "sysutils.h"
+#include "../common/exechelp.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
 #include "minip12.h"
 
 /* A table to store a fingerprint as used in a duplicates table.  We
index d8e8405..fbcec58 100644 (file)
@@ -31,7 +31,7 @@
 #include <gcrypt.h>
 #include <ksba.h>
 
-#include "host2net.h"
+#include "../common/host2net.h"
 
 
 /* Return the fingerprint of the certificate (we can't put this into
index 34a9b96..bcf479a 100644 (file)
 #include "passphrase.h"
 #include "../common/shareddefs.h"
 #include "../kbx/keybox.h" /* malloc hooks */
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "keydb.h"
-#include "sysutils.h"
-#include "gc-opt-flags.h"
-#include "asshelp.h"
+#include "../common/sysutils.h"
+#include "../common/gc-opt-flags.h"
+#include "../common/asshelp.h"
 #include "../common/init.h"
 
 
index b284b51..c7b65ad 100644 (file)
@@ -31,9 +31,9 @@
 #include <ksba.h>
 
 #include "keydb.h"
-#include "exechelp.h"
-#include "i18n.h"
-#include "sysutils.h"
+#include "../common/exechelp.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
 #include "../kbx/keybox.h" /* for KEYBOX_FLAG_* */
 #include "../common/membuf.h"
 #include "minip12.h"
index 75f83ee..87fc12d 100644 (file)
@@ -31,7 +31,7 @@
 #include "gpgsm.h"
 #include "../kbx/keybox.h"
 #include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 
 static int active_handles;
 
index 6db42e3..d27d4f4 100644 (file)
@@ -34,8 +34,8 @@
 
 #include "keydb.h"
 #include "../kbx/keybox.h" /* for KEYBOX_FLAG_* */
-#include "i18n.h"
-#include "tlv.h"
+#include "../common/i18n.h"
+#include "../common/tlv.h"
 
 struct list_external_parm_s
 {
index 40e989f..1e2465f 100644 (file)
--- a/sm/misc.c
+++ b/sm/misc.c
@@ -29,8 +29,8 @@
 #endif
 
 #include "gpgsm.h"
-#include "i18n.h"
-#include "sysutils.h"
+#include "../common/i18n.h"
+#include "../common/sysutils.h"
 #include "../common/tlv.h"
 #include "../common/sexp-parse.h"
 
index 61b071c..718141e 100644 (file)
@@ -26,7 +26,7 @@
 #include <errno.h>
 
 #include "gpgsm.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include <ksba.h>
 
 
index 0fadcad..37d66e2 100644 (file)
@@ -29,8 +29,8 @@
 
 #include "gpgsm.h"
 #include <assuan.h>
-#include "sysutils.h"
-#include "server-help.h"
+#include "../common/sysutils.h"
+#include "../common/server-help.h"
 
 #define set_error(e,t) assuan_set_error (ctx, gpg_error (e), (t))
 
index 0ca575b..a153b51 100644 (file)
--- a/sm/sign.c
+++ b/sm/sign.c
@@ -32,7 +32,7 @@
 #include <ksba.h>
 
 #include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 
 
 /* Hash the data and return if something was hashed.  Return -1 on error.  */
index 1ac97cb..6c034e6 100644 (file)
@@ -32,7 +32,7 @@
 #include <ksba.h>
 
 #include "keydb.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 
 static char *
 strtimestamp_r (ksba_isotime_t atime)
index 38abd7c..0c828a7 100644 (file)
@@ -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
index 51f1fa1..9e3e493 100644 (file)
 #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
index a3224ab..7197340 100644 (file)
@@ -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"
 
 
index 59e2192..ef71d27 100644 (file)
@@ -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"
index c31e3a1..c578105 100644 (file)
 #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"
index 0c939e5..1055212 100644 (file)
 #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
index a9f4607..c6fb24e 100644 (file)
@@ -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"
 
 
index 3b4bb15..ce2777d 100644 (file)
@@ -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 = "";
index ffd239f..c622a66 100644 (file)
@@ -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"
index f9a50e7..b0e17cb 100644 (file)
@@ -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"
index 8286d08..0e10be8 100644 (file)
@@ -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"
index 3dff176..2757ab0 100644 (file)
@@ -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"
index 2e32069..0332f31 100644 (file)
@@ -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"
 
 
index 169ea2b..08b0219 100644 (file)
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "util.h"
+#include "../common/util.h"
 #include "rfc822parse.h"
 #include "mime-parser.h"
 
index 56f2500..34d47c1 100644 (file)
@@ -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"
 
 
index 94f8bc6..49a1517 100644 (file)
@@ -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"
index e6f6b7a..389d4a4 100644 (file)
 #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"