progs: clean up libxfs.h includes

Convert all the various ways of including libxfs.h to one standard
way across all libraries and utilities:

#include "xfs/libxfs.h"

This means we are consistently including the local
include/xfs/libxfs.h header file in parts of the build, and means we
need to ensure that the include directory is correctly populated
before we do any other part of the build.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
index b39c84dc306bdd5af0f4c37e44e91cbd34fb50cf..f76a0e98e4fb94a70dba33156e3600dca2bbe0eb 100644 (file)
--- a/copy/xfs_copy.c
+++ b/copy/xfs_copy.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <pthread.h>

diff --git a/db/addr.c b/db/addr.c
index 9bea1c7a0ba31b73df75c01b5d767e93c9c7fcb4..a3ac5d682ed2423bbfb3493d0268b3bf7cab2a34 100644 (file)
--- a/db/addr.c
+++ b/db/addr.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "addr.h"
 #include "command.h"
 #include "type.h"

diff --git a/db/agf.c b/db/agf.c
index d9a07cafb8f2442b512b5f033afbbdda4ebd514f..e144bd65a48d8aa39150f78abf5d6b2fe4f64456 100644 (file)
--- a/db/agf.c
+++ b/db/agf.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "command.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/agfl.c b/db/agfl.c
index b29538f581b5b27c19f60510407d9dab8ba70d55..b821b13aac9b37fb7fc80d6d94b633237e72bf4c 100644 (file)
--- a/db/agfl.c
+++ b/db/agfl.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "command.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/agi.c b/db/agi.c
index 6f167ac48cc10971b963ceb234f4ba928019364a..634429e91ac9baf5c52a94ef273dece9b45c7a28 100644 (file)
--- a/db/agi.c
+++ b/db/agi.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "command.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/attr.c b/db/attr.c
index 41c0db070444ed8f59872a6c085c9521a4e49a28..e14e32e9781f49431307b15548b3f62c8e8b9fe0 100644 (file)
--- a/db/attr.c
+++ b/db/attr.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "bit.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/attrset.c b/db/attrset.c
index ea5261a1bbbe67f6a63fb876e585723f166ba4c9..1afadd2c744bceac69c628f56ae7d402cc956d19 100644 (file)
--- a/db/attrset.c
+++ b/db/attrset.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "command.h"
 #include "attrset.h"
 #include "io.h"

diff --git a/db/attrshort.c b/db/attrshort.c
index 72f73dd12511750217d78dd686ebcf2dc4676571..7dc5640fe454e3ba3f8bd3fdcc8a58f8724d981c 100644 (file)
--- a/db/attrshort.c
+++ b/db/attrshort.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/bit.c b/db/bit.c
index e8adab376f67d275983bc84fa0b33e26986a43f4..e604ccac379d39de6d48f9d00e85d78ebbfd8e9c 100644 (file)
--- a/db/bit.c
+++ b/db/bit.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "bit.h"
 
 #undef setbit  /* defined in param.h on Linux */

diff --git a/db/block.c b/db/block.c
index 59a626504163c0223f9548a7ed467ba2a868a617..9319cce2566eaaec9eb206aac2477039291e5ea5 100644 (file)
--- a/db/block.c
+++ b/db/block.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "block.h"
 #include "bmap.h"
 #include "command.h"

diff --git a/db/bmap.c b/db/bmap.c
index 2a49380447954fbf97e07877386e32cba9c274b2..60d6a80e185fdc66867a4ef6db2a830aa3457701 100644 (file)
--- a/db/bmap.c
+++ b/db/bmap.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "command.h"
 #include "type.h"
 #include "fprint.h"

diff --git a/db/bmroot.c b/db/bmroot.c
index e2194aa1a5c50152b094b074b3cccceb035cab9d..95be2dd900140c23149722e6b0ac1ce83395b883 100644 (file)
--- a/db/bmroot.c
+++ b/db/bmroot.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/btblock.c b/db/btblock.c
index cdb8b1df2b6a7b33fc722f5e23dd29abb75eb080..742f09b1e10997689c51c348a8d4dd35770bed71 100644 (file)
--- a/db/btblock.c
+++ b/db/btblock.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/check.c b/db/check.c
index 01f5b6e4d0fe71888143a10abd0d88c2f001ed2d..ce98360f43eb1e5c683e560c51c9b6fe38390965 100644 (file)
--- a/db/check.c
+++ b/db/check.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <math.h>
 #include <sys/time.h>
 #include "bmap.h"

diff --git a/db/command.c b/db/command.c
index b7e316593c24640251b8eb3db566c025ce230fef..eb1efb6dbf487edef1ce388c7d06dd55a637f833 100644 (file)
--- a/db/command.c
+++ b/db/command.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "addr.h"
 #include "attrset.h"
 #include "block.h"

