summaryrefslogtreecommitdiff
path: root/cmd_format.c
diff options
context:
space:
mode:
authorAustin Seipp <aseipp@pobox.com>2017-11-26 19:29:00 -0600
committerAustin Seipp <aseipp@pobox.com>2017-12-10 16:06:01 -0600
commit997bb216aa37010826067d0cfa33b4fde5aaa225 (patch)
tree63e968981b6be6ffa17ccf9612b8c5d2cf639a25 /cmd_format.c
parent04035f0c7eaf26ef0a74e36e0edf1adddecb62b5 (diff)
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 <aseipp@pobox.com>
Diffstat (limited to 'cmd_format.c')
-rw-r--r--cmd_format.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd_format.c b/cmd_format.c
index 9cc56a5f..b22fe946 100644
--- a/cmd_format.c
+++ b/cmd_format.c
@@ -24,9 +24,9 @@
#include "cmds.h"
#include "libbcachefs.h"
#include "crypto.h"
-#include "opts.h"
-#include "super-io.h"
-#include "util.h"
+#include "libbcachefs/opts.h"
+#include "libbcachefs/super-io.h"
+#include "libbcachefs/util.h"
#define OPTS \
t("bcachefs format - create a new bcachefs filesystem on one or more devices") \