diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-03-13 16:43:08 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-03-13 16:43:08 -0400 |
| commit | b176023392360f28c0c8964a10effbc9a1f36c04 (patch) | |
| tree | b9e0650f3c0053f2c8f85c81be5c05adeeb441e5 /tools | |
| parent | fcf0789a96777d79d20290e08bf43943a5619387 (diff) | |
| parent | b8ea351b0e154c9dc28609db58eddc6c2934c954 (diff) | |
Merge branch 'pm-tools'
* pm-tools:
Revert "cpupower Makefile change to help run the tool without 'make install'"
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/power/cpupower/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile index 3ed7c0476d48..2e2ba2efa0d9 100644 --- a/tools/power/cpupower/Makefile +++ b/tools/power/cpupower/Makefile | |||
| @@ -209,7 +209,7 @@ $(OUTPUT)%.o: %.c | |||
| 209 | 209 | ||
| 210 | $(OUTPUT)cpupower: $(UTIL_OBJS) $(OUTPUT)libcpupower.so.$(LIB_MAJ) | 210 | $(OUTPUT)cpupower: $(UTIL_OBJS) $(OUTPUT)libcpupower.so.$(LIB_MAJ) |
| 211 | $(ECHO) " CC " $@ | 211 | $(ECHO) " CC " $@ |
| 212 | $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) $(UTIL_OBJS) -lcpupower -Wl,-rpath=./ -lrt -lpci -L$(OUTPUT) -o $@ | 212 | $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) $(UTIL_OBJS) -lcpupower -lrt -lpci -L$(OUTPUT) -o $@ |
| 213 | $(QUIET) $(STRIPCMD) $@ | 213 | $(QUIET) $(STRIPCMD) $@ |
| 214 | 214 | ||
| 215 | $(OUTPUT)po/$(PACKAGE).pot: $(UTIL_SRC) | 215 | $(OUTPUT)po/$(PACKAGE).pot: $(UTIL_SRC) |