From patchwork Fri Apr 4 14:50:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 3938991 X-Patchwork-Delegate: dave@jikos.cz Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 337529F334 for ; Fri, 4 Apr 2014 14:50:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 70AAD20383 for ; Fri, 4 Apr 2014 14:50:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 780FE20382 for ; Fri, 4 Apr 2014 14:50:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753364AbaDDOuN (ORCPT ); Fri, 4 Apr 2014 10:50:13 -0400 Received: from cantor2.suse.de ([195.135.220.15]:34370 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752780AbaDDOuK (ORCPT ); Fri, 4 Apr 2014 10:50:10 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 58266AB43; Fri, 4 Apr 2014 14:50:09 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id 17775DA9FD; Fri, 4 Apr 2014 16:50:09 +0200 (CEST) From: David Sterba To: linux-btrfs@vger.kernel.org Cc: clm@fb.com, David Sterba Subject: [PATCH] btrfs-progs: add separate make target to clean docs Date: Fri, 4 Apr 2014 16:50:05 +0200 Message-Id: <1396623005-16508-1-git-send-email-dsterba@suse.cz> X-Mailer: git-send-email 1.9.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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