From patchwork Wed Aug 15 11:29:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 10757 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 3C25C23E00 for ; Wed, 15 Aug 2012 11:29:32 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id F09B9A1886E for ; Wed, 15 Aug 2012 11:29:31 +0000 (UTC) Received: by ggmi2 with SMTP id i2so1743994ggm.11 for ; Wed, 15 Aug 2012 04:29:31 -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=3V1ADX40ODRryKrWprRUutjozZ7sXUQtIztdlG6n3lY=; b=DkSBEvSRsJetCTGfcYdCwd5LMF2lsQp1PTfqEobA02ojRKsyo8sYs8oJ2lWtJz7z6v DlhcW0toPoul2Xc3r1jUevBOoJCHgAth+gmM0nYwkKy5eRvkq6RTKgcbPr9nakQ3Euzy IBXY4PfQnA+GHt/L0qcC73DH+TLe24FFp/1f9tpkTyUYaqF5sp8/4zhYNR5mIXqyUi9N 0rkbzCkuDBAgENupW4dMY6jFSBeo4CeWKscralYQBkshVNp3CwbQRezTJTeEyWYdsv7A b/VNwqu4JkZzfpNAZSnY1Z1bLlthgEmwsLXWqy7Fazbw7SglfJ/QZwRrNWUuEC7oplC4 FS2w== Received: by 10.50.6.229 with SMTP id e5mr18197009iga.9.1345030171218; Wed, 15 Aug 2012 04:29:31 -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.184.200 with SMTP id ew8csp62893igc; Wed, 15 Aug 2012 04:29:30 -0700 (PDT) Received: by 10.14.212.72 with SMTP id x48mr23711419eeo.40.1345030169708; Wed, 15 Aug 2012 04:29:29 -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 o42si748027eep.35.2012.08.15.04.29.28 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 15 Aug 2012 04:29:29 -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 1T1bmu-0000eh-V4; Wed, 15 Aug 2012 12:29:24 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, qemu-trivial@nongnu.org, Stefan Hajnoczi , Eric Blake , Stefan Weil Subject: [PATCH v2] Makefile: Avoid explicit list of directories in clean target Date: Wed, 15 Aug 2012 12:29:24 +0100 Message-Id: <1345030164-2496-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQkvhw5z79uk+j8F2CifwTXkrNrk4NLuxpkDuWx+lZIA0UpM0VaEVqhJlnzUXmm+mFErEwE7 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 Reviewed-by: Eric Blake --- Changes v1->v2: use portable 'find -exec' rather than unsafe 'find | xargs' or unportable 'find -print0 | xargs -0'. Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index d736ea5..2964d5c 100644 --- a/Makefile +++ b/Makefile @@ -214,13 +214,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]' -exec 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 libuser/qom/*.o libuser/qom/*.d - rm -f hw/usb/*.o hw/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