Fix includes to not be relative to paths provided by -I directives, for

the xfsprogs and xfsdump builds.  At this stage still provide these gcc
options in the build but later that can be removed too now that headers
are clean.

21 files changed, 41 insertions, 42 deletions

diff --git a/common/arch_xlate.c b/common/arch_xlate.c
index 90de661c..8cc72be0 100644
--- a/common/arch_xlate.c
+++ b/common/arch_xlate.c
@@ -30,8 +30,8 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <jdm.h>
+#include <xfs/libxfs.h>
+#include <xfs/jdm.h>
 
 #include "arch_xlate.h"
 #include "types.h"
diff --git a/common/arch_xlate.h b/common/arch_xlate.h
index 0ea7d5ee..14a27bc9 100644
--- a/common/arch_xlate.h
+++ b/common/arch_xlate.h
@@ -33,9 +33,8 @@
 #ifndef ARCH_XLATE_H
 #define ARCH_XLATE_H
 
-#include <libxfs.h>
-#include <string.h>
-#include <jdm.h>
+#include <xfs/libxfs.h>
+#include <xfs/jdm.h>
 
 #include "types.h"
 #include "global.h"
diff --git a/common/cldmgr.c b/common/cldmgr.c
index 547e86d4..71ea1b45 100644
--- a/common/cldmgr.c
+++ b/common/cldmgr.c
@@ -30,8 +30,8 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <jdm.h>
+#include <xfs/libxfs.h>
+#include <xfs/jdm.h>
 
 #include <sys/wait.h>
 #include <sys/ipc.h>
diff --git a/common/content_common.c b/common/content_common.c
index 58eff95f..af44fec2 100644
--- a/common/content_common.c
+++ b/common/content_common.c
@@ -30,8 +30,8 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <jdm.h>
+#include <xfs/libxfs.h>
+#include <xfs/jdm.h>
 
 #include <sys/stat.h>
 #include <time.h>
diff --git a/common/dlog.c b/common/dlog.c
index eca0b98a..e65d1acf 100644
--- a/common/dlog.c
+++ b/common/dlog.c
@@ -30,8 +30,8 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <jdm.h>
+#include <xfs/libxfs.h>
+#include <xfs/jdm.h>
 
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/common/drive.c b/common/drive.c
index 776d5b53..4079e9be 100644
--- a/common/drive.c
+++ b/common/drive.c
@@ -30,8 +30,8 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <jdm.h>
+#include <xfs/libxfs.h>
+#include <xfs/jdm.h>
 
 #include <sys/stat.h>
 #include <time.h>
diff --git a/common/drive_minrmt.c b/common/drive_minrmt.c
index 255a9e36..20e76430 100644
--- a/common/drive_minrmt.c
+++ b/common/drive_minrmt.c
@@ -30,8 +30,8 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <jdm.h>
+#include <xfs/libxfs.h>
+#include <xfs/jdm.h>
 
 #include <sys/stat.h>
 #include <sys/ipc.h>
diff --git a/common/drive_scsitape.c b/common/drive_scsitape.c
index 2b634d6a..d7a4e103 100644
--- a/common/drive_scsitape.c
+++ b/common/drive_scsitape.c
@@ -30,8 +30,8 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <jdm.h>
+#include <xfs/libxfs.h>
+#include <xfs/jdm.h>
 
 #include <sys/stat.h>
 #include <sys/ipc.h>
diff --git a/common/drive_simple.c b/common/drive_simple.c
index 5549311c..e17c91e0 100644
--- a/common/drive_simple.c
+++ b/common/drive_simple.c
@@ -30,8 +30,8 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <jdm.h>
+#include <xfs/libxfs.h>
+#include <xfs/jdm.h>
 
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/common/fs.c b/common/fs.c
index 4f37cd46..3e8030b6 100644
--- a/common/fs.c
+++ b/common/fs.c
@@ -30,8 +30,8 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <jdm.h>
+#include <xfs/libxfs.h>
+#include <xfs/jdm.h>
 #include "config.h"
 
 #include <sys/stat.h>
diff --git a/common/global.c b/common/global.c
index 19e52c66..d7931751 100644
--- a/common/global.c
+++ b/common/global.c
@@ -30,8 +30,8 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <jdm.h>
+#include <xfs/libxfs.h>
+#include <xfs/jdm.h>
 
 #include <sys/stat.h>
 #include <time.h>
diff --git a/common/lock.c b/common/lock.c
index 1647cb2e..2e280bc6 100644
--- a/common/lock.c
+++ b/common/lock.c
@@ -30,8 +30,8 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <jdm.h>
+#include <xfs/libxfs.h>
+#include <xfs/jdm.h>
 
 #include "types.h"
 #include "qlock.h"
diff --git a/common/main.c b/common/main.c
index 1b2c4cc1..3d0b89e1 100644
--- a/common/main.c
+++ b/common/main.c
@@ -30,8 +30,8 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <jdm.h>
+#include <xfs/libxfs.h>
+#include <xfs/jdm.h>
 
 #include <sys/stat.h>
 #include <sys/wait.h>
diff --git a/common/media.c b/common/media.c
index ceb44511..1bad16bc 100644
--- a/common/media.c
+++ b/common/media.c
@@ -30,8 +30,8 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <jdm.h>
+#include <xfs/libxfs.h>
+#include <xfs/jdm.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/common/mlog.c b/common/mlog.c
index ecd79fb0..f414bc2f 100644
--- a/common/mlog.c
+++ b/common/mlog.c
@@ -30,8 +30,8 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <jdm.h>
+#include <xfs/libxfs.h>
+#include <xfs/jdm.h>
 
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/common/openutil.c b/common/openutil.c
index 92195236..f0b54e40 100644
--- a/common/openutil.c
+++ b/common/openutil.c
@@ -29,8 +29,8 @@
  * 
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
-#include <libxfs.h>
-#include <jdm.h>
+#include <xfs/libxfs.h>
+#include <xfs/jdm.h>
 
 #include <sys/stat.h>
 #include <limits.h>
diff --git a/common/path.c b/common/path.c
index c0af99de..989f3534 100644
--- a/common/path.c
+++ b/common/path.c
@@ -30,7 +30,7 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
+#include <xfs/libxfs.h>
 
 #include "path.h"
 
diff --git a/common/qlock.c b/common/qlock.c
index 48f116b2..38fb1fe2 100644
--- a/common/qlock.c
+++ b/common/qlock.c
@@ -30,8 +30,8 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <jdm.h>
+#include <xfs/libxfs.h>
+#include <xfs/jdm.h>
 
 #include "types.h"
 #include "qlock.h"
diff --git a/common/ring.c b/common/ring.c
index be7aa669..dd55a865 100644
--- a/common/ring.c
+++ b/common/ring.c
@@ -30,8 +30,8 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <jdm.h>
+#include <xfs/libxfs.h>
+#include <xfs/jdm.h>
 
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/common/stream.c b/common/stream.c
index c5459cb4..3a9cd36a 100644
--- a/common/stream.c
+++ b/common/stream.c
@@ -30,8 +30,8 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <jdm.h>
+#include <xfs/libxfs.h>
+#include <xfs/jdm.h>
 
 #include "types.h"
 #include "exit.h"
diff --git a/common/util.c b/common/util.c
index 34a2e89b..95eb0f1e 100644
--- a/common/util.c
+++ b/common/util.c
@@ -30,8 +30,8 @@
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
-#include <libxfs.h>
-#include <jdm.h>
+#include <xfs/libxfs.h>
+#include <xfs/jdm.h>
 #include "config.h"
 
 #include <sys/stat.h>