diff --git a/db/convert.c b/db/convert.c
index de4bfbf53c62475124c42ac3554ae3f0eaf4e3c5..d2bf1a955844b2dbde5cc650a8ffe04fafeff8f0 100644 (file)
--- a/db/convert.c
+++ b/db/convert.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "command.h"
 #include "convert.h"
 #include "output.h"

diff --git a/db/debug.c b/db/debug.c
index 07a2482bbc0f103e000dadbbb8f49dbd3f23c687..13a319ff9edee8616e9c81472248bcf904dfaefd 100644 (file)
--- a/db/debug.c
+++ b/db/debug.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "command.h"
 #include "debug.h"
 #include "output.h"

diff --git a/db/dir2.c b/db/dir2.c
index 18a54b6a1aeb02cbcfac36a4dea91587a1afa07f..75aaed5f87b195832eec8d34802de90d326ccfde 100644 (file)
--- a/db/dir2.c
+++ b/db/dir2.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "bit.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/dir2sf.c b/db/dir2sf.c
index bbe60801439d13df79390068c24e43529b2646a3..831d6f2b48652fd84d1ab3c4abc54a50bdb312c8 100644 (file)
--- a/db/dir2sf.c
+++ b/db/dir2sf.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/dquot.c b/db/dquot.c
index 2f7d463e00ec3dae5ab6ea6826a692cbaefbf038..611825636f8541660055df4dbc38551847e65678 100644 (file)
--- a/db/dquot.c
+++ b/db/dquot.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "bit.h"
 #include "bmap.h"
 #include "command.h"

diff --git a/db/echo.c b/db/echo.c
index 813187bdf0f1b99c55a72b45865f0a5709b68f79..f2b7ab8358610946e5642abc78a7106f0a1c4f74 100644 (file)
--- a/db/echo.c
+++ b/db/echo.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "command.h"
 #include "echo.h"
 #include "output.h"

diff --git a/db/faddr.c b/db/faddr.c
index d40717da8bd2f231621abfffa4f61c62e4952b1f..17451c2687bd6135b74c88c683c311aa9909ddd7 100644 (file)
--- a/db/faddr.c
+++ b/db/faddr.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "type.h"
 #include "fprint.h"
 #include "faddr.h"

diff --git a/db/field.c b/db/field.c
index 816065e7471d8cf5d513fa629ddb663665a14d2e..50a53d145b23d6030424523e08ed7f1dfae5cadc 100644 (file)
--- a/db/field.c
+++ b/db/field.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/flist.c b/db/flist.c
index 33f7da760e53fe75f0c1e156012e3ddac1e0e109..848478e74150a357370461920055d1b7d3afa07c 100644 (file)
--- a/db/flist.c
+++ b/db/flist.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/fprint.c b/db/fprint.c
index 52782e24bae14d954edb2696534358f3a78d80dd..f36cdc80f9c537e02c8586a72fe8aee97780d9fd 100644 (file)
--- a/db/fprint.c
+++ b/db/fprint.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <ctype.h>
 #include <time.h>
 #include "type.h"

diff --git a/db/frag.c b/db/frag.c
index d8ad25eb2ccbe7e446655b960e6248b50b69af23..309db7fe602ac0ef16035ded661d889707cca732 100644 (file)
--- a/db/frag.c
+++ b/db/frag.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <sys/time.h>
 #include "bmap.h"
 #include "command.h"

diff --git a/db/freesp.c b/db/freesp.c
index 361fa96da75cc13f44b68706d6a4f703f1cc05b5..b0fc95ebc21d59d4656f97aa73a35489ac6b6e8e 100644 (file)
--- a/db/freesp.c
+++ b/db/freesp.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "command.h"
 #include "freesp.h"
 #include "io.h"

diff --git a/db/hash.c b/db/hash.c
index 02376e60c18fb6202f1df377732c78487cf35d02..4c49a662e150b69e22091916c5a3d67e21e94367 100644 (file)
--- a/db/hash.c
+++ b/db/hash.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "addr.h"
 #include "command.h"
 #include "type.h"

diff --git a/db/help.c b/db/help.c
index 79131003ca7b7c8facc08effa330ba612b191e12..d6a56b09414ac2a508436ca56d5db7ed778f225b 100644 (file)
--- a/db/help.c
+++ b/db/help.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "command.h"
 #include "help.h"
 #include "output.h"

diff --git a/db/init.c b/db/init.c
index e7f536a84fe3135027a01e802b2509388a94302b..54e6535f5af8091be13f4a43dc30f7bad6df6a69 100644 (file)
--- a/db/init.c
+++ b/db/init.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <signal.h>
 #include "command.h"
 #include "init.h"

diff --git a/db/inode.c b/db/inode.c
index fbae0bdcb33a000950d2272297b1786b0db7aa98..e4d80aec90c666dbca9f01d342a312909cdcb49a 100644 (file)
--- a/db/inode.c
+++ b/db/inode.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "command.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/input.c b/db/input.c
index b73a1f81bb6e7fe9f8811c611024877b0b84975c..ec1b986ca01cd0ac0511ffb0991c028d7102c818 100644 (file)
--- a/db/input.c
+++ b/db/input.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <signal.h>
 #include "command.h"
 #include "input.h"

