check for libkeyutils with pkg-config

[bcachefs-tools-debian] / Makefile

diff --git a/Makefile b/Makefile
index e4f6820fbc66e9ca63c05a8f066c4566c157edc6..266f98a1ac1cbfe3c2741faf717037d6e182b787 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,15 +28,6 @@ PYTEST_CMD?=$(shell \
 )
 PYTEST:=$(PYTEST_CMD) $(PYTEST_ARGS)
 
-RST2MAN_ARGS?=
-RST2MAN_CMD?=$(shell \
-       command -v rst2man \
-       || which rst2man \
-       || command -v rst2man.py \
-       || which rst2man.py \
-)
-RST2MAN:=$(RST2MAN_CMD) $(RST2MAN_ARGS)
-
 CARGO_ARGS=
 CARGO=cargo $(CARGO_ARGS)
 CARGO_PROFILE=release
@@ -56,7 +47,7 @@ CFLAGS+=$(call cc-disable-warning, zero-length-array)
 CFLAGS+=$(call cc-disable-warning, shift-overflow)
 CFLAGS+=$(call cc-disable-warning, enum-conversion)
 
-PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib liblz4 libzstd libudev"
+PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib liblz4 libzstd libudev libkeyutils"
 ifdef BCACHEFS_FUSE
        PKGCONFIG_LIBS+="fuse3 >= 3.7"
        CFLAGS+=-DBCACHEFS_FUSE
@@ -73,7 +64,7 @@ endif
 
 CFLAGS+=$(PKGCONFIG_CFLAGS)
 LDLIBS+=$(PKGCONFIG_LDLIBS)
-LDLIBS+=-lm -lpthread -lrt -lscrypt -lkeyutils -laio -ldl
+LDLIBS+=-lm -lpthread -lrt -lkeyutils -laio -ldl
 LDLIBS+=$(EXTRA_LDLIBS)
 
 ifeq ($(PREFIX),/usr)
@@ -85,7 +76,7 @@ else
 endif
 
 .PHONY: all
-all: bcachefs bcachefs.5 lib
+all: bcachefs lib
 
 .PHONY: lib
 lib: libbcachefs.so
@@ -108,19 +99,7 @@ TAGS:
 tags:
        ctags -R .
 
-DOCSRC := opts_macro.h bcachefs.5.rst.tmpl
-DOCGENERATED := bcachefs.5 doc/bcachefs.5.rst
-DOCDEPS := $(addprefix ./doc/,$(DOCSRC))
-bcachefs.5: $(DOCDEPS)  libbcachefs/opts.h
-ifneq (,$(RST2MAN_CMD))
-       $(CC) doc/opts_macro.h -I libbcachefs -I include -E 2>/dev/null \
-               | doc/macro2rst.py
-       $(RST2MAN) doc/bcachefs.5.rst bcachefs.5
-else
-       @echo "WARNING: no rst2man found! Man page not generated."
-endif
-
-SRCS=$(shell find . -type f -iname '*.c')
+SRCS=$(shell find . -type f ! -path '*/.*/*' -iname '*.c')
 DEPS=$(SRCS:.c=.d)
 -include $(DEPS)
 
@@ -171,7 +150,7 @@ install: bcachefs lib
        $(INSTALL) -m0755 -D initramfs/hook   $(DESTDIR)$(INITRAMFS_HOOK)
        $(INSTALL) -m0755 -D mount.bcachefs.sh $(DESTDIR)$(ROOT_SBINDIR)
        $(INSTALL) -m0755 -D libbcachefs.so -t $(DESTDIR)$(PREFIX)/lib/
-  
+
        sed -i '/^# Note: make install replaces/,$$d' $(DESTDIR)$(INITRAMFS_HOOK)
        echo "copy_exec $(ROOT_SBINDIR)/bcachefs /sbin/bcachefs" >> $(DESTDIR)$(INITRAMFS_HOOK)
 
@@ -184,6 +163,12 @@ clean:
 deb: all
        debuild -us -uc -nc -b -i -I
 
+bcachefs-principles-of-operation.pdf: doc/bcachefs-principles-of-operation.tex
+       pdflatex doc/bcachefs-principles-of-operation.tex
+       pdflatex doc/bcachefs-principles-of-operation.tex
+
+doc: bcachefs-principles-of-operation.pdf
+
 .PHONY: update-bcachefs-sources
 update-bcachefs-sources:
        git rm -rf --ignore-unmatch libbcachefs
@@ -209,7 +194,7 @@ update-bcachefs-sources:
        $(RM) libbcachefs/*.mod.c
        git -C $(LINUX_DIR) rev-parse HEAD | tee .bcachefs_revision
        git add .bcachefs_revision
-       
+
 
 .PHONY: update-commit-bcachefs-sources
 update-commit-bcachefs-sources: update-bcachefs-sources