linux-kernel - [PATCH 3/3] perf, tools: Fix jevents dependencies

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1432844402-11649-4-git-send-email-andi@firstfloor.org>
Date:	Thu, 28 May 2015 13:20:02 -0700
From:	Andi Kleen <andi@...stfloor.org>
To:	sukadev@...ux.vnet.ibm.com
Cc:	jolsa@...hat.com, mingo@...nel.org, acme@...nel.org,
	linux-kernel@...r.kernel.org, Andi Kleen <ak@...ux.intel.com>
Subject: [PATCH 3/3] perf, tools: Fix jevents dependencies

From: Andi Kleen <ak@...ux.intel.com>

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 <ak@...ux.intel.com>
---
 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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/