diff --git a/db/io.c b/db/io.c
index b55a5fb60d239f61da4fffed70153e56130fc114..0f360a867d97e9d9583b2382669757ddf11e560e 100644 (file)
--- a/db/io.c
+++ b/db/io.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "command.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/malloc.c b/db/malloc.c
index fe1eacfa0e28e6339fcc18e781af923978c686e9..00cbfe13797dd572a09829fbfd565e05597f338a 100644 (file)
--- a/db/malloc.c
+++ b/db/malloc.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "init.h"
 #include "malloc.h"
 #include "output.h"

diff --git a/db/metadump.c b/db/metadump.c
index 1543b52201f45e238578cc6e573afe282f07bcd4..357ad693b3b37d3b0904e045b5971738cfbf85cb 100644 (file)
--- a/db/metadump.c
+++ b/db/metadump.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include <libxlog.h>
 #include "bmap.h"
 #include "command.h"

diff --git a/db/output.c b/db/output.c
index 36669f48155a5614cef6883cd7dc0697446df2a1..8f6e9cda608275ce44d843eda43fbfd1e6c5a367 100644 (file)
--- a/db/output.c
+++ b/db/output.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <stdarg.h>
 #include "command.h"
 #include "output.h"

diff --git a/db/print.c b/db/print.c
index b865d643cb812a0655942a46a11d566c2ccc512e..9f08b9fa4dab2be859ea2b109d170d277fe6b1fc 100644 (file)
--- a/db/print.c
+++ b/db/print.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "command.h"
 #include "type.h"
 #include "faddr.h"

diff --git a/db/quit.c b/db/quit.c
index 5e4413c259bb578d157247ff10f7d94c5beb1153..7d352a6c955e911a27bd03fb770d4d6dee767707 100644 (file)
--- a/db/quit.c
+++ b/db/quit.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "command.h"
 #include "quit.h"
 

diff --git a/db/sb.c b/db/sb.c
index 2be28d078fd4f466bbb8b255cd3ec797e83aeb3b..48c2fb1e3f068796b9dbeff70c9214e446a5b4b1 100644 (file)
--- a/db/sb.c
+++ b/db/sb.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <xfs/libxlog.h>
 #include "command.h"
 #include "type.h"

diff --git a/db/sig.c b/db/sig.c
index 338c70687582fab7a81c01c6432e0fa23530d422..025c603c71ad8e889746c96d5ae85b086b23d5ab 100644 (file)
--- a/db/sig.c
+++ b/db/sig.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <signal.h>
 #include "sig.h"
 

diff --git a/db/strvec.c b/db/strvec.c
index 8aa4e3451791539612690649c9fd6b1dbf0716e2..3fa10bea7b386cd133eb9b9581d98de3ff018b43 100644 (file)
--- a/db/strvec.c
+++ b/db/strvec.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "strvec.h"
 #include "output.h"
 #include "malloc.h"

diff --git a/db/symlink.c b/db/symlink.c
index a4f420f49cd15ce84d54ad3722d2de47b99cdc1c..01719a70770d9f74f03eaa000286bfd7ce051c25 100644 (file)
--- a/db/symlink.c
+++ b/db/symlink.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "type.h"
 #include "faddr.h"
 #include "fprint.h"

diff --git a/db/text.c b/db/text.c
index 12084a2b3d058c5cf5dbafca60c5800d1b0099a6..a0d4c899a3ad5303a457cc2a313576b3f5407246 100644 (file)
--- a/db/text.c
+++ b/db/text.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <ctype.h>
 #include "block.h"
 #include "bmap.h"

diff --git a/db/type.c b/db/type.c
index 0aa3137f5f891d1e15e6796eac2467eb79f6a798..5eab691459d14484253c92b6955985919a363178 100644 (file)
--- a/db/type.c
+++ b/db/type.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "block.h"
 #include "command.h"
 #include "type.h"

diff --git a/db/write.c b/db/write.c
index 655b6188d8db353964eea0ef786334aeab1ebe7d..6a33dba53ed3fb2948253fab5a8a4b3f34995672 100644 (file)
--- a/db/write.c
+++ b/db/write.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <ctype.h>
 #include <time.h>
 #include "bit.h"

diff --git a/debian/rules b/debian/rules
index 2be2773ce616393c848516487db7977ea7bbe548..27b043fa96918f1916f7b4c84904f43d6b4a72f9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -44,6 +44,9 @@ dibuild:
        @echo "== dpkg-buildpackage: installer" 1>&2
        if [ ! -f mkfs/mkfs.xfs-$(bootpkg) ]; then \
                $(diopts) $(MAKE) include/platform_defs.h; \
