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 <[email protected]>

20 files changed, 30 insertions, 30 deletions

diff --git a/g13/Makefile.am b/g13/Makefile.am
index cc0e6a809..dfacc993b 100644
--- a/g13/Makefile.am
+++ b/g13/Makefile.am
@@ -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
 
diff --git a/g13/backend.c b/g13/backend.c
index a495f8ad8..0123b458c 100644
--- a/g13/backend.c
+++ b/g13/backend.c
@@ -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"
diff --git a/g13/be-dmcrypt.c b/g13/be-dmcrypt.c
index e048b9945..59b586d37 100644
--- a/g13/be-dmcrypt.c
+++ b/g13/be-dmcrypt.c
@@ -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"
diff --git a/g13/be-encfs.c b/g13/be-encfs.c
index 6c648ab58..0e2c68bf3 100644
--- a/g13/be-encfs.c
+++ b/g13/be-encfs.c
@@ -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"
diff --git a/g13/be-truecrypt.c b/g13/be-truecrypt.c
index e75b936c8..1ce992f91 100644
--- a/g13/be-truecrypt.c
+++ b/g13/be-truecrypt.c
@@ -25,7 +25,7 @@
 #include <unistd.h>
 
 #include "g13.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "be-truecrypt.h"
 
 
diff --git a/g13/call-syshelp.c b/g13/call-syshelp.c
index adffc6eac..8a50c3ff4 100644
--- a/g13/call-syshelp.c
+++ b/g13/call-syshelp.c
@@ -28,10 +28,10 @@
 
 #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"
 
diff --git a/g13/create.c b/g13/create.c
index 573039dc2..d55b85931 100644
--- a/g13/create.c
+++ b/g13/create.c
@@ -27,7 +27,7 @@
 #include <assert.h>
 
 #include "g13.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "create.h"
 
 #include "keyblob.h"
diff --git a/g13/g13-common.c b/g13/g13-common.c
index 8370907fb..35cb13186 100644
--- a/g13/g13-common.c
+++ b/g13/g13-common.c
@@ -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"
 
 
 
diff --git a/g13/g13-syshelp.c b/g13/g13-syshelp.c
index 8b8a4a7d8..bf71ac20f 100644
--- a/g13/g13-syshelp.c
+++ b/g13/g13-syshelp.c
@@ -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"
 
diff --git a/g13/g13.c b/g13/g13.c
index 0553c85c1..4b925ed59 100644
--- a/g13/g13.c
+++ b/g13/g13.c
@@ -32,10 +32,10 @@
 #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"
diff --git a/g13/keyblob.c b/g13/keyblob.c
index 81863bb4e..1fb9be73a 100644
--- a/g13/keyblob.c
+++ b/g13/keyblob.c
@@ -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.  */
diff --git a/g13/mount.c b/g13/mount.c
index 7814d5c67..dc415b12d 100644
--- a/g13/mount.c
+++ b/g13/mount.c
@@ -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"
diff --git a/g13/mountinfo.c b/g13/mountinfo.c
index 26eca0cd0..ed898b836 100644
--- a/g13/mountinfo.c
+++ b/g13/mountinfo.c
@@ -27,7 +27,7 @@
 #include <assert.h>
 
 #include "g13.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "mountinfo.h"
 
 #include "keyblob.h"
diff --git a/g13/runner.c b/g13/runner.c
index af2e836d8..138269d21 100644
--- a/g13/runner.c
+++ b/g13/runner.c
@@ -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"
diff --git a/g13/server.c b/g13/server.c
index e3cb313a2..bbe42d4f6 100644
--- a/g13/server.c
+++ b/g13/server.c
@@ -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"
diff --git a/g13/sh-blockdev.c b/g13/sh-blockdev.c
index 6c12dde04..a477a6716 100644
--- a/g13/sh-blockdev.c
+++ b/g13/sh-blockdev.c
@@ -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
diff --git a/g13/sh-cmd.c b/g13/sh-cmd.c
index 523ec56f6..b57369d9c 100644
--- a/g13/sh-cmd.c
+++ b/g13/sh-cmd.c
@@ -27,7 +27,7 @@
 
 #include "g13-syshelp.h"
 #include <assuan.h>
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "keyblob.h"
 
 
diff --git a/g13/sh-dmcrypt.c b/g13/sh-dmcrypt.c
index bbeab65a2..f7ec79758 100644
--- a/g13/sh-dmcrypt.c
+++ b/g13/sh-dmcrypt.c
@@ -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).  */
diff --git a/g13/suspend.c b/g13/suspend.c
index 7bdf738c8..0aa20f01c 100644
--- a/g13/suspend.c
+++ b/g13/suspend.c
@@ -27,7 +27,7 @@
 #include <assert.h>
 
 #include "g13.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "suspend.h"
 
 #include "keyblob.h"
diff --git a/g13/t-g13tuple.c b/g13/t-g13tuple.c
index bbd98988e..2809d23f7 100644
--- a/g13/t-g13tuple.c
+++ b/g13/t-g13tuple.c
@@ -23,7 +23,7 @@
 #include <assert.h>
 
 
-#include "util.h"
+#include "../common/util.h"
 #include "keyblob.h"
 #include "g13tuple.h"