[Mplayer-cvslog] CVS: main version.sh,1.6,1.7 Makefile,1.117,1.118

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv14099

Modified Files:
	version.sh Makefile 
Log Message:
CC version check done by Makefile to allow overriding CC from envvar

Index: version.sh
===================================================================
RCS file: /cvsroot/mplayer/main/version.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- version.sh	3 Dec 2001 22:28:05 -0000	1.6
+++ version.sh	9 Dec 2001 01:24:01 -0000	1.7
@@ -5,7 +5,5 @@
 	# probably no gnu date installed(?), use current date
 	last_cvs_update=`date +%y%m%d-%H:%M`
 fi
-cc=`cat config.mak |grep CC | cut -d '=' -f 2`
-cc_version=`${cc} --version`
 
-echo "#define VERSION \"CVS-${last_cvs_update}${cc}-${cc_version} \"" >version.h
+echo "#define VERSION \"CVS-${last_cvs_update}-$1 \"" >version.h

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- Makefile	6 Dec 2001 22:23:57 -0000	1.117
+++ Makefile	9 Dec 2001 01:24:01 -0000	1.118
@@ -218,7 +218,7 @@
 dep:	depend
 
 depend:
-	./version.sh
+	./version.sh `$(CC) --version`
 	$(CC) -MM $(CFLAGS) mplayer.c mencoder.c $(SRCS_MPLAYER) $(SRCS_MENCODER) 1>.depend
 	@for a in $(PARTS); do $(MAKE) -C $$a dep; done
 
@@ -233,7 +233,7 @@
 
 # rebuild at every config.h/config.mak change:
 version.h: config.h config.mak Makefile
-	./version.sh
+	./version.sh `$(CC) --version`
 ifeq ($(wildcard .developer),)
 	$(MAKE) distclean
 endif