+               for dir in include libxfs; do \
+                       $(MAKE) -C $$dir NODEP=1 install-headers; \
+               done; \
                for dir in include libxfs libdisk mkfs; do \
                        $(MAKE) -C $$dir; \
                done; \

diff --git a/estimate/xfs_estimate.c b/estimate/xfs_estimate.c
index c574a08a09535a08c80c0167aab08f05ffd6064d..636691b879c99210211501d9dfa42e0c44989474 100644 (file)
--- a/estimate/xfs_estimate.c
+++ b/estimate/xfs_estimate.c
@@ -21,7 +21,7 @@
  *
  * XXX: assumes dirv1 format.
  */
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <sys/stat.h>
 #include <ftw.h>
 

diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
index 2fc94c78425ca1b2e5c9fc87278dc23142c3d607..89fba55847526407fa18ab608bc59da291b4d3ea 100644 (file)
--- a/fsr/xfs_fsr.c
+++ b/fsr/xfs_fsr.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include <xfs/xfs.h>
 #include <xfs/xfs_types.h>
 #include <xfs/jdm.h>

diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c
index 8e611b6b0f0905f8dc5c8c967367a3a40a49eb97..3ff3b5dbffed38cebcc5bb63fbbbc6059b415673 100644 (file)
--- a/growfs/xfs_growfs.c
+++ b/growfs/xfs_growfs.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <xfs/path.h>
 
 static void

diff --git a/include/Makefile b/include/Makefile
index a0a6554d6a9add1e329003b281eebd9f53abeb23..91b33b073a681f586f1e633c47d8d956db609f8a 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -54,14 +54,16 @@ LSRCFILES += $(DKHFILES) $(LIBHFILES)
 LDIRT = disk
 LDIRDIRT = xfs
 
-default install: disk
+default: disk
 
 disk:
        @echo "    [LN]     $@"
        $(Q)$(LN_S) . $@
 
+include $(BUILDRULES)
+
 # set up include/xfs header directory
-headers: $(addsuffix -hdrs, $(HFILES) $(QAHFILES) $(PHFILES) $(DKHFILES) $(LIBHFILES))
+install-headers: $(addsuffix -hdrs, $(HFILES) $(QAHFILES) $(PHFILES) $(DKHFILES) $(LIBHFILES))
 
 %-hdrs: xfs
        $(Q)$(LN_S) -f $(PWD)/include/$* xfs/$*
