cpupower tools: Remove brace expansion from clean target

The clean targets from the cpupower tools' Makefiles use brace expansion to
remove some generated files. However, the default shells on many systems do
not support this feature resulting in some generated files not being removed
by clean.

Signed-off-by: Palmer Cox <p@lmercox.com>
Signed-off-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile
index cf397bd26d0c64bdb51f636987d62f7a3bc2c381..d875a74a3bdf874def9f54780b00f0ecd5528e56 100644 (file)
--- a/tools/power/cpupower/Makefile
+++ b/tools/power/cpupower/Makefile
@@ -253,7 +253,8 @@ clean:
         | xargs rm -f
        -rm -f $(OUTPUT)cpupower
        -rm -f $(OUTPUT)libcpupower.so*
-       -rm -rf $(OUTPUT)po/*.{gmo,pot}
+       -rm -rf $(OUTPUT)po/*.gmo
+       -rm -rf $(OUTPUT)po/*.pot
        $(MAKE) -C bench O=$(OUTPUT) clean
 
 

diff --git a/tools/power/cpupower/debug/i386/Makefile b/tools/power/cpupower/debug/i386/Makefile
index 3ba158f0e2871dee52cd7b2820706b0eca68eb9e..c05cc0ac80c745118c498ae050fa10f7b4f6a902 100644 (file)
--- a/tools/power/cpupower/debug/i386/Makefile
+++ b/tools/power/cpupower/debug/i386/Makefile
@@ -26,7 +26,10 @@ $(OUTPUT)powernow-k8-decode: powernow-k8-decode.c
 all: $(OUTPUT)centrino-decode $(OUTPUT)dump_psb $(OUTPUT)intel_gsic $(OUTPUT)powernow-k8-decode
 
 clean:
-       rm -rf $(OUTPUT){centrino-decode,dump_psb,intel_gsic,powernow-k8-decode}
+       rm -rf $(OUTPUT)centrino-decode
+       rm -rf $(OUTPUT)dump_psb
+       rm -rf $(OUTPUT)intel_gsic
+       rm -rf $(OUTPUT)powernow-k8-decode
 
 install:
        $(INSTALL) -d $(DESTDIR)${bindir}