btrfs-progs: build: clean up cleaning rules

There were some files left after running 'make clean-all'. Reorganize
the target commands and group them by type of files so it's easier to
see what's cleaned and where to add new files.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2023-10-19 01:24:59 +02:00
parent 1357983f69
commit 0927d3056b
1 changed files with 26 additions and 18 deletions

View File

@ -872,28 +872,35 @@ cscope: FORCE
clean-all: clean clean-doc clean-gen clean-all: clean clean-doc clean-gen
clean: $(CLEANDIRS) clean: $(CLEANDIRS)
@echo "Cleaning" @echo "Cleaning tools and libraries"
$(Q)$(RM) -f -- $(progs) *.o .deps/*.o.d \ $(Q)$(RM) -f -- $(progs) $(progs_static) mktables \
btrfs.box btrfs.box.static \
libbtrfs.a libbtrfsutil.a $(libs_shared) $(lib_links)
@echo "Cleaning object files and dependencies"
$(Q)$(RM) -f -- *.o .deps/*.o.d \
check/*.o check/.deps/*.o.d \
cmds/*.o cmds/.deps/*.o.d \
common/*.o common/.deps/*.o.d \
convert/*.o convert/.deps/*.o.d \
crypto/*.o crypto/.deps/*.o.d \
image/*.o image/.deps/*.o.d \
kernel-lib/*.o kernel-lib/.deps/*.o.d \ kernel-lib/*.o kernel-lib/.deps/*.o.d \
kernel-shared/*.o kernel-shared/.deps/*.o.d \ kernel-shared/*.o kernel-shared/.deps/*.o.d \
image/*.o image/.deps/*.o.d \ kernel-shared/*.o kernel-shared/.deps/*.o.d \
convert/*.o convert/.deps/*.o.d \
mkfs/*.o mkfs/.deps/*.o.d check/*.o check/.deps/*.o.d \
cmds/*.o cmds/.deps/*.o.d common/*.o common/.deps/*.o.d \
crypto/*.o crypto/.deps/*.o.d \
tune/*.o tune/.deps/*.o.d \
libbtrfs/*.o libbtrfs/.deps/*.o.d \ libbtrfs/*.o libbtrfs/.deps/*.o.d \
*.gcno *.gcda *.gcov */*.gcno */*.gcda */*/.gcov \ libbtrfsutil/*.o libbtrfsutil/.deps/*.o.d \
ioctl-test quick-test library-test library-test-static \ mkfs/*.o mkfs/.deps/*.o.d \
mktables btrfs.static mkfs.btrfs.static fssum \ tune/*.o tune/.deps/*.o.d
btrfs.box btrfs.box.static json-formatter-test \
hash-speedtest array-test \
$(check_defs) \
libbtrfs.a libbtrfsutil.a $(libs_shared) $(lib_links) \
$(progs_static) \
libbtrfsutil/*.o libbtrfsutil/.deps/*.o.d
$(Q)$(RM) -fd -- .deps */.deps */*/.deps $(Q)$(RM) -fd -- .deps */.deps */*/.deps
@echo "Cleaning test targets"
$(Q)$(RM) -f -- \
array-test fsstress fsstum hash-speedtest hash-vectest ioctl-test \
json-formatter-test library-test library-test-static quick-test
@echo "Cleanin other generated files"
$(Q)$(RM) -f -- $(check_defs) \
*.gcno *.gcda *.gcov */*.gcno */*.gcda */*/.gcov
ifeq ($(PYTHON_BINDINGS),1) ifeq ($(PYTHON_BINDINGS),1)
@echo "Cleanin libbtrfs python generated files"
$(Q)cd libbtrfsutil/python; \ $(Q)cd libbtrfsutil/python; \
$(PYTHON) setup.py $(SETUP_PY_Q) clean -a $(PYTHON) setup.py $(SETUP_PY_Q) clean -a
endif endif
@ -907,9 +914,10 @@ clean-gen:
$(Q)$(RM) -rf -- libbtrfs/version.h config.status config.cache config.log \ $(Q)$(RM) -rf -- libbtrfs/version.h config.status config.cache config.log \
configure.lineno config.status.lineno Makefile.inc \ configure.lineno config.status.lineno Makefile.inc \
Documentation/Makefile tags TAGS \ Documentation/Makefile tags TAGS \
libbtrfsutil/libbtrfsutil.pc \
cscope.files cscope.out cscope.in.out cscope.po.out \ cscope.files cscope.out cscope.in.out cscope.po.out \
config.log include/config.h include/config.h.in~ aclocal.m4 \ config.log include/config.h include/config.h.in~ aclocal.m4 \
configure autom4te.cache/ configure configure~ autom4te.cache/
clean-dep: clean-dep:
@echo "Cleaning dependency files" @echo "Cleaning dependency files"