Regenerating the asciidoc takes much longer now and makes quick build tests long. There's separate clean-doc target for that and clean-all that cleans docs and sources. Signed-off-by: David Sterba <dsterba@xxxxxxx> --- This applies on top of the new asciidoc patches and makes frequent build tests more friendly Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 70eaf5765dd8..f2f2579ed9c6 100644 --- a/Makefile +++ b/Makefile @@ -56,9 +56,9 @@ btrfs_convert_libs = -lext2fs -lcom_err btrfs_image_libs = -lpthread btrfs_fragment_libs = -lgd -lpng -ljpeg -lfreetype -SUBDIRS = Documentation -BUILDDIRS = $(patsubst %,build-%,$(SUBDIRS)) -INSTALLDIRS = $(patsubst %,install-%,$(SUBDIRS)) +SUBDIRS = +BUILDDIRS = $(patsubst %,build-%,$(SUBDIRS)) Documentation +INSTALLDIRS = $(patsubst %,install-%,$(SUBDIRS)) Documentation CLEANDIRS = $(patsubst %,clean-%,$(SUBDIRS)) .PHONY: $(SUBDIRS) @@ -120,7 +120,7 @@ endif @echo " [CC] $@" $(Q)$(CC) $(AM_CFLAGS) $(STATIC_CFLAGS) -c $< -o $@ -all: $(progs) manpages $(BUILDDIRS) +all: $(progs) $(BUILDDIRS) $(SUBDIRS): $(BUILDDIRS) $(BUILDDIRS): @echo "Making all in $(patsubst build-%,%,$@)" @@ -223,6 +223,8 @@ send-test: $(objects) $(libs) send-test.o manpages: $(Q)$(MAKE) $(MAKEOPTS) -C Documentation +clean-all: clean-doc clean + clean: $(CLEANDIRS) @echo "Cleaning" $(Q)rm -f $(progs) cscope.out *.o *.o.d btrfs-convert btrfs-image btrfs-select-super \ @@ -231,6 +233,10 @@ clean: $(CLEANDIRS) version.h $(check_defs) \ $(libs) $(lib_links) +clean-doc: + @echo "Cleaning Documentation" + $(Q)$(MAKE) $(MAKEOPTS) -C Documentation clean + $(CLEANDIRS): @echo "Cleaning $(patsubst clean-%,%,$@)" $(Q)$(MAKE) $(MAKEOPTS) -C $(patsubst clean-%,%,$@) clean -- 1.9.0 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
