From b9535cfed51d92e1abff0134e74825b1eb38b11f Mon Sep 17 00:00:00 2001
From: Emmanuel Raviart <eraviart@entrouvert.com>
Date: Wed, 21 Jul 2004 15:03:14 +0000
Subject: Changed Makefile for Kaffe support.

Added new class LassoObject.

First non regression test.
---
 java/Makefile | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'java/Makefile')

diff --git a/java/Makefile b/java/Makefile
index c4aec60e..e5951fde 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -1,8 +1,14 @@
 TARGET=target
 
-JAVAC=/opt/jdk/bin/javac
-JAVAH=/opt/jdk/bin/javah
-JAR=/opt/jdk/bin/jar
+#JAVAC=/opt/jdk/bin/javac
+#JAVAH=/opt/jdk/bin/javah
+#JAVAH_CLASSPATH_PREFIX=
+#JAR=/opt/jdk/bin/jar
+
+JAVAC=/usr/lib/kaffe/bin/javac
+JAVAH=/usr/lib/kaffe/bin/javah
+JAVAH_CLASSPATH_PREFIX=/usr/share/kaffe/Klasses.jar:
+JAR=/usr/lib/kaffe/bin/jar
 
 JAVA_BUILD_DIR=${TARGET}/classes
 JAVA_SOURCE_DIR=src/java
@@ -27,7 +33,7 @@ binary-java:
 	${JAR} cf ${LASSO.JAR} -C ${JAVA_BUILD_DIR} com
 
 generate-header: binary-java
-	${JAVAH} -d ${C_SOURCE_DIR} -classpath ${JAVA_BUILD_DIR} ${JAVA_CLASSES}
+	${JAVAH} -d ${C_SOURCE_DIR} -classpath ${JAVAH_CLASSPATH_PREFIX}${JAVA_BUILD_DIR} ${JAVA_CLASSES}
 
 binary-c: ${LASSO.SO}
 
@@ -35,7 +41,7 @@ ${C_OBJECT}: ${C_SOURCE}
 	${MAKE} -C ${C_SOURCE_DIR}
 
 ${LASSO.SO}: generate-header ${C_OBJECT}
-	$(CC) -shared ${C_OBJECT} -o $@
+	$(CC) -shared -lgobject-2.0 -lglib-2.0 -llasso ${C_OBJECT} -o $@
 
 clean:
 	${MAKE} -C ${C_SOURCE_DIR} clean
-- 
cgit