[kaffe] CVS kaffe (dalibor): Fixed build with precompiled rt.jar
Kaffe CVS
cvs-commits at kaffe.org
Mon Aug 23 09:05:16 PDT 2004
PatchSet 5095
Date: 2004/08/23 16:01:21
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Fixed build with precompiled rt.jar
2004-08-23 Dalibor Topic <robilad at kaffe.org>
* include/Makefile.am: Fixed JNI header generation
with precompiled rt.jar.
* include/Makefile.in: Regenerated.
Reported by: Ito Kazumitsu <kaz at maczuka.gcd.org>
Members:
ChangeLog:1.2653->1.2654
include/Makefile.am:1.72->1.73
include/Makefile.in:1.184->1.185
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2653 kaffe/ChangeLog:1.2654
--- kaffe/ChangeLog:1.2653 Sun Aug 22 22:32:08 2004
+++ kaffe/ChangeLog Mon Aug 23 16:01:21 2004
@@ -1,3 +1,12 @@
+2004-08-23 Dalibor Topic <robilad at kaffe.org>
+
+ * include/Makefile.am: Fixed JNI header generation
+ with precompiled rt.jar.
+
+ * include/Makefile.in: Regenerated.
+
+ Reported by: Ito Kazumitsu <kaz at maczuka.gcd.org>
+
2004-08-22 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/gnu/inet/nntp/NNTPConnection.java:
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.72 kaffe/include/Makefile.am:1.73
--- kaffe/include/Makefile.am:1.72 Mon Aug 16 02:43:42 2004
+++ kaffe/include/Makefile.am Mon Aug 23 16:01:22 2004
@@ -308,8 +308,8 @@
## but if it does not change, do not touch it
@set -e; for f in $(HDRS); do \
class=`echo $$f | sed -e 's%.*/%%g' -e 's%\.h$$%%' -e 's%_%/%g'`; \
- echo "$(KAFFEH) -jni -classpath $(KLASSES_JAR):$(top_builddir)/libraries/javalib/lib -o $$f $$class"; \
- $(KAFFEH) -jni -classpath $(KLASSES_JAR):$(top_builddir)/libraries/javalib/lib -o stamp-h1$$f $$class; \
+ echo "$(KAFFEH) -jni -classpath $(KLASSES_JAR):$(top_builddir)/libraries/javalib/lib::$(top_builddir)/libraries/javalib/rt.jar -o $$f $$class"; \
+ $(KAFFEH) -jni -classpath $(KLASSES_JAR):$(top_builddir)/libraries/javalib/lib::$(top_builddir)/libraries/javalib/rt.jar -o stamp-h1$$f $$class; \
if test -f $$f && cmp $$f stamp-h1$$f >/dev/null; then \
echo "$$f is already up-to-date"; \
rm -f stamp-h1$$f; \
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.184 kaffe/include/Makefile.in:1.185
--- kaffe/include/Makefile.in:1.184 Mon Aug 16 02:43:42 2004
+++ kaffe/include/Makefile.in Mon Aug 23 16:01:23 2004
@@ -923,8 +923,8 @@
rebuild-jni-hdrs: stamp-kaffeh $(KLASSES_JAR)
@set -e; for f in $(HDRS); do \
class=`echo $$f | sed -e 's%.*/%%g' -e 's%\.h$$%%' -e 's%_%/%g'`; \
- echo "$(KAFFEH) -jni -classpath $(KLASSES_JAR):$(top_builddir)/libraries/javalib/lib -o $$f $$class"; \
- $(KAFFEH) -jni -classpath $(KLASSES_JAR):$(top_builddir)/libraries/javalib/lib -o stamp-h1$$f $$class; \
+ echo "$(KAFFEH) -jni -classpath $(KLASSES_JAR):$(top_builddir)/libraries/javalib/lib::$(top_builddir)/libraries/javalib/rt.jar -o $$f $$class"; \
+ $(KAFFEH) -jni -classpath $(KLASSES_JAR):$(top_builddir)/libraries/javalib/lib::$(top_builddir)/libraries/javalib/rt.jar -o stamp-h1$$f $$class; \
if test -f $$f && cmp $$f stamp-h1$$f >/dev/null; then \
echo "$$f is already up-to-date"; \
rm -f stamp-h1$$f; \
More information about the kaffe
mailing list