-VERSION=1.3.3
+VERSION=1.3.6
PREFIX?=/usr/local
PKG_CONFIG?=pkg-config
ifeq ($(BUILD_VERBOSE),1)
Q =
+ CARGO_CLEAN_ARGS = --verbose
else
Q = @
+ CARGO_CLEAN_ARGS = --quiet
endif
CFLAGS+=-std=gnu11 -O2 -g -MMD -Wall -fPIC \
CARGO=cargo $(CARGO_ARGS)
CARGO_PROFILE=release
# CARGO_PROFILE=debug
+CARGO_MANIFEST=--manifest-path rust-src/Cargo.toml
CARGO_BUILD_ARGS=--$(CARGO_PROFILE)
-CARGO_BUILD=$(CARGO) build $(CARGO_BUILD_ARGS)
+CARGO_BUILD=$(CARGO) build $(CARGO_BUILD_ARGS) $(CARGO_MANIFEST)
+
+CARGO_CLEAN=$(CARGO) clean $(CARGO_CLEAN_ARGS) $(CARGO_MANIFEST)
include Makefile.compiler
PKGCONFIG_SERVICEDIR:=$(shell $(PKG_CONFIG) --variable=systemdsystemunitdir systemd)
ifeq (,$(PKGCONFIG_SERVICEDIR))
- $(warning skipping systemd integration)
+ $(warning skipping systemd integration)
else
BCACHEFSCK_ARGS=-f -n
systemd_libfiles=\
RUST_SRCS=$(shell find rust-src/src rust-src/bch_bindgen/src -type f -iname '*.rs')
rust-src/target/release/libbcachefs_rust.a: $(RUST_SRCS)
- $(CARGO_BUILD) --manifest-path rust-src/Cargo.toml
+ $(CARGO_BUILD)
tests/test_helper: $(filter ./tests/%.o, $(OBJS))
@echo " [LD] $@"
clean:
@echo "Cleaning all"
$(Q)$(RM) bcachefs libbcachefs.a tests/test_helper .version *.tar.xz $(OBJS) $(DEPS) $(DOCGENERATED)
- $(Q)$(RM) -rf rust-src/*/target
+ $(Q)$(CARGO_CLEAN)
$(Q)$(RM) -f $(built_scripts)
.PHONY: deb
git add include/linux/kmemleak.h
cp $(LINUX_DIR)/lib/math/int_sqrt.c linux/
git add linux/int_sqrt.c
- git rm libbcachefs/mean_and_variance_test.c
+ git rm -f libbcachefs/mean_and_variance_test.c
# cp $(LINUX_DIR)/lib/math/mean_and_variance.c linux/
# git add linux/mean_and_variance.c
# cp $(LINUX_DIR)/include/linux/mean_and_variance.h include/linux/