Update for new superblock options; makefile improvements

[bcachefs-tools-debian] / Makefile

diff --git a/Makefile b/Makefile
index facdf683102130253bec4fabad1ba42874176c33..04d466ea459698aa19da935603c2c1a20ceadb05 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,38 +1,86 @@
 
 PREFIX=/usr
 INSTALL=install
-CFLAGS+=-std=gnu99 -O2 -Wall -g -D_FILE_OFFSET_BITS=64 -I.
-LDFLAGS+=-static
+CFLAGS+=-std=gnu89 -O2 -g -MMD -Wall                           \
+       -Wno-pointer-sign                                       \
+       -fno-strict-aliasing                                    \
+       -I. -Iinclude -Ilibbcachefs                             \
+       -D_FILE_OFFSET_BITS=64                                  \
+       -D_GNU_SOURCE                                           \
+       -D_LGPL_SOURCE                                          \
+       -DRCU_MEMBARRIER                                        \
+       -DNO_BCACHEFS_CHARDEV                                   \
+       -DNO_BCACHEFS_FS                                        \
+       -DNO_BCACHEFS_SYSFS                                     \
+       $(EXTRA_CFLAGS)
+LDFLAGS+=-O2 -g
 
-PKGCONFIG_LIBS="blkid uuid libnih"
+CC_VERSION=$(shell $(CC) -v 2>&1|grep -E '(gcc|clang) version')
+
+ifneq (,$(findstring gcc,$(CC_VERSION)))
+       CFLAGS+=-Wno-unused-but-set-variable
+endif
+
+ifneq (,$(findstring clang,$(CC_VERSION)))
+       CFLAGS+=-Wno-missing-braces
+endif
+
+ifdef D
+       CFLAGS+=-Werror
+       CFLAGS+=-DCONFIG_BCACHEFS_DEBUG=y
+endif
+
+PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib"
 CFLAGS+=`pkg-config --cflags   ${PKGCONFIG_LIBS}`
-LDLIBS+=`pkg-config --libs     ${PKGCONFIG_LIBS}` -lscrypt -lsodium -lkeyutils
+LDLIBS+=`pkg-config --libs     ${PKGCONFIG_LIBS}`              \
+       -lm -lpthread -lrt -lscrypt -lkeyutils -laio
 
-ifeq ($(PREFIX), "/usr")
+ifeq ($(PREFIX),/usr)
        ROOT_SBINDIR=/sbin
 else
        ROOT_SBINDIR=$(PREFIX)/sbin
 endif
 
-all: bcache
+.PHONY: all
+all: bcachefs
 
-install: bcache
-       $(INSTALL) -m0755 bcache $(DESTDIR)$(ROOT_SBINDIR)
-       $(INSTALL) -m0644 -- bcache.8 $(DESTDIR)$(PREFIX)/share/man/man8/
+SRCS=$(shell git ls-files '*.c')
+DEPS=$(SRCS:.c=.d)
+-include $(DEPS)
 
-clean:
-       $(RM) bcache *.o *.a
+OBJS=$(SRCS:.c=.o)
+bcachefs: $(OBJS)
 
-CCANSRCS=$(wildcard ccan/*/*.c)
-CCANOBJS=$(patsubst %.c,%.o,$(CCANSRCS))
+.PHONY: install
+install: bcachefs
+       mkdir -p $(DESTDIR)$(ROOT_SBINDIR)
+       mkdir -p $(DESTDIR)$(PREFIX)/share/man/man8/
+       $(INSTALL) -m0755 bcachefs      $(DESTDIR)$(ROOT_SBINDIR)
+       $(INSTALL) -m0755 fsck.bcachefs $(DESTDIR)$(ROOT_SBINDIR)
+       $(INSTALL) -m0755 mkfs.bcachefs $(DESTDIR)$(ROOT_SBINDIR)
+       $(INSTALL) -m0644 bcachefs.8    $(DESTDIR)$(PREFIX)/share/man/man8/
 
-libccan.a: $(CCANOBJS)
-       $(AR) r $@ $(CCANOBJS)
+.PHONY: clean
+clean:
+       $(RM) bcachefs $(OBJS) $(DEPS)
 
-bcache-objs = bcache.o bcache-assemble.o bcache-device.o bcache-format.o\
-       bcache-fs.o bcache-run.o bcache-key.o libbcache.o crypto.o util.o
+.PHONY: deb
+deb: all
+       debuild --unsigned-source       \
+               --unsigned-changes      \
+               --no-pre-clean          \
+               --build=binary          \
+               --diff-ignore           \
+               --tar-ignore
 
-bcache: $(bcache-objs) libccan.a
+.PHONE: update-bcachefs-sources
+update-bcachefs-sources:
+       git rm -rf libbcachefs
+       cp $(LINUX_DIR)/fs/bcachefs/*.[ch] libbcachefs/
+       cp $(LINUX_DIR)/include/trace/events/bcachefs.h include/trace/events/
+       echo `cd $(LINUX_DIR); git rev-parse HEAD` > .bcachefs_revision
+       git add libbcachefs/*.[ch] include/trace/events/bcachefs.h .bcachefs_revision
 
-deb:
-       debuild -nc -us -uc -i -I
+.PHONE: update-commit-bcachefs-sources
+update-commit-bcachefs-sources: update-bcachefs-sources
+       git commit -m "Update bcachefs sources to `cd $(LINUX_DIR); git show --oneline --no-patch`"