X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=GNUmakefile;h=20754e57aa52441baeb90df1ff685c7ce197496c;hb=6a5162606f8c6e68539792b240cce085c4816636;hp=0ba62119a7bf34af85bd76a7f37d2094b7b21e5e;hpb=02d6e08f3e6476ed9ebe6f6ade0f7a3f79b4536a;p=bup.git

diff --git a/GNUmakefile b/GNUmakefile
index 0ba6211..20754e5 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -40,9 +40,9 @@ LDFLAGS ?=
 TARGET_ARCH ?=
 
 bup_shared_cflags := -O2 -Wall -Werror -Wformat=2
-bup_shared_cflags := -Wno-unused-command-line-argument $(bup_shared_cflags)
 bup_shared_cflags := -Wno-unknown-pragmas -Wsign-compare $(bup_shared_cflags)
 bup_shared_cflags := -D_FILE_OFFSET_BITS=64 $(bup_shared_cflags)
+bup_shared_cflags := $(bup_config_cflags) $(bup_shared_cflags)
 
 bup_shared_ldflags :=
 
@@ -235,10 +235,9 @@ long-test: test
 long-check: export BUP_TEST_LEVEL=11
 long-check: check
 
-.PHONY: check-both
-check-both:
+.PHONY: check-py3
+check-py3:
 	$(MAKE) clean && BUP_PYTHON_CONFIG=python3-config $(MAKE) check
-	$(MAKE) clean && BUP_PYTHON_CONFIG=python2.7-config $(MAKE) check
 
 .PHONY: Documentation/all
 Documentation/all: $(man_roff) $(man_html)
@@ -281,11 +280,8 @@ import-docs: Documentation/clean
 
 clean: Documentation/clean
 	cd config && rm -rf finished bin config.var
-	cd config && rm -f \
-	  ${CONFIGURE_DETRITUS} ${CONFIGURE_FILES} ${GENERATED_FILES}
-	rm -rf $(clean_paths) .pytest_cache
-	rm -f $(generated_dependencies)
-	find . -name __pycache__ -exec rm -rf {} +
+
+        # Clean up the mounts first, so that find, etc. won't crash later
 	if test -e test/mnt; then dev/cleanup-mounts-under test/mnt; fi
 	if test -e test/mnt; then rm -r test/mnt; fi
 	if test -e test/tmp; then dev/cleanup-mounts-under test/tmp; fi
@@ -293,5 +289,11 @@ clean: Documentation/clean
 	if test -e test/int/testfs; \
 	  then umount test/int/testfs || true; fi
 	rm -rf test/int/testfs test/int/testfs.img testfs.img
+
+	cd config && rm -f \
+	  ${CONFIGURE_DETRITUS} ${CONFIGURE_FILES} ${GENERATED_FILES}
+	rm -rf $(clean_paths) .pytest_cache
+	rm -f $(generated_dependencies)
+	find . -name __pycache__ -exec rm -rf {} +
 	if test -e test/tmp; then dev/force-delete test/tmp; fi
 	dev/configure-sampledata --clean