@@ -69,11 +71,10 @@ headers: $(addsuffix -hdrs, $(HFILES) $(QAHFILES) $(PHFILES) $(DKHFILES) $(LIBHF
 xfs:
        @mkdir -p xfs
 
-
-include $(BUILDRULES)
-
-install-dev: default
+install: default
        $(INSTALL) -m 755 -d $(PKG_INC_DIR)
+
+install-dev: install
        $(INSTALL) -m 644 $(HFILES) $(PKG_INC_DIR)
 
 install-qa: install-dev

diff --git a/include/buildrules b/include/buildrules
index 1c9fe2819b238fc576ae9784bb76d5dfa1eef446..0e13f9da83530bbb4061cf25c59b7bb63cdf7180 100644 (file)
--- a/include/buildrules
+++ b/include/buildrules
@@ -13,10 +13,12 @@ clean clobber : $(addsuffix -clean,$(SUBDIRS))
        @echo "Cleaning $*"
        $(Q)$(MAKE) $(MAKEOPTS) -C $* clean
 
+ifdef HDR_SUBDIRS
 headers: $(addsuffix -headers, $(HDR_SUBDIRS))
 %-headers:
        @echo "   [HEADERS] $*"
-       $(Q)$(MAKE) $(MAKEOPTS) -C $* headers
+       $(Q)$(MAKE) $(MAKEOPTS) -C $* NODEP=1 install-headers
+endif
 
 # Never blow away subdirs
 ifdef SUBDIRS

diff --git a/libdisk/drivers.h b/libdisk/drivers.h
index 4ede58b08ed5e8c3319e47e31ed12c513206a74d..22ac1ea179845c5d1286e54e43f0fd83d7c74877 100644 (file)
--- a/libdisk/drivers.h
+++ b/libdisk/drivers.h
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <sys/stat.h>
 #include <volume.h>
 

diff --git a/libxfs/Makefile b/libxfs/Makefile
index afd0af3d4832fbd6070e456e32375710298f583c..56756024ead62dc57693a23f96f310c9b553bb54 100644 (file)
--- a/libxfs/Makefile
+++ b/libxfs/Makefile
@@ -121,14 +121,15 @@ crc32selftest: gen_crc32table.c crc32table.h crc32.c
        $(Q) ./$@
 
 # set up include/xfs header directory
-headers: $(addsuffix -hdrs, $(PKGHFILES) $(QAHFILES))
-
-%-hdrs:
-       $(Q)$(LN_S) -f $(PWD)/libxfs/$* $(TOPDIR)/include/xfs/$*
-
 include $(BUILDRULES)
 
 install: default
+       $(INSTALL) -m 755 -d $(PKG_INC_DIR)
+
+install-headers: $(addsuffix -hdrs, $(PKGHFILES) $(QAHFILES))
+
+%-hdrs:
+       $(Q)$(LN_S) -f $(PWD)/libxfs/$* $(TOPDIR)/include/xfs/$*
 
 install-dev: install
        $(INSTALL) -m 644 $(PKGHFILES) $(HFILES) $(PKG_INC_DIR)
@@ -136,5 +137,13 @@ install-dev: install
 install-qa: install-dev
        $(INSTALL) -m 644 $(QAHFILES) $(PKG_INC_DIR)
 
+# We need to install the headers before building the dependencies.  If we
+# include the .ltdep file, the makefile decides that it needs to build the
+# dependencies to remake the makefile before running the header install target,
+# hence making it impossible to avoid errors being thrown by the dependency
+# generation. Hence we play games so that we only include this file if we aren't
+# running the install-headers target.
+ifndef NODEP
 -include .ltdep
+endif
 

diff --git a/libxfs/darwin.c b/libxfs/darwin.c
index ad0b05b4e82b525755b49ae950be1b64e0eb126e..f4a38987f7fa3d18ee2a5229441f4fb394c65394 100644 (file)
--- a/libxfs/darwin.c
+++ b/libxfs/darwin.c
@@ -20,8 +20,8 @@
 #include <sys/stat.h>
 #include <sys/mount.h>
 #include <sys/ioctl.h>
-#include <xfs/libxfs.h>
 #include <sys/sysctl.h>
+#include "xfs/libxfs.h"
 
 int platform_has_uuid = 1;
 extern char *progname;

diff --git a/libxfs/freebsd.c b/libxfs/freebsd.c
index 5bb7acb356dffe50eb058e53faeee28f994fc84f..ec131db23b2b4e72de397c29a643a7441cf4da98 100644 (file)
--- a/libxfs/freebsd.c
+++ b/libxfs/freebsd.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <sys/stat.h>
 #include <sys/disk.h>
 #include <sys/mount.h>

diff --git a/libxfs/init.c b/libxfs/init.c
index 6f404aaa85b4d6e90fbfbf8886d4f2e663961540..d287c1dc229e23e27da483423d7fa1f32c644ab2 100644 (file)
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -31,7 +31,7 @@
 #include "xfs_inode.h"
 #include "xfs_trans.h"
 
-#include <xfs/libxfs.h>                /* for now */
+#include "xfs/libxfs.h"                /* for now */
 
 char *progname = "libxfs";     /* default, changed by each tool */
 

diff --git a/libxfs/irix.c b/libxfs/irix.c
index 1dcb4f6025922b5918f9c72b3757d8f9ace0ca73..69e6d815f8f511b010b0737cd7cad2b824ea3949 100644 (file)
--- a/libxfs/irix.c
+++ b/libxfs/irix.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <diskinfo.h>
 #include <sys/sysmp.h>
 

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index cb172064fb92f6839ead51ce5b71189a8e424396..61c0d6b2ae16e33f8e1bb9829530d1ef4fd05d92 100644 (file)
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -30,7 +30,7 @@
 #include "xfs_inode.h"
 #include "xfs_trans.h"
 
-#include <xfs/libxfs.h>                /* for LIBXFS_EXIT_ON_FAILURE */
+#include "xfs/libxfs.h"                /* for LIBXFS_EXIT_ON_FAILURE */
 
 /*
  * Important design/architecture note:

diff --git a/libxlog/util.c b/libxlog/util.c
index 498c06ce61229e3b5ec3f6cba38f87610d91bd4b..9ef594c227fd0a98d0b8f68ff1f54d4345db83f9 100644 (file)
--- a/libxlog/util.c
+++ b/libxlog/util.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <xfs/libxlog.h>
 
 int print_exit;

diff --git a/libxlog/xfs_log_recover.c b/libxlog/xfs_log_recover.c
index cc8aff8d15ce3fcfda788a653066957ae53faca2..912e0de8c99773e1729319912b210d907c556650 100644 (file)
--- a/libxlog/xfs_log_recover.c
+++ b/libxlog/xfs_log_recover.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <xfs/libxlog.h>
 
 #define xfs_readonly_buftarg(buftarg)                  (0)

diff --git a/logprint/log_copy.c b/logprint/log_copy.c
index 1517846fafbbec1d892964c5832510ba1548a744..d8539c83e834ef33369d0dd44b169b6e645063a2 100644 (file)
--- a/logprint/log_copy.c
+++ b/logprint/log_copy.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <xfs/libxlog.h>
 
 #include "logprint.h"

diff --git a/logprint/log_dump.c b/logprint/log_dump.c
index dcecb44b129be6f6fbf418083e43a9d0fe977806..96f2912f6e158feffe9775182a6597a201140e31 100644 (file)
--- a/logprint/log_dump.c
+++ b/logprint/log_dump.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <xfs/libxlog.h>
 
 #include "logprint.h"

diff --git a/logprint/log_misc.c b/logprint/log_misc.c
index 521ab66a69ffaa4ad5eda4c12c2f2c9ea81e2e3b..ccd29a8631beceb2563cda2ac6494c0787741ae7 100644 (file)
--- a/logprint/log_misc.c
+++ b/logprint/log_misc.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <xfs/libxlog.h>
 
 #include "logprint.h"

diff --git a/logprint/log_print_all.c b/logprint/log_print_all.c
index a02c71a0f45dfa98dfd057239f6f19c30853b347..3d41e6587238808fad328ec7c61a004c4c6bc8f4 100644 (file)
--- a/logprint/log_print_all.c
+++ b/logprint/log_print_all.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <xfs/libxlog.h>
 
 #include "logprint.h"

diff --git a/logprint/log_print_trans.c b/logprint/log_print_trans.c
index 0911b6fad5c2ed3d93b3b3ac283d58bbcafcc841..61033265974ae05975523e3d0af7147548ebd227 100644 (file)
--- a/logprint/log_print_trans.c
+++ b/logprint/log_print_trans.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <xfs/libxlog.h>
 
 #include "logprint.h"

diff --git a/logprint/logprint.c b/logprint/logprint.c
index fdf106b960b023867993ece321d66c9bec99eaab..78d92feca12ce17a096edbfe71c7fd5464e62728 100644 (file)
--- a/logprint/logprint.c
+++ b/logprint/logprint.c
@@ -18,7 +18,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <xfs/libxlog.h>
 
 #include "logprint.h"

diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c
index f3c846ecea55cd3e36952adc71e997bb4281afac..ea7298d8d7b0528e7053defdb0d30e37f04ff1e5 100644 (file)
--- a/mdrestore/xfs_mdrestore.c
+++ b/mdrestore/xfs_mdrestore.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "xfs_metadump.h"
 
 char           *progname;

diff --git a/mkfs/fstyp.c b/mkfs/fstyp.c
index e91b947fc6f885e87883284def911d89203071cb..741051624fb6dd6e24904fa205b1a1d7ddbb5cd0 100644 (file)
--- a/mkfs/fstyp.c
+++ b/mkfs/fstyp.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <disk/fstyp.h>
 
 /*

diff --git a/mkfs/maxtrres.c b/mkfs/maxtrres.c
index 66a6c14d443934ed0d651dd0e1a33122db736c5b..f6bcec0f685346ff18c24d05f518950620907aea 100644 (file)
--- a/mkfs/maxtrres.c
+++ b/mkfs/maxtrres.c
@@ -24,7 +24,7 @@
  * directory block size.
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include "xfs_mkfs.h"
 
 int

diff --git a/mkfs/proto.c b/mkfs/proto.c
index 45565b7a6a56f56d4e1ff2805ae3392cdaadbca3..b69ff1ba47aae17d8b98504847936f331bd260bd 100644 (file)
--- a/mkfs/proto.c
+++ b/mkfs/proto.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <sys/stat.h>
 #include "xfs_mkfs.h"
 

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index e66350b3b1c574e187b20533c0ec10392426ffc5..e14f06dd0b02898af51c13286f3225f3078d522e 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <ctype.h>
 #ifdef ENABLE_BLKID
 #include <blkid/blkid.h>

diff --git a/repair/agheader.c b/repair/agheader.c
index 9ae2deb36d68ccfbe712d73e4cbe5d4991370f16..0989597b324d499fee5fc1bd422a43fbe7f18465 100644 (file)
--- a/repair/agheader.c
+++ b/repair/agheader.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "globals.h"
 #include "agheader.h"
 #include "protos.h"

diff --git a/repair/attr_repair.c b/repair/attr_repair.c
index f3332b3d141f59b0608e16c3c5b97b7be8dcddac..3e441639bce37c53efdc7ae0027d58b900cc1271 100644 (file)
--- a/repair/attr_repair.c
+++ b/repair/attr_repair.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "globals.h"
 #include "err_protos.h"
 #include "attr_repair.h"

diff --git a/repair/avl.c b/repair/avl.c
index eabecc3f8c256744dfd304ed3e5a466dc96351c3..7f361667228a6e53eedf62c5e994fedecc35ad54 100644 (file)
--- a/repair/avl.c
+++ b/repair/avl.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "avl.h"
 
 #define CERT   ASSERT

diff --git a/repair/avl64.c b/repair/avl64.c
index c135da322badcec15139ca9885dac68b3ad377f3..54038fc038c2ce23a1b5ccc7c399612f204dd626 100644 (file)
--- a/repair/avl64.c
+++ b/repair/avl64.c
@@ -17,7 +17,7 @@
  */
 
 #include <stdio.h>
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "avl64.h"
 
 #define CERT   ASSERT

diff --git a/repair/bmap.c b/repair/bmap.c
index 71568f4fd405a0a89d81183174cdba5ac4f9e0ce..c5c50c3b3c929fa296ea2d39bd54d2f556a6b15d 100644 (file)
--- a/repair/bmap.c
+++ b/repair/bmap.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "err_protos.h"
 #include "bmap.h"
 

diff --git a/repair/btree.c b/repair/btree.c
index 2beb75ae67cde45bc499b15768bf1793a35eefe2..bc4ed989c52567362aea59b03522791f15c05d4d 100644 (file)
--- a/repair/btree.c
+++ b/repair/btree.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "btree.h"
 
 /*

diff --git a/repair/dino_chunks.c b/repair/dino_chunks.c
index a1ce9e71bbdcefb86db40c6a43ce29f421fb8aa8..f600ac25c1babf49bd9b1215b570598389a4f6ee 100644 (file)
--- a/repair/dino_chunks.c
+++ b/repair/dino_chunks.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "avl.h"
 #include "globals.h"
 #include "agheader.h"

diff --git a/repair/dinode.c b/repair/dinode.c
index 179203ee1a3062a90842688b03b1d32eb4a30e0e..09db966c8872ba0a6e443c80676a6bd648643c7c 100644 (file)
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "avl.h"
 #include "globals.h"
 #include "agheader.h"

diff --git a/repair/dir2.c b/repair/dir2.c
index ceb8825cda005522e06678fc124252a8cba3ea6f..3c4d9bd9e25c0fcbaea2d4dfb0de1af8bdb27d60 100644 (file)
--- a/repair/dir2.c
+++ b/repair/dir2.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "avl.h"
 #include "globals.h"
 #include "incore.h"

diff --git a/repair/globals.c b/repair/globals.c
index b588d033e9faa883ce1c0c4c9b1b81613e722433..d0ca3fb3b2c930162bb64f2cbde288e099142336 100644 (file)
--- a/repair/globals.c
+++ b/repair/globals.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 
 #define EXTERN
 #include "globals.h"

diff --git a/repair/incore.c b/repair/incore.c
index cf1073f78abfc4f197c205b99c334a294eaa2bce..d5ecfd6daf17ecf957f96dba9bde59f3b8fa1294 100644 (file)
--- a/repair/incore.c
+++ b/repair/incore.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "avl.h"
 #include "btree.h"
 #include "globals.h"

diff --git a/repair/incore_bmc.c b/repair/incore_bmc.c
index 1bc5fd92e76dadc9bc51ce42ab9d4f0f289a3245..c1e855d24dda02694639408960e15e41626b8972 100644 (file)
--- a/repair/incore_bmc.c
+++ b/repair/incore_bmc.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "avl.h"
 #include "globals.h"
 #include "incore.h"

diff --git a/repair/incore_ext.c b/repair/incore_ext.c
index 826bf44b2472c21be2fb4e947a509a3199d71e78..843e69d99271b18eb915c2467eaa2ce64008cc86 100644 (file)
--- a/repair/incore_ext.c
+++ b/repair/incore_ext.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "avl.h"
 #include "btree.h"
 #include "globals.h"

diff --git a/repair/incore_ino.c b/repair/incore_ino.c
index 95026481c72c570c30e57d03d4f6d261029bb726..0f3deebd7b4a3358db749f27944cc86fa78310a3 100644 (file)
--- a/repair/incore_ino.c
+++ b/repair/incore_ino.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "avl.h"
 #include "globals.h"
 #include "incore.h"

diff --git a/repair/init.c b/repair/init.c
index d0940aaef73d547589c3b590ac24d64f1a1bd6a8..a7547cb8e8f35b83aece89e21a23d6679843f8f0 100644 (file)
--- a/repair/init.c
+++ b/repair/init.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "globals.h"
 #include "agheader.h"
 #include "protos.h"

diff --git a/repair/phase1.c b/repair/phase1.c
index 9e7011db5f27f04fafc65a3f8c82797ae4cd97c9..bd9adcbba130e01017acfb8e7ce328dfdad3262d 100644 (file)
--- a/repair/phase1.c
+++ b/repair/phase1.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "globals.h"
 #include "agheader.h"
 #include "protos.h"

diff --git a/repair/phase2.c b/repair/phase2.c
index 983aaa7613c8b0aa8533a851a86815b4087545b8..9fb8b1dda2e883728ec167f8df9cc7c6bc6f859c 100644 (file)
--- a/repair/phase2.c
+++ b/repair/phase2.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <xfs/libxlog.h>
 #include "avl.h"
 #include "globals.h"

diff --git a/repair/phase3.c b/repair/phase3.c
index 213d368447ae368c86812fe2de94fc8a9a46c903..4751e56b94af551fb1f821fbedef140985bb93a6 100644 (file)
--- a/repair/phase3.c
+++ b/repair/phase3.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "threads.h"
 #include "prefetch.h"
 #include "avl.h"

diff --git a/repair/phase4.c b/repair/phase4.c
index aa79ae017557ded394bdce21171cf3859a0fcc85..8d3525c088953a2545ee9f6a2894b8c1f1754d3e 100644 (file)
--- a/repair/phase4.c
+++ b/repair/phase4.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "threads.h"
 #include "prefetch.h"
 #include "avl.h"

diff --git a/repair/phase5.c b/repair/phase5.c
index 1ce57a1421a405fc4509d21a59ca1cb58b46190a..e34740f5890c09d9c74b0756b2b140ac3d66069b 100644 (file)
--- a/repair/phase5.c
+++ b/repair/phase5.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "avl.h"
 #include "globals.h"
 #include "agheader.h"

diff --git a/repair/phase6.c b/repair/phase6.c
index 130ed4f1ba68ddf0f21029848e12a3bb6f6521fd..1e0b4c294a934f930043bb9468188d32f96a08d8 100644 (file)
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "threads.h"
 #include "prefetch.h"
 #include "avl.h"

diff --git a/repair/phase7.c b/repair/phase7.c
index becacf83fb40b87bcb7a1b51a93df14d5f2feb7c..fe4a84aecaafd87f78360480f2e492e0f364e31c 100644 (file)
--- a/repair/phase7.c
+++ b/repair/phase7.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "avl.h"
 #include "globals.h"
 #include "agheader.h"

diff --git a/repair/prefetch.c b/repair/prefetch.c
index d6246ce3c149929c6efa1c5368f13f279d4d7834..45b1ffeebae94b51a850d8aab6d4a77219428aec 100644 (file)
--- a/repair/prefetch.c
+++ b/repair/prefetch.c
@@ -1,4 +1,4 @@
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include <pthread.h>
 #include "avl.h"
 #include "btree.h"

diff --git a/repair/progress.c b/repair/progress.c
index 45a412e45c1ff5eac352ac2524f85fc787cc0a12..1b279247e8adab1c4124353a11d34269890f5117 100644 (file)
--- a/repair/progress.c
+++ b/repair/progress.c
@@ -1,5 +1,5 @@
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "globals.h"
 #include "progress.h"
 #include "err_protos.h"

diff --git a/repair/rt.c b/repair/rt.c
index 3a488c8693384b66805a4eb6ff62a3f331dd988e..b412a0fccd388ffea388cda4f3d353be49ca2f4f 100644 (file)
--- a/repair/rt.c
+++ b/repair/rt.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "avl.h"
 #include "globals.h"
 #include "agheader.h"

diff --git a/repair/sb.c b/repair/sb.c
index 03be5e851aa6cd8ee5abcfa66e4d7f5776c1efd0..c241f1132a3444cfd44bf12239289f2566b281ef 100644 (file)
--- a/repair/sb.c
+++ b/repair/sb.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include <libxlog.h>
 #include "agheader.h"
 #include "globals.h"

diff --git a/repair/scan.c b/repair/scan.c
index 9c9be68939c4bbf8e9d735671f2716345b63de42..881de9ec450feae4eb8655393125201e6652df2b 100644 (file)
--- a/repair/scan.c
+++ b/repair/scan.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include "avl.h"
 #include "globals.h"
 #include "agheader.h"

diff --git a/repair/threads.c b/repair/threads.c
index d10b841f3e8028f6524c1dddec3b858aebd1dd63..a5fb8564f24b8b76b8d79f1d3a7d2fe3efcdaf4c 100644 (file)
--- a/repair/threads.c
+++ b/repair/threads.c
@@ -1,4 +1,4 @@
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 #include <pthread.h>
 #include <signal.h>
 #include "threads.h"

diff --git a/repair/versions.c b/repair/versions.c
index e176779beb47e142601125e7996ba8927f280f5b..0bf4ab3d02904fa347bc1230f1bd9b72671b7350 100644 (file)
--- a/repair/versions.c
+++ b/repair/versions.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 
 #define EXTERN
 #include "versions.h"

diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index 8cb06b35a50849b28c12e4bfb587b532a7bcd2d5..cf8c1becc10b78c16b986d22ad13b2863ee9aaa1 100644 (file)
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <xfs/libxfs.h>
+#include "xfs/libxfs.h"
 #include <xfs/libxlog.h>
 #include <sys/resource.h>
 #include "avl.h"

diff --git a/rtcp/xfs_rtcp.c b/rtcp/xfs_rtcp.c
index 5f26a62e06d2164e9084cd781cc5109ece6e4685..08a02b3a8a1e037527203d1a9db1ec5273f92a94 100644 (file)
--- a/rtcp/xfs_rtcp.c
+++ b/rtcp/xfs_rtcp.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <libxfs.h>
+#include "xfs/libxfs.h"
 
 int rtcp(char *, char *, int);
 int xfsrtextsize(char *path);