浏览代码

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>
Palmer Cox 12 年之前
父节点
当前提交
8c00bdfbc7
共有 2 个文件被更改,包括 6 次插入2 次删除
  1. 2 1
      tools/power/cpupower/Makefile
  2. 4 1
      tools/power/cpupower/debug/i386/Makefile

+ 2 - 1
tools/power/cpupower/Makefile

@@ -253,7 +253,8 @@ clean:
 	 | xargs rm -f
 	 | xargs rm -f
 	-rm -f $(OUTPUT)cpupower
 	-rm -f $(OUTPUT)cpupower
 	-rm -f $(OUTPUT)libcpupower.so*
 	-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
 	$(MAKE) -C bench O=$(OUTPUT) clean
 
 
 
 

+ 4 - 1
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
 all: $(OUTPUT)centrino-decode $(OUTPUT)dump_psb $(OUTPUT)intel_gsic $(OUTPUT)powernow-k8-decode
 
 
 clean:
 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:
 	$(INSTALL) -d $(DESTDIR)${bindir}
 	$(INSTALL) -d $(DESTDIR)${bindir}