[kaffe] CVS kaffe (dalibor): Fixed build of gjdoc.jar when no zip available

[Kaffe CVS]

PatchSet 4704 
Date: 2004/04/27 19:15:11
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Fixed build of gjdoc.jar when no zip available

2004-04-27  Dalibor Topic  <robilad at kaffe.org>

        * tools/gjdoc/javalib/Makefile.am:
        Fix build when zip is not available.

        * tools/gjdoc/javalib/Makefile.in:
        Regenerated.

        Reported by: Guilhem Lavaux <guilhem at kaffe.org>

Members: 
	ChangeLog:1.2280->1.2281 
	tools/gjdoc/javalib/Makefile.am:1.1->1.2 
	tools/gjdoc/javalib/Makefile.in:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2280 kaffe/ChangeLog:1.2281
--- kaffe/ChangeLog:1.2280	Tue Apr 27 18:25:15 2004
+++ kaffe/ChangeLog	Tue Apr 27 19:15:11 2004
@@ -10,6 +10,16 @@
 
 2004-04-27  Dalibor Topic  <robilad at kaffe.org>
 
+	* tools/gjdoc/javalib/Makefile.am:
+	Fix build when zip is not available.
+
+	* tools/gjdoc/javalib/Makefile.in:
+	Regenerated.
+
+	Reported by: Guilhem Lavaux <guilhem at kaffe.org>
+
+2004-04-27  Dalibor Topic  <robilad at kaffe.org>
+
 	* kaffe/kaffevm/file.c:
 	New file.
 
Index: kaffe/tools/gjdoc/javalib/Makefile.am
diff -u kaffe/tools/gjdoc/javalib/Makefile.am:1.1 kaffe/tools/gjdoc/javalib/Makefile.am:1.2
--- kaffe/tools/gjdoc/javalib/Makefile.am:1.1	Wed Apr 14 19:41:06 2004
+++ kaffe/tools/gjdoc/javalib/Makefile.am	Tue Apr 27 19:15:12 2004
@@ -7,6 +7,12 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file.
 
+## taken from top level Makefile.am
+JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)
+KAFFELIBRARYPATH=$(top_builddir)/libraries/clib/native/:$(top_builddir)/libraries/clib/io/:$(top_builddir)/libraries/clib/zip/:$(top_builddir)/libraries/clib/nio/
+BOOTCLASSPATH=$(top_builddir)/libraries/javalib/rt.jar
+JAR=BOOTCLASSPATH=$(BOOTCLASSPATH) KAFFELIBRARYPATH=$(KAFFELIBRARYPATH) $(JAVA) kaffe.tools.jar.Jar
+
 CLASSFILE = gjdoc.jar
 SRCDIRS = com gnu
 
Index: kaffe/tools/gjdoc/javalib/Makefile.in
diff -u kaffe/tools/gjdoc/javalib/Makefile.in:1.2 kaffe/tools/gjdoc/javalib/Makefile.in:1.3
--- kaffe/tools/gjdoc/javalib/Makefile.in:1.2	Mon Apr 26 16:48:39 2004
+++ kaffe/tools/gjdoc/javalib/Makefile.in	Tue Apr 27 19:15:12 2004
@@ -311,6 +311,10 @@
 target_alias = @target_alias@
 toolslibdir = @toolslibdir@
 with_engine = @with_engine@
+JAVA = $(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)
+KAFFELIBRARYPATH = $(top_builddir)/libraries/clib/native/:$(top_builddir)/libraries/clib/io/:$(top_builddir)/libraries/clib/zip/:$(top_builddir)/libraries/clib/nio/
+BOOTCLASSPATH = $(top_builddir)/libraries/javalib/rt.jar
+JAR = BOOTCLASSPATH=$(BOOTCLASSPATH) KAFFELIBRARYPATH=$(KAFFELIBRARYPATH) $(JAVA) kaffe.tools.jar.Jar
 CLASSFILE = gjdoc.jar
 SRCDIRS = com gnu
 toolslib_DATA = $(CLASSFILE)