diff options
| author | Romain Chantereay <rchantereau@entrouvert.com> | 2004-08-04 15:56:34 +0000 |
|---|---|---|
| committer | Romain Chantereay <rchantereau@entrouvert.com> | 2004-08-04 15:56:34 +0000 |
| commit | a165f97479d3727a123a31bb5eacf593e2887039 (patch) | |
| tree | 7557ad246dce5b5156bdf6eabe0d5ed64da130a5 /java/src | |
| parent | e8d21d515c52c8e37afa264134c1e57dbfb9194a (diff) | |
| download | lasso-a165f97479d3727a123a31bb5eacf593e2887039.tar.gz lasso-a165f97479d3727a123a31bb5eacf593e2887039.tar.xz lasso-a165f97479d3727a123a31bb5eacf593e2887039.zip | |
Me 1, Litlle memory stick Windows computer 0.
First step toward a fully automaked java build.
java now compile and build the DLL.
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Makefile.am | 2 | ||||
| -rw-r--r-- | java/src/c/Makefile.am | 5 | ||||
| -rw-r--r-- | java/src/java/Makefile.am | 19 |
3 files changed, 22 insertions, 4 deletions
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 + |