diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | TOOLS/Makefile | 2 | ||||
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | cpuinfo.c (renamed from TOOLS/cpuinfo.c) | 0 |
4 files changed, 5 insertions, 5 deletions
@@ -311,7 +311,7 @@ dep depend: help_mp.h version.h codecs.conf.h clean: -rm -f *.o *.a *~ -rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \ - codecs2html$(EXESUF) codec-cfg-test$(EXESUF) \ + codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo(EXESUF) \ codecs.conf.h help_mp.h version.h @for a in $(PARTS); do $(MAKE) -C $$a clean; done diff --git a/TOOLS/Makefile b/TOOLS/Makefile index c7c61fb104..dc5070ba2e 100644 --- a/TOOLS/Makefile +++ b/TOOLS/Makefile @@ -71,5 +71,5 @@ netstream: netstream.o $(NETSTREAM_DEPS) clean distclean: rm -f *.o *~ $(OBJS) rm -f fastmem-* fastmem2-* fastmemcpybench netstream - rm -f cpuinfo$(EXESUF) bmovl-test$(EXESUF) vfw2menc$(EXESUF) + rm -f bmovl-test$(EXESUF) vfw2menc$(EXESUF) rm -f $(REAL_TARGETS) @@ -1485,9 +1485,9 @@ elif aix; then _cpuinfo="lsattr -E -l proc0 -a type" elif x86; then # all other OSes try to extract CPU information from a small helper - # program TOOLS/cpuinfo instead - $_cc -o TOOLS/cpuinfo TOOLS/cpuinfo.c - _cpuinfo="TOOLS/cpuinfo" + # program cpuinfo instead + $_cc -o cpuinfo cpuinfo.c + _cpuinfo="./cpuinfo" fi if x86 ; then diff --git a/TOOLS/cpuinfo.c b/cpuinfo.c index 50517696f9..50517696f9 100644 --- a/TOOLS/cpuinfo.c +++ b/cpuinfo.c |