[Nice-commit] Nice/regtest/java Makefile,1.3,1.4

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

Update of /cvsroot/nice/Nice/regtest/java
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25456/regtest/java

Modified Files:
	Makefile 
Log Message:
Use inherited $(javac) if it exists, to prevent version mismatch problems
with the default javac command.


Index: Makefile
===================================================================
RCS file: /cvsroot/nice/Nice/regtest/java/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	29 Mar 2004 19:31:38 -0000	1.3
--- Makefile	13 Jan 2006 17:47:49 -0000	1.4
***************
*** 1,2 ****
--- 1,4 ----
+ javac = javac
+ 
  nicec = $(NICE_TOP)/bin/nicec -e --sourcepath "${NICE_TOP}"
  
***************
*** 7,18 ****
  
  B/BAj.class: A/An.class B/BAj.java
! 	javac -classpath "${NICE_TOP}" B/BAj.java
  
  B/BIj.class: A/In.class B/BIj.java
! 	javac -classpath "${NICE_TOP}" B/BIj.java
  
  J/J.class: J/J.java
! 	javac -classpath "${NICE_TOP}" J/J.java
  
  J/Other.class: J/Other.java
! 	javac -classpath "${NICE_TOP}" J/Other.java
--- 9,20 ----
  
  B/BAj.class: A/An.class B/BAj.java
! 	$(javac) -classpath "${NICE_TOP}" B/BAj.java
  
  B/BIj.class: A/In.class B/BIj.java
! 	$(javac) -classpath "${NICE_TOP}" B/BIj.java
  
  J/J.class: J/J.java
! 	$(javac) -classpath "${NICE_TOP}" J/J.java
  
  J/Other.class: J/Other.java
! 	$(javac) -classpath "${NICE_TOP}" J/Other.java