[MPlayer-cvslog] r22950 - in trunk: Makefile TOOLS/Makefile TOOLS/cpuinfo.c configure cpuinfo.c

[diego]

Author: diego
Date: Mon Apr  9 13:30:26 2007
New Revision: 22950

Added:
   trunk/cpuinfo.c
      - copied unchanged from r22945, /trunk/TOOLS/cpuinfo.c
Removed:
   trunk/TOOLS/cpuinfo.c
Modified:
   trunk/Makefile
   trunk/TOOLS/Makefile
   trunk/configure

Log:
Move TOOLS/cpuinfo.c into the root directory.


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Mon Apr  9 13:30:26 2007
@@ -311,7 +311,7 @@ dep depend: help_mp.h version.h codecs.c
 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
 

Modified: trunk/TOOLS/Makefile
==============================================================================
--- trunk/TOOLS/Makefile	(original)
+++ trunk/TOOLS/Makefile	Mon Apr  9 13:30:26 2007
@@ -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)

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Mon Apr  9 13:30:26 2007
@@ -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