[Nice-commit] Nice Makefile,1.133,1.134

[<bo...@pr...>]

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

Modified Files:
	Makefile 
Log Message:
Allow the jar binary to be overriden.


Index: Makefile
===================================================================
RCS file: /cvsroot/nice/Nice/Makefile,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** Makefile	15 Dec 2003 20:13:57 -0000	1.133
--- Makefile	25 Jan 2004 02:49:23 -0000	1.134
***************
*** 26,31 ****
  TOP=${PWD}
  
! java = java
  javac = javac
  
  JAVAC_FLAGS = -O -g
--- 26,32 ----
  TOP=${PWD}
  
! java  = java
  javac = javac
+ jar   = jar
  
  JAVAC_FLAGS = -O -g
***************
*** 68,79 ****
  	mkdir -p share/java
  	cp src/nice/tools/compiler/console.jar share/java/nice.jar
! 	jar umf src/nice/tools/compiler/Manifest share/java/nice.jar -C classes nice -C classes mlsub -C classes bossa -C classes gnu -C classes.old bossa -C classes.old mlsub -C classes.old nice
! 	if [ -r classes/lang/package.nicei ]; then cd classes; jar uf ../share/java/nice.jar nice/*/package.nicei; fi
  
  archive archive2 archive3 share/java/nice.jar: src/nice/tools/compiler/console.jar
  	mkdir -p share/java
  	cp src/nice/tools/compiler/console.jar share/java/nice.jar
! 	jar umf src/nice/tools/compiler/Manifest share/java/nice.jar -C classes nice -C classes mlsub -C classes bossa -C classes gnu
! 	if [ -r classes/lang/package.nicei ]; then cd classes; jar uf ../share/java/nice.jar nice/*/package.nicei; fi
  
  
--- 69,80 ----
  	mkdir -p share/java
  	cp src/nice/tools/compiler/console.jar share/java/nice.jar
! 	$(jar) umf src/nice/tools/compiler/Manifest share/java/nice.jar -C classes nice -C classes mlsub -C classes bossa -C classes gnu -C classes.old bossa -C classes.old mlsub -C classes.old nice
! 	if [ -r classes/lang/package.nicei ]; then cd classes; $(jar) uf ../share/java/nice.jar nice/*/package.nicei; fi
  
  archive archive2 archive3 share/java/nice.jar: src/nice/tools/compiler/console.jar
  	mkdir -p share/java
  	cp src/nice/tools/compiler/console.jar share/java/nice.jar
! 	$(jar) umf src/nice/tools/compiler/Manifest share/java/nice.jar -C classes nice -C classes mlsub -C classes bossa -C classes gnu
! 	if [ -r classes/lang/package.nicei ]; then cd classes; $(jar) uf ../share/java/nice.jar nice/*/package.nicei; fi
  
  
***************
*** 121,130 ****
  gcj:
  	cp src/nice/tools/compiler/console.jar $(GCJTEMP)
! 	jar umf src/mainClass $(GCJTEMP) -C classes nice/doc -C classes nice/getopt -C classes nice/lang -C classes nice/tools/ast -C classes nice/tools/code -C classes nice/tools/compiler -C classes nice/tools/util -C classes mlsub -C classes bossa -C classes gnu
  	$(GCJ) --main=nice.tools.compiler.fun -o bin/nicec.bin $(GCJTEMP)
  
  gcj-testsuite:
  	cp src/nice/tools/compiler/console.jar $(GCJTEMP)
! 	jar umf src/mainClass $(GCJTEMP) -C classes nice/doc -C classes nice/getopt -C classes nice/lang -C classes nice/tools/ast -C classes nice/tools/code -C classes nice/tools/compiler -C classes nice/tools/util -C classes nice/tools/testsuite -C classes mlsub -C classes bossa -C classes gnu
  	$(GCJ) -g --main=nice.tools.testsuite.TestNice -o bin/testsuite.bin $(GCJTEMP)
  
--- 122,131 ----
  gcj:
  	cp src/nice/tools/compiler/console.jar $(GCJTEMP)
! 	$(jar) umf src/mainClass $(GCJTEMP) -C classes nice/doc -C classes nice/getopt -C classes nice/lang -C classes nice/tools/ast -C classes nice/tools/code -C classes nice/tools/compiler -C classes nice/tools/util -C classes mlsub -C classes bossa -C classes gnu
  	$(GCJ) --main=nice.tools.compiler.fun -o bin/nicec.bin $(GCJTEMP)
  
  gcj-testsuite:
  	cp src/nice/tools/compiler/console.jar $(GCJTEMP)
! 	$(jar) umf src/mainClass $(GCJTEMP) -C classes nice/doc -C classes nice/getopt -C classes nice/lang -C classes nice/tools/ast -C classes nice/tools/code -C classes nice/tools/compiler -C classes nice/tools/util -C classes nice/tools/testsuite -C classes mlsub -C classes bossa -C classes gnu
  	$(GCJ) -g --main=nice.tools.testsuite.TestNice -o bin/testsuite.bin $(GCJTEMP)