From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754589AbbE1U56 (ORCPT ); Thu, 28 May 2015 16:57:58 -0400 Received: from e18.ny.us.ibm.com ([129.33.205.208]:50866 "EHLO e18.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753826AbbE1U5y (ORCPT ); Thu, 28 May 2015 16:57:54 -0400 Date: Thu, 28 May 2015 13:57:16 -0700 From: Sukadev Bhattiprolu To: Andi Kleen Cc: jolsa@redhat.com, mingo@kernel.org, acme@kernel.org, linux-kernel@vger.kernel.org, Andi Kleen Subject: Re: [PATCH 3/3] perf, tools: Fix jevents dependencies Message-ID: <20150528205716.GA11221@us.ibm.com> References: <1432844402-11649-1-git-send-email-andi@firstfloor.org> <1432844402-11649-4-git-send-email-andi@firstfloor.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1432844402-11649-4-git-send-email-andi@firstfloor.org> X-Operating-System: Linux 2.0.32 on an i486 User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15052820-0045-0000-0000-0000004B93B2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Andi Kleen [andi@firstfloor.org] wrote: | From: Andi Kleen | | The "find" based dependencies for the JSON files didn't work me. I | didn't get a rebuild when the JSON files changed. Hmm, it works for me every time. I like the 'find' better because it is more compact and allows mulitple levels. | Change it to | use wildcard. Also add a dependency for the jevents binary itself | and for the mapfile. I was trying this to address Jiri's comment about being silent if some architectures don't have JSON files (and based on your comments above, added the depedency for mapfile and jevents) diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build index 7e0c85c..45b05a7 100644 --- a/tools/perf/pmu-events/Build +++ b/tools/perf/pmu-events/Build @@ -1,10 +1,12 @@ jevents-y += json.o jsmn.o jevents.o pmu-events-y += pmu-events.o -JSON = $(shell find pmu-events/arch/$(ARCH) -name '*.json') - +EVDIR = pmu-events/arch/$(ARCH) +JSON = $(shell [ -d $(EVDIR) ] && \ + find $(EVDIR) -name '*.json' -o -name 'mapfile*') +# # # Locate/process JSON files in pmu-events/arch/ # directory and create tables in pmu-events.c. # -$(OUTPUT)pmu-events/pmu-events.c: $(JSON) +$(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JEVENTS) $(Q)$(call echo-cmd,gen)$(JEVENTS) $(ARCH) pmu-events/arch $(OUTPUT)pmu-events/pmu-events.c