btrfs-progs: fix path to internal libbtrfsutil includes

All files include the <btrfsutil.h> which could be confused with the
system-wide installation. Drop the -I path from build and use full path
for any libbtrfsutil headers.

Signed-off-by: David Sterba <dsterba@suse.com>

Makefile

@@ -95,7 +95,6 @@ CFLAGS = $(SUBST_CFLAGS) \
 	 -fno-strict-aliasing \
 	 -fPIC \
 	 -I$(TOPDIR) \
-	 -I$(TOPDIR)/libbtrfsutil \
 	 $(CRYPTO_CFLAGS) \
 	 -DCOMPRESSION_LZO=$(COMPRESSION_LZO) \
 	 -DCOMPRESSION_ZSTD=$(COMPRESSION_ZSTD) \

cmds/filesystem.c

@@ -29,7 +29,7 @@
 #include <getopt.h>
 #include <limits.h>
 #include <uuid/uuid.h>
-#include <btrfsutil.h>
+#include "libbtrfsutil/btrfsutil.h"
 #include "kernel-shared/ctree.h"
 #include "kernel-shared/volumes.h"
 #include "kernel-lib/list_sort.h"

cmds/property.c

@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <uuid/uuid.h>
-#include <btrfsutil.h>
+#include "libbtrfsutil/btrfsutil.h"
 #include "kernel-shared/ctree.h"
 #include "common/open-utils.h"
 #include "common/utils.h"

cmds/qgroup.c

@@ -20,7 +20,7 @@
 #include <unistd.h>
 #include <getopt.h>
 #include <errno.h>
-#include <btrfsutil.h>
+#include "libbtrfsutil/btrfsutil.h"
 #include "kernel-shared/ctree.h"
 #include "common/open-utils.h"
 #include "common/utils.h"

cmds/receive.c

@@ -46,6 +46,7 @@
 #if COMPRESSION_ZSTD
 #include <zstd.h>
 #endif
+#include "libbtrfsutil/stubs.h"
 #include "kernel-shared/ctree.h"
 #include "kernel-lib/list.h"
 #include "kernel-shared/send.h"
@@ -56,7 +57,6 @@
 #include "common/path-utils.h"
 #include "cmds/commands.h"
 #include "cmds/receive-dump.h"
-#include "stubs.h"
 #include "ioctl.h"
 
 struct btrfs_receive

cmds/subvolume.c

@@ -28,7 +28,7 @@
 #include <limits.h>
 #include <getopt.h>
 #include <uuid/uuid.h>
-#include <btrfsutil.h>
+#include "libbtrfsutil/btrfsutil.h"
 #include "cmds/qgroup.h"
 #include "kernel-shared/ctree.h"
 #include "common/utils.h"

common/utils.c

@@ -37,7 +37,7 @@
 #include <getopt.h>
 #include <blkid/blkid.h>
 #include <uuid/uuid.h>
-#include <btrfsutil.h>
+#include "libbtrfsutil/btrfsutil.h"
 #include "kernel-lib/radix-tree.h"
 #include "kernel-shared/ctree.h"
 #include "kernel-shared/disk-io.h"