Update for new superblock options; makefile improvements

[bcachefs-tools-debian] / Makefile

diff --git a/Makefile b/Makefile
index 60abbd87d0d197785b0daa6a72d97f3792c8d96a..04d466ea459698aa19da935603c2c1a20ceadb05 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,33 +1,86 @@
 
 PREFIX=/usr
-UDEVLIBDIR=/lib/udev
-DRACUTLIBDIR=/lib/dracut
 INSTALL=install
-CFLAGS+=-std=gnu99 -O2 -Wall -Werror -g -Iinclude
-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
 
-all: bcacheadm probe-bcache
+CC_VERSION=$(shell $(CC) -v 2>&1|grep -E '(gcc|clang) version')
 
-install: bcacheadm probe-bcache
-       $(INSTALL) -m0755 bcacheadm $(DESTDIR)${PREFIX}/sbin/
-       $(INSTALL) -m0755 probe-bcache bcache-register          $(DESTDIR)$(UDEVLIBDIR)/
-       $(INSTALL) -m0644 69-bcache.rules       $(DESTDIR)$(UDEVLIBDIR)/rules.d/
-       #-$(INSTALL) -T -m0755 initramfs/hook   $(DESTDIR)/usr/share/initramfs-tools/hooks/bcache
-       if [ -d $(DESTDIR)$(DRACUTLIBDIR)/modules.d ]; then\
-               $(INSTALL) -D -m0755 dracut/module-setup.sh $(DESTDIR)$(DRACUTLIBDIR)/modules.d/90bcache/module-setup.sh; \
-       fi
-       $(INSTALL) -m0644 -- *.8 $(DESTDIR)${PREFIX}/share/man/man8/
+ifneq (,$(findstring gcc,$(CC_VERSION)))
+       CFLAGS+=-Wno-unused-but-set-variable
+endif
 
-clean:
-       $(RM) -f probe-bcache bcacheadm bcache-test *.o
+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}`              \
+       -lm -lpthread -lrt -lscrypt -lkeyutils -laio
+
+ifeq ($(PREFIX),/usr)
+       ROOT_SBINDIR=/sbin
+else
+       ROOT_SBINDIR=$(PREFIX)/sbin
+endif
+
+.PHONY: all
+all: bcachefs
 
-bcache.o: CFLAGS += `pkg-config --cflags uuid blkid`
+SRCS=$(shell git ls-files '*.c')
+DEPS=$(SRCS:.c=.d)
+-include $(DEPS)
+
+OBJS=$(SRCS:.c=.o)
+bcachefs: $(OBJS)
+
+.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/
+
+.PHONY: clean
+clean:
+       $(RM) bcachefs $(OBJS) $(DEPS)
 
-bcacheadm.o: CFLAGS += `pkg-config --cflags uuid blkid libnih`
-bcacheadm: LDLIBS += `pkg-config --libs uuid blkid libnih`
-bcacheadm: bcache.o
+.PHONY: deb
+deb: all
+       debuild --unsigned-source       \
+               --unsigned-changes      \
+               --no-pre-clean          \
+               --build=binary          \
+               --diff-ignore           \
+               --tar-ignore
 
-probe-bcache.o: CFLAGS += `pkg-config --cflags uuid blkid`
-probe-bcache: LDLIBS += `pkg-config --libs uuid blkid`
+.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
 
-bcache-test: LDLIBS += `pkg-config --libs openssl`
+.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`"