Me 1, Litlle memory stick Windows computer 0.

First step toward a fully automaked java build.

java now compile and build the DLL.

4 files changed, 27 insertions, 24 deletions

diff --git a/java/Makefile.am b/java/Makefile.am
index 80adbcd8..f3740e31 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -1,5 +1,4 @@
 NULL = 
-
 TARGET=target
 #JAVAC=/usr/lib/kaffe/bin/javac
 #JAVAH=/usr/lib/kaffe/bin/javah
@@ -7,16 +6,9 @@ TARGET=target
 #JAR=/usr/lib/kaffe/bin/jar
 
 
-JAVA_BUILD_DIR=${TARGET}/classes
-JAVA_SOURCE_DIR=src/java
-JAVA_PACKAGE=com.entrouvert.lasso
-JAVA_SOURCE=${wildcard ${JAVA_SOURCE_DIR}/${subst .,/,${JAVA_PACKAGE}}/*.java}
-JAVA_CLASSES=${addprefix ${JAVA_PACKAGE}., ${filter-out LassoTest, ${basename ${notdir ${JAVA_SOURCE}}}}}
-LASSO_JAR=${TARGET}/lasso.jar
-
-C_SOURCE_DIR=src/c
-C_BUILD_DIR=${C_SOURCE_DIR}
+C_SOURCE_DIR=../c
 C_SOURCE=${wildcard ${C_SOURCE_DIR}/*.c}
+C_BUILD_DIR=${C_SOURCE_DIR}
 C_OBJECT=${C_SOURCE:.c=.o}
 if MINGW
 # JAVA_LDFLAGS=-L/usr/local/lib -lgobject-2.0-0 -lglib-2.0-0 -llasso 
@@ -26,13 +18,6 @@ else
     LASSO_SO=${TARGET}/libjlasso.so
 endif
 
-binary-java:
-	mkdir -p ${JAVA_BUILD_DIR}
-	${JAVAC} ${JAVAC_FLAGS} -d ${JAVA_BUILD_DIR} ${JAVA_SOURCE}
-	${JAR} cf ${LASSO_JAR} -C ${JAVA_BUILD_DIR} com
-
-generate-header: binary-java
-	${JAVAH} ${JAVAH_FLAGS} -d ${C_SOURCE_DIR} -classpath ${JAVAH_CLASSPATH_PREFIX}${JAVA_BUILD_DIR} ${JAVA_CLASSES}
 
 if MINGW
 binary-c: ${LASSO_DLL}
@@ -42,7 +27,7 @@ endif
 
 if MINGW
 mylibs = -L../win32/.libs -llasso -L/usr/local/lib
-${LASSO_DLL}: generate-header
+${LASSO_DLL}:
 	gcc -mno-cygwin -shared -o ${TARGET}/jlasso.dll \
             -Wl,--out-implib=${TARGET}/jlasso.a \
             -Wl,--add-stdcall-alias \
@@ -52,7 +37,7 @@ ${LASSO_DLL}: generate-header
             -Wl,--no-whole-archive -lgobject-2.0-0 -lglib-2.0-0 ${mylibs}
 else
 mylibs = ../lasso/.libs/liblasso.so
-${LASSO_SO}: generate-header
+${LASSO_SO}:
 	$(CC) -shared -lgobject-2.0 -lglib-2.0 $(mylibs) ${C_OBJECT} -o $@
 endif
 
@@ -68,7 +53,7 @@ libjlasso_la_LIBADD = \
 
 all-redirect: binary-c 
 
-clean:
+clean: clean-recursive
 	rm -fr ${TARGET} *~ *.log
 
 
diff --git a/java/src/Makefile.am b/java/src/Makefile.am
index 670b4f1a..5676e64b 100644
--- a/java/src/Makefile.am
+++ b/java/src/Makefile.am
@@ -1 +1 @@
-SUBDIRS=c
+SUBDIRS=java c
diff --git a/java/src/c/Makefile.am b/java/src/c/Makefile.am
index eec8fca9..c00bfe64 100644
--- a/java/src/c/Makefile.am
+++ b/java/src/c/Makefile.am
@@ -1,8 +1,7 @@
 if MINGW
 JAVA_CFLAGS = -mno-cygwin -mwindows -D_MSC_VER=1 \
     -D_WIN32 -DWIN32 -DLASSO_DEBUG \
-    -I../../.. \
-    -I../../win32 \
+    -I$(top_srcdir) \
     -I. -g \
     -I/usr/local/include \
     -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include \
@@ -14,7 +13,7 @@ else
 JAVA_CFLAGS = \
     -g \
     -I. -I/opt/jdk/include -I/opt/jdk/include/linux \
-    -I../../.. \
+    -I$(top_srcdir) \
     -I/usr/include/libxml2 \
     -I/usr/include/glib-2.0 \
     -I/usr/lib/glib-2.0/include \
diff --git a/java/src/java/Makefile.am b/java/src/java/Makefile.am
new file mode 100644
index 00000000..d7ef7af3
--- /dev/null
+++ b/java/src/java/Makefile.am
@@ -0,0 +1,19 @@
+TARGET=../../target
+JAVA_BUILD_DIR=${TARGET}/classes
+JAVA_PACKAGE=com.entrouvert.lasso
+JAVA_SOURCE=${wildcard ${subst .,/,${JAVA_PACKAGE}}/*.java}
+LASSO_JAR=${TARGET}/lasso.jar
+C_SOURCE_DIR=../c
+C_SOURCE=${wildcard ${C_SOURCE_DIR}/*.c}
+JAVA_CLASSES=${addprefix ${JAVA_PACKAGE}., ${filter-out LassoTest, ${basename ${notdir ${JAVA_SOURCE}}}}}
+
+binary-java:
+	mkdir -p ${JAVA_BUILD_DIR}
+	${JAVAC} ${JAVAC_FLAGS} -d ${JAVA_BUILD_DIR} ${JAVA_SOURCE}
+	${JAR} cf ${LASSO_JAR} -C ${JAVA_BUILD_DIR} com
+
+generate-header: binary-java
+	${JAVAH} ${JAVAH_FLAGS} -d ${C_SOURCE_DIR} -classpath ${JAVAH_CLASSPATH_PREFIX}${JAVA_BUILD_DIR} ${JAVA_CLASSES}
+
+all: generate-header
+