Remove -I option to common.

* 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>

18 files changed, 28 insertions, 28 deletions

diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
index 93880f8ce..34f2c5d3d 100644
--- a/dirmngr/Makefile.am
+++ b/dirmngr/Makefile.am
@@ -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
 
diff --git a/dirmngr/dirmngr-client.c b/dirmngr/dirmngr-client.c
index 01cface5f..c1ff635de 100644
--- a/dirmngr/dirmngr-client.c
+++ b/dirmngr/dirmngr-client.c
@@ -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.  */
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index f05bdd127..e3e02fe6b 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -65,12 +65,12 @@
 #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"
 
diff --git a/dirmngr/dirmngr_ldap.c b/dirmngr/dirmngr_ldap.c
index a0acb8e48..836ced0c1 100644
--- a/dirmngr/dirmngr_ldap.c
+++ b/dirmngr/dirmngr_ldap.c
@@ -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
diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
index 57b3b7e7f..ec9a09523 100644
--- a/dirmngr/dns-stuff.c
+++ b/dirmngr/dns-stuff.c
@@ -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
diff --git a/dirmngr/http.c b/dirmngr/http.c
index 0f11af750..3adf6e51e 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -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"
diff --git a/dirmngr/ks-engine-finger.c b/dirmngr/ks-engine-finger.c
index 811b72de4..82ef7a500 100644
--- a/dirmngr/ks-engine-finger.c
+++ b/dirmngr/ks-engine-finger.c
@@ -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. */
diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
index b6a06754f..ee7d50675 100644
--- a/dirmngr/ks-engine-hkp.c
+++ b/dirmngr/ks-engine-hkp.c
@@ -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"
 
diff --git a/dirmngr/ks-engine-kdns.c b/dirmngr/ks-engine-kdns.c
index 9bb0d420a..71463fea1 100644
--- a/dirmngr/ks-engine-kdns.c
+++ b/dirmngr/ks-engine-kdns.c
@@ -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. */
diff --git a/dirmngr/ks-engine-ldap.c b/dirmngr/ks-engine-ldap.c
index f664655b3..f50ba50d0 100644
--- a/dirmngr/ks-engine-ldap.c
+++ b/dirmngr/ks-engine-ldap.c
@@ -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"
 
diff --git a/dirmngr/ldap-parse-uri.c b/dirmngr/ldap-parse-uri.c
index 967149694..94d4efd38 100644
--- a/dirmngr/ldap-parse-uri.c
+++ b/dirmngr/ldap-parse-uri.c
@@ -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:
diff --git a/dirmngr/ldap-parse-uri.h b/dirmngr/ldap-parse-uri.h
index bdbb6c3fc..e9a3f95ad 100644
--- a/dirmngr/ldap-parse-uri.h
+++ b/dirmngr/ldap-parse-uri.h
@@ -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);
diff --git a/dirmngr/ldap-wrapper.c b/dirmngr/ldap-wrapper.c
index b313848e1..ac4964a55 100644
--- a/dirmngr/ldap-wrapper.c
+++ b/dirmngr/ldap-wrapper.c
@@ -58,7 +58,7 @@
 #include <npth.h>
 
 #include "dirmngr.h"
-#include "exechelp.h"
+#include "../common/exechelp.h"
 #include "misc.h"
 #include "ldap-wrapper.h"
 
diff --git a/dirmngr/ldap.c b/dirmngr/ldap.c
index a037f5d69..d661a6825 100644
--- a/dirmngr/ldap.c
+++ b/dirmngr/ldap.c
@@ -31,12 +31,12 @@
 #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"   \
diff --git a/dirmngr/misc.c b/dirmngr/misc.c
index 6d7c963db..1716141a6 100644
--- a/dirmngr/misc.c
+++ b/dirmngr/misc.c
@@ -27,7 +27,7 @@
 #include <errno.h>
 
 #include "dirmngr.h"
-#include "util.h"
+#include "../common/util.h"
 #include "misc.h"
 
 
diff --git a/dirmngr/server.c b/dirmngr/server.c
index 9fa8229ef..f4aeadbc4 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -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
diff --git a/dirmngr/t-dns-stuff.c b/dirmngr/t-dns-stuff.c
index 23c0c6aa0..5a3ede15b 100644
--- a/dirmngr/t-dns-stuff.c
+++ b/dirmngr/t-dns-stuff.c
@@ -24,7 +24,7 @@
 #include <assert.h>
 
 
-#include "util.h"
+#include "../common/util.h"
 #include "dns-stuff.h"
 
 #define PGM "t-dns-stuff"
diff --git a/dirmngr/t-http.c b/dirmngr/t-http.c
index 35f59478b..622dce54f 100644
--- a/dirmngr/t-http.c
+++ b/dirmngr/t-http.c
@@ -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>