X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=c448bbb8b7b5d0fbba97ea23be391d97d88fa007;hb=8e6f35cbf344dbefbfe6420e06a47f64079f72ad;hp=1fbe4c49c1ea66dc7b13fba7c1c0f7ef7c92b464;hpb=b916af97dd82b3321e54e34a92fe72909db6c6a8;p=bcachefs-tools-debian

diff --git a/Makefile b/Makefile
index 1fbe4c4..c448bbb 100644
--- a/Makefile
+++ b/Makefile
@@ -89,12 +89,13 @@ TAGS:
 tags:
 	ctags -R .
 
-DOCSRC := gen.h bcachefs.5.rst
-DOCGENERATED := bcachefs.5 doc/autogen/gen.csv
-DOCDEPS := $(addprefix ./doc/autogen/,$(DOCSRC))
+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
-	CC=$(CC) doc/autogen/gen.sh
-	rst2man doc/autogen/bcachefs.5.rst bcachefs.5
+	$(CC) doc/opts_macro.h -I libbcachefs -I include -E 2>/dev/null	\
+		| doc/macro2rst.py
+	rst2man doc/bcachefs.5.rst bcachefs.5
 
 SRCS=$(shell find . -type f -iname '*.c')
 DEPS=$(SRCS:.c=.d)
@@ -146,11 +147,9 @@ clean:
 
 .PHONY: deb
 deb: all
-# --unsigned-source --unsigned-changes --no-pre-clean --build=binary
-# --diff-ignore --tar-ignore
 	debuild -us -uc -nc -b -i -I
 
-.PHONE: update-bcachefs-sources
+.PHONY: update-bcachefs-sources
 update-bcachefs-sources:
 	git rm -rf --ignore-unmatch libbcachefs
 	test -d libbcachefs || mkdir libbcachefs
@@ -158,6 +157,10 @@ update-bcachefs-sources:
 	git add libbcachefs/*.[ch]
 	cp $(LINUX_DIR)/include/trace/events/bcachefs.h include/trace/events/
 	git add include/trace/events/bcachefs.h
+	cp $(LINUX_DIR)/include/linux/xxhash.h include/linux/
+	git add include/linux/xxhash.h
+	cp $(LINUX_DIR)/lib/xxhash.c linux/
+	git add linux/xxhash.c
 	cp $(LINUX_DIR)/kernel/locking/six.c linux/
 	git add linux/six.c
 	cp $(LINUX_DIR)/include/linux/six.h include/linux/
@@ -170,6 +173,6 @@ update-bcachefs-sources:
 	git -C $(LINUX_DIR) rev-parse HEAD | tee .bcachefs_revision
 	git add .bcachefs_revision
 
-.PHONE: update-commit-bcachefs-sources
+.PHONY: update-commit-bcachefs-sources
 update-commit-bcachefs-sources: update-bcachefs-sources
 	git commit -m "Update bcachefs sources to $(shell git -C $(LINUX_DIR) show --oneline --no-patch)"