X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=GNUmakefile;h=5c0f72501f0c5f25acaa1b8dce1ee9ac4f020bb1;hb=d1c5a726387d83d526695c30b9ac7fc0498f7027;hp=f3245f59c872f5f94ee06cf1a2ee8f7c6a4fb961;hpb=4c62b18b950d7edfadffcca279ead0d547d306d2;p=bup.git

diff --git a/GNUmakefile b/GNUmakefile
index f3245f5..5c0f725 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 :=
 
@@ -285,11 +285,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
@@ -297,5 +294,13 @@ 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 {} +
+        # Remove this *.pyc cleanup once we drop py2
+	rm -f lib/bup/*.pyc lib/bup/cmd/*.pyc test/__init__.pyc
 	if test -e test/tmp; then dev/force-delete test/tmp; fi
 	dev/configure-sampledata --clean