From 997bb216aa37010826067d0cfa33b4fde5aaa225 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 26 Nov 2017 19:29:00 -0600 Subject: build: require explicit include paths for libbcachefs/ This removes the implicit `-I libbcachefs` argument to $(CC), which in turn requires a set of minor changes throughout the tools. There are two advantages to this setup: 1) It is (arguably) easier to read, since the location of bcachefs includes are easier to understand at a glance ("where does util.h live?") 2) It removes the need for a hack to include glibc's copy of dirent.h explicitly via '/usr/include/dirent.h', because libbcachefs/ *also* has a dirent.h file and the compiler cannot disambiguate them. This has some ramifications on systems where /usr/include may not exist, such as NixOS. Signed-off-by: Austin Seipp --- cmd_debug.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'cmd_debug.c') diff --git a/cmd_debug.c b/cmd_debug.c index 7ee4e1f..b1bdda8 100644 --- a/cmd_debug.c +++ b/cmd_debug.c @@ -8,14 +8,14 @@ #include "qcow2.h" #include "tools-util.h" -#include "bcachefs.h" -#include "alloc.h" -#include "btree_cache.h" -#include "btree_iter.h" -#include "buckets.h" -#include "error.h" -#include "journal.h" -#include "super.h" +#include "libbcachefs/bcachefs.h" +#include "libbcachefs/alloc.h" +#include "libbcachefs/btree_cache.h" +#include "libbcachefs/btree_iter.h" +#include "libbcachefs/buckets.h" +#include "libbcachefs/error.h" +#include "libbcachefs/journal.h" +#include "libbcachefs/super.h" static void dump_usage(void) { -- cgit v1.2.3