[Nice-commit] Nice Makefile,1.113,1.114

[<bo...@us...>]

Update of /cvsroot/nice/Nice
In directory sc8-pr-cvs1:/tmp/cvs-serv24158

Modified Files:
	Makefile 
Log Message:
Make the java binary a variable.


Index: Makefile
===================================================================
RCS file: /cvsroot/nice/Nice/Makefile,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** Makefile	8 Apr 2003 18:11:11 -0000	1.113
--- Makefile	15 Apr 2003 16:02:09 -0000	1.114
***************
*** 14,29 ****
  TOP=${PWD}
  
  javac = javac
- #javac = jikes-classpath
  
  JAVAC_FLAGS = -O -g
  
  JAVAC= ${javac} -classpath "${TOP}/classes:${TOP}/classes.old" -sourcepath "${TOP}/src:${TOP}/stdlib" -d "${TOP}/classes" $(JAVAC_FLAGS)
! JAVACC= CLASSPATH="${TOP}/external/JavaCC.zip:${CLASSPATH}" java COM.sun.labs.javacc.Main
  JAVADOC=javadoc
  
  NICEC_ARGS= --exclude-runtime 
! NICEC=CLASSPATH="${TOP}/classes" nicec ${NICEC_ARGS} -d "${TOP}/classes.old" --sourcepath="${TOP}/stdlib.old:${TOP}/stdlib:${TOP}/src.old:${TOP}/src" --classpath="${TOP}/classes"
! NICEC1=${TOP}/bin/nicec ${NICEC_ARGS} -d "${TOP}/classes" --sourcepath="${TOP}/stdlib:${TOP}/src" 
  
  
--- 14,29 ----
  TOP=${PWD}
  
+ java = java
  javac = javac
  
  JAVAC_FLAGS = -O -g
  
  JAVAC= ${javac} -classpath "${TOP}/classes:${TOP}/classes.old" -sourcepath "${TOP}/src:${TOP}/stdlib" -d "${TOP}/classes" $(JAVAC_FLAGS)
! JAVACC= CLASSPATH="${TOP}/external/JavaCC.zip:${CLASSPATH}" ${java} COM.sun.labs.javacc.Main
  JAVADOC=javadoc
  
  NICEC_ARGS= --exclude-runtime 
! NICEC=CLASSPATH="${TOP}/classes" JAVA="${java}" nicec ${NICEC_ARGS} -d "${TOP}/classes.old" --sourcepath="${TOP}/stdlib.old:${TOP}/stdlib:${TOP}/src.old:${TOP}/src" --classpath="${TOP}/classes"
! NICEC1=JAVA="${java}" ${TOP}/bin/nicec ${NICEC_ARGS} -d "${TOP}/classes" --sourcepath="${TOP}/stdlib:${TOP}/src" 
  
  
***************
*** 74,81 ****
  
  test:
! 	cd regtest; /usr/bin/time ./regtest
  
  check:
! 	/usr/bin/time java -Dassertions=true -classpath "classes" nice.tools.testsuite.TestNice testsuite
  
  .PHONY: coverage
--- 74,81 ----
  
  test:
! 	cd regtest; JAVA="${java}" /usr/bin/time ./regtest
  
  check:
! 	/usr/bin/time ${java} -Dassertions=true -classpath "classes" nice.tools.testsuite.TestNice testsuite
  
  .PHONY: coverage