diff options
Diffstat (limited to 'java/Makefile.am')
| -rw-r--r-- | java/Makefile.am | 25 |
1 files changed, 5 insertions, 20 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 |