OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cpupowerutils: Rename: libcpufreq->libcpupower 

[linux@dominikbrodowski.net: fix .gitignore]
Signed-off-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Thomas Renninger 2011-04-21 17:50:25 +02:00 committed by Dominik Brodowski
parent af594f0ceb
commit 4c22337f86
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/power/cpupower/.gitignore vendored
View File

@ -1,7 +1,7 @@
.libs .libs
libcpufreq.so libcpupower.so
libcpufreq.so.0 libcpupower.so.0
libcpufreq.so.0.0.0 libcpupower.so.0.0.0
build/ccdv build/ccdv
cpufreq-info cpufreq-info
cpufreq-set cpufreq-set
@ -13,7 +13,6 @@ lib/proc.lo
lib/proc.o lib/proc.o
lib/sysfs.lo lib/sysfs.lo
lib/sysfs.o lib/sysfs.o
libcpufreq.la
po/cpupowerutils.pot po/cpupowerutils.pot
po/*.gmo po/*.gmo
utils/cpufreq-info.o utils/cpufreq-info.o

26
tools/power/cpupower/Makefile
View File

@ -167,20 +167,20 @@ endif
# the actual make rules # the actual make rules
all: libcpufreq cpupower $(COMPILE_NLS) $(COMPILE_BENCH) all: libcpupower cpupower $(COMPILE_NLS) $(COMPILE_BENCH)
lib/%.o: $(LIB_SRC) $(LIB_HEADERS) lib/%.o: $(LIB_SRC) $(LIB_HEADERS)
$(ECHO) " CC " $@ $(ECHO) " CC " $@
$(QUIET) $(CC) $(CFLAGS) -fPIC -o $@ -c lib/$*.c $(QUIET) $(CC) $(CFLAGS) -fPIC -o $@ -c lib/$*.c
libcpufreq.so.$(LIB_MAJ): $(LIB_OBJS) libcpupower.so.$(LIB_MAJ): $(LIB_OBJS)
$(ECHO) " LD " $@ $(ECHO) " LD " $@
$(QUIET) $(CC) -shared $(CFLAGS) $(LDFLAGS) -o $@ \ $(QUIET) $(CC) -shared $(CFLAGS) $(LDFLAGS) -o $@ \
-Wl,-soname,libcpufreq.so.$(LIB_MIN) $(LIB_OBJS) -Wl,-soname,libcpupower.so.$(LIB_MIN) $(LIB_OBJS)
@ln -sf $@ libcpufreq.so @ln -sf $@ libcpupower.so
@ln -sf $@ libcpufreq.so.$(LIB_MIN) @ln -sf $@ libcpupower.so.$(LIB_MIN)
libcpufreq: libcpufreq.so.$(LIB_MAJ) libcpupower: libcpupower.so.$(LIB_MAJ)
# Let all .o files depend on its .c file and all headers # Let all .o files depend on its .c file and all headers
# Might be worth to put this into utils/Makefile at some point of time # Might be worth to put this into utils/Makefile at some point of time
@ -190,9 +190,9 @@ $(UTIL_OBJS): $(UTIL_HEADERS)
$(ECHO) " CC " $@ $(ECHO) " CC " $@
$(QUIET) $(CC) $(CFLAGS) -I./lib -I ./utils -o $@ -c $*.c $(QUIET) $(CC) $(CFLAGS) -I./lib -I ./utils -o $@ -c $*.c
cpupower: $(UTIL_OBJS) libcpufreq.so.$(LIB_MAJ) cpupower: $(UTIL_OBJS) libcpupower.so.$(LIB_MAJ)
$(ECHO) " CC " $@ $(ECHO) " CC " $@
$(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) -lcpufreq -lrt -lpci -L. -o $@ $(UTIL_OBJS) $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) -lcpupower -lrt -lpci -L. -o $@ $(UTIL_OBJS)
$(QUIET) $(STRIPCMD) $@ $(QUIET) $(STRIPCMD) $@
po/$(PACKAGE).pot: $(UTIL_SRC) po/$(PACKAGE).pot: $(UTIL_SRC)
@ -221,7 +221,7 @@ update-po: po/$(PACKAGE).pot
fi; \ fi; \
done; done;
compile-bench: libcpufreq.so.$(LIB_MAJ) compile-bench: libcpupower.so.$(LIB_MAJ)
@V=$(V) confdir=$(confdir) $(MAKE) -C bench @V=$(V) confdir=$(confdir) $(MAKE) -C bench
clean: clean:
@ -230,14 +230,14 @@ clean:
-rm -f $(UTIL_BINS) -rm -f $(UTIL_BINS)
-rm -f $(IDLE_OBJS) -rm -f $(IDLE_OBJS)
-rm -f cpupower -rm -f cpupower
-rm -f libcpufreq.so* -rm -f libcpupower.so*
-rm -rf po/*.gmo po/*.pot -rm -rf po/*.gmo po/*.pot
$(MAKE) -C bench clean $(MAKE) -C bench clean
install-lib: install-lib:
$(INSTALL) -d $(DESTDIR)${libdir} $(INSTALL) -d $(DESTDIR)${libdir}
$(CP) libcpufreq.so* $(DESTDIR)${libdir}/ $(CP) libcpupower.so* $(DESTDIR)${libdir}/
$(INSTALL) -d $(DESTDIR)${includedir} $(INSTALL) -d $(DESTDIR)${includedir}
$(INSTALL_DATA) lib/cpufreq.h $(DESTDIR)${includedir}/cpufreq.h $(INSTALL_DATA) lib/cpufreq.h $(DESTDIR)${includedir}/cpufreq.h
@ -267,7 +267,7 @@ install-bench:
install: all install-lib install-tools install-man $(INSTALL_NLS) $(INSTALL_BENCH) install: all install-lib install-tools install-man $(INSTALL_NLS) $(INSTALL_BENCH)
uninstall: uninstall:
- rm -f $(DESTDIR)${libdir}/libcpufreq.* - rm -f $(DESTDIR)${libdir}/libcpupower.*
- rm -f $(DESTDIR)${includedir}/cpufreq.h - rm -f $(DESTDIR)${includedir}/cpufreq.h
- rm -f $(DESTDIR)${bindir}/utils/cpupower - rm -f $(DESTDIR)${bindir}/utils/cpupower
- rm -f $(DESTDIR)${mandir}/man1/cpufreq-set.1 - rm -f $(DESTDIR)${mandir}/man1/cpufreq-set.1
@ -276,4 +276,4 @@ uninstall:
rm -f $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/cpupowerutils.mo; \ rm -f $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/cpupowerutils.mo; \
done; done;
.PHONY: all utils libcpufreq update-po create-gmo install-lib install-tools install-man install-gmo install uninstall clean .PHONY: all utils libcpupower update-po create-gmo install-lib install-tools install-man install-gmo install uninstall clean

2
tools/power/cpupower/bench/Makefile
View File

@ -1,4 +1,4 @@
LIBS = -L../ -lm -lcpufreq LIBS = -L../ -lm -lcpupower
OBJS = main.o parse.o system.o benchmark.o OBJS = main.o parse.o system.o benchmark.o
CFLAGS += -D_GNU_SOURCE -I../lib -DDEFAULT_CONFIG_FILE=\"$(confdir)/cpufreq-bench.conf\" CFLAGS += -D_GNU_SOURCE -I../lib -DDEFAULT_CONFIG_FILE=\"$(confdir)/cpufreq-bench.conf\"