From patchwork Tue Jul 31 13:01:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 10394 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id AD78224039 for ; Tue, 31 Jul 2012 13:01:46 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 60F5DA18896 for ; Tue, 31 Jul 2012 13:01:46 +0000 (UTC) Received: by yenq6 with SMTP id q6so5875244yen.11 for ; Tue, 31 Jul 2012 06:01:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=hftBD103QL9NDCDQWIaEo5cjwGqLs59lEoxQtn16qBU=; b=mIPe+rjBhFtVB8BhKhW6yPtULIEj7FyBD+I3YyfbWvT3YLYzsualZt+y4EC7GjeSlw iqvfxtxu8DB2JXgxZnryrVcFAKNNq/qsbL0XvGG6Y7JvwnvIYBa01runduOdKf2nXI0r +LxUfwnNzDqmwiHou0NaHi+twpqoNIfsPuLbWgbvZ/cs3Bp4E03ZNUIOI79N8NZX7YWE cujwMxzeIeblKR42Aa2I9tzGyZsmXfoS+ptf0LBR9nCgFhOnQEkZDNnzF09I4VHvJeOb ctWri9UauS+grR7mQgcYQwiTsmG8/KE/7i12BMKf/GCdtKqwV/1U2MeBoZIU65/jo5dD cHhQ== Received: by 10.50.47.161 with SMTP id e1mr1928744ign.11.1343739703277; Tue, 31 Jul 2012 06:01:43 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.87.40 with SMTP id u8csp141552igz; Tue, 31 Jul 2012 06:01:42 -0700 (PDT) Received: by 10.14.175.5 with SMTP id y5mr16242780eel.40.1343739701133; Tue, 31 Jul 2012 06:01:41 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id u5si24022eeo.29.2012.07.31.06.01.39 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 31 Jul 2012 06:01:41 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1SwC4t-00021c-J7; Tue, 31 Jul 2012 14:01:35 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, qemu-trivial@nongnu.org, Stefan Weil , Stefan Hajnoczi , Jan Kiszka Subject: [PATCH] Makefile: Avoid explicit list of directories in clean target Date: Tue, 31 Jul 2012 14:01:35 +0100 Message-Id: <1343739695-7757-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQmwE7wXMmjYbW8C/BGK7o7lnZOSuine/Gx5lzlkPDHFWsE77xTHIYkDMBVRFPXzNmp5TTjV Avoid having an explicit list of directories in the 'clean' target by using 'find' to remove all .o and .d files instead. Signed-off-by: Peter Maydell --- I figured that (unlike Makefile.target) we should probably take the xargs route here since otherwise the rm command line is huge... There's also an argument that there's not much point having a clean target in Makefile.target when this one blows away most of it anyway. Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 621cb86..9f7eaa8 100644 --- a/Makefile +++ b/Makefile @@ -212,13 +212,10 @@ clean: # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h rm -f qemu-options.def - rm -f *.o *.d *.a *.lo $(TOOLS) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~ + find . -name '*.[od]' | xargs rm -f + rm -f *.a *.lo $(TOOLS) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~ rm -Rf .libs - rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d fsdev/*.o fsdev/*.d ui/*.o ui/*.d qapi/*.o qapi/*.d qga/*.o qga/*.d - rm -f qom/*.o qom/*.d - rm -f usb/*.o usb/*.d hw/*.o hw/*.d rm -f qemu-img-cmds.h - rm -f trace/*.o trace/*.d rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp @# May not be present in GENERATED_HEADERS rm -f trace-dtrace.h trace-dtrace.h-timestamp