From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754703AbbE1UUn (ORCPT ); Thu, 28 May 2015 16:20:43 -0400 Received: from mga03.intel.com ([134.134.136.65]:43124 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754601AbbE1UUY (ORCPT ); Thu, 28 May 2015 16:20:24 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,513,1427785200"; d="scan'208";a="578417348" From: Andi Kleen To: sukadev@linux.vnet.ibm.com Cc: jolsa@redhat.com, mingo@kernel.org, acme@kernel.org, linux-kernel@vger.kernel.org, Andi Kleen Subject: [PATCH 3/3] perf, tools: Fix jevents dependencies Date: Thu, 28 May 2015 13:20:02 -0700 Message-Id: <1432844402-11649-4-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1432844402-11649-1-git-send-email-andi@firstfloor.org> References: <1432844402-11649-1-git-send-email-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Change it to use wildcard. Also add a dependency for the jevents binary itself and for the mapfile. Signed-off-by: Andi Kleen --- tools/perf/pmu-events/Build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build index 7e0c85c..e900ecc 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') # # 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: $(wildcard pmu-events/arch/$(ARCH)/*.json) \ + $(wildcard pmu-events/arch/$(ARCH)/*/*.json) \ + pmu-events/arch/$(ARCH)/mapfile.csv \ + $(JEVENTS) $(Q)$(call echo-cmd,gen)$(JEVENTS) $(ARCH) pmu-events/arch $(OUTPUT)pmu-events/pmu-events.c -- 2.1.0