From 91c3390c7ff54ffb29466af3ade9cdba493b0eba Mon Sep 17 00:00:00 2001
From: Franck Bui-Huu <fbuihuu@gmail.com>
Date: Tue, 7 Feb 2012 17:15:56 +0100
Subject: [PATCH] --- yaml --- r: 297566 b: refs/heads/master c:
 7490ca1ea5af18bd0ceb3b96ddb2f10b09e08b5d h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../tools/power/cpupower/debug/i386/Makefile  | 26 ++++++++++++-------
 .../power/cpupower/debug/x86_64/Makefile      | 14 +++++++---
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 112f3f34a7bd..74a3c4d50baa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62d5a67d65d69d1c8ba6d2638193bc2864c14fdf
+refs/heads/master: 7490ca1ea5af18bd0ceb3b96ddb2f10b09e08b5d
diff --git a/trunk/tools/power/cpupower/debug/i386/Makefile b/trunk/tools/power/cpupower/debug/i386/Makefile
index d08cc1ead9bc..626478b8a554 100644
--- a/trunk/tools/power/cpupower/debug/i386/Makefile
+++ b/trunk/tools/power/cpupower/debug/i386/Makefile
@@ -1,20 +1,26 @@
+OUTPUT=./
+ifeq ("$(origin O)", "command line")
+	OUTPUT := $(O)/
+endif
+
+
 default: all
 
-centrino-decode: centrino-decode.c
-	$(CC) $(CFLAGS) -o centrino-decode centrino-decode.c
+$(OUTPUT)centrino-decode: centrino-decode.c
+	$(CC) $(CFLAGS) -o $@ centrino-decode.c
 
-dump_psb: dump_psb.c
-	$(CC) $(CFLAGS) -o dump_psb dump_psb.c
+$(OUTPUT)dump_psb: dump_psb.c
+	$(CC) $(CFLAGS) -o $@ dump_psb.c
 
-intel_gsic: intel_gsic.c
-	$(CC) $(CFLAGS) -o intel_gsic -llrmi intel_gsic.c
+$(OUTPUT)intel_gsic: intel_gsic.c
+	$(CC) $(CFLAGS) -o $@ -llrmi intel_gsic.c
 
-powernow-k8-decode: powernow-k8-decode.c
-	$(CC) $(CFLAGS) -o powernow-k8-decode powernow-k8-decode.c
+$(OUTPUT)powernow-k8-decode: powernow-k8-decode.c
+	$(CC) $(CFLAGS) -o $@ powernow-k8-decode.c
 
-all: centrino-decode dump_psb intel_gsic powernow-k8-decode
+all: $(OUTPUT)centrino-decode $(OUTPUT)dump_psb $(OUTPUT)intel_gsic $(OUTPUT)powernow-k8-decode
 
 clean:
-	rm -rf centrino-decode dump_psb intel_gsic powernow-k8-decode
+	rm -rf $(OUTPUT){centrino-decode,dump_psb,intel_gsic,powernow-k8-decode}
 
 .PHONY: all default clean
diff --git a/trunk/tools/power/cpupower/debug/x86_64/Makefile b/trunk/tools/power/cpupower/debug/x86_64/Makefile
index 3326217dd311..8e26d67525cd 100644
--- a/trunk/tools/power/cpupower/debug/x86_64/Makefile
+++ b/trunk/tools/power/cpupower/debug/x86_64/Makefile
@@ -1,14 +1,20 @@
+OUTPUT=./
+ifeq ("$(origin O)", "command line")
+	OUTPUT := $(O)/
+endif
+
+
 default: all
 
-centrino-decode: ../i386/centrino-decode.c
+$(OUTPUT)centrino-decode: ../i386/centrino-decode.c
 	$(CC) $(CFLAGS) -o $@ $<
 
-powernow-k8-decode: ../i386/powernow-k8-decode.c
+$(OUTPUT)powernow-k8-decode: ../i386/powernow-k8-decode.c
 	$(CC) $(CFLAGS) -o $@ $<
 
-all: centrino-decode powernow-k8-decode
+all: $(OUTPUT)centrino-decode $(OUTPUT)powernow-k8-decode
 
 clean:
-	rm -rf centrino-decode powernow-k8-decode
+	rm -rf $(OUTPUT)centrino-decode $(OUTPUT)powernow-k8-decode
 
 .PHONY: all default clean