ref: da92730944f6ef60c5777237e132867231dd9fb1
parent: ee36175895f9e0064fe44d286b51ce985cc8960f
author: Paul Brossier <[email protected]>
date: Thu Nov 5 12:31:31 EST 2009
interfaces/java: moved to java-aubio branch
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,13 +7,10 @@
if PYTHONFOUND
PYTHONDIR = python
endif
-if JAVAFOUND
-JAVADIR = interfaces/java
endif
-endif
-SUBDIRS = src examples sounds $(PYTHONDIR) $(SWIGDIR) $(JAVADIR) $(DOC) tests
+SUBDIRS = src examples sounds $(PYTHONDIR) $(SWIGDIR) $(DOC) tests
EXTRA_DIST = bootstrap VERSION
docs:
--- a/configure.ac
+++ b/configure.ac
@@ -244,10 +244,6 @@
AC_PATH_PROG(DOCBOOK_TO_MAN,docbook-to-man,no)
AM_CONDITIONAL(DOCBOOKFOUND, test "${DOCBOOK_TO_MAN}" != "no")-dnl Check for Java
-AC_CHECK_HEADER(jni.h,JAVAHEADERS=y,AC_MSG_WARN([Java header jni.h not found.]))
-AM_CONDITIONAL(JAVAFOUND, test "${JAVAHEADERS}" = "y")-
dnl Create Makefiles
AC_OUTPUT([
Makefile
@@ -259,8 +255,6 @@
swig/Makefile
python/Makefile
python/aubio/Makefile
- interfaces/java/Makefile
- interfaces/java/aubio/Makefile
doc/Makefile
])
--- a/interfaces/java/aubio/Makefile.am
+++ /dev/null
@@ -1,31 +1,0 @@
-NOWARN_CFLAGS = -Wno-strict-aliasing
-
-AM_CFLAGS = @AUBIO_CFLAGS@ $(NOWARN_CFLAGS) $(SWCFLAGS) \
- -I$(top_builddir)/src -I$(top_srcdir)/src \
- -I/usr/lib/jvm/java-6-sun-1.6.0.04/include \
- -I${prefix}/lib/jvm/java-6-sun-1.6.0.04/include \- -I/usr/lib/jvm/java-6-sun-1.6.0.04/include/linux \
- -I${prefix}/lib/jvm/java-6-sun-1.6.0.04/include/linux \- -I/usr/include \
- -I${prefix}/include-
-SWLDFLAGS = -shared
-
-AUBIO_LDFLAGS = $(SWLDFLAGS) \
- -L$(top_builddir)/src -laubio
-
-pkgjavadir = ${libdir}/java/aubio-
-pkgjava_LTLIBRARIES = libaubiowrapper.la
-
-libaubiowrapper_la_LDFLAGS = -module -avoid-version $(AUBIO_LDFLAGS)
-libaubiowrapper_la_SOURCES = aubio_wrap.c
-
-aubio_wrap.c:
- $(SWIG) -outdir . -o aubio_wrap.c -java $(top_srcdir)/swig/aubio.i
-
-CLEANFILES = aubio_* SWIGTYPE_* *aubiowrapper* midi_*
-
-simple_test:
- javac *.java
- LD_LIBRARY_PATH=.libs java main
--- a/interfaces/java/aubio/main.java
+++ /dev/null
@@ -1,19 +1,0 @@
-// main.java
-
-public class main {- static {- System.loadLibrary("aubiowrapper");- }
-
- public static void main(String argv[]) {- float freq = (float)440.;
- float midi = aubiowrapper.aubio_freqtomidi( (float)440.);
- if (midi != (float) 69.0) {- throw new Error((String) "Error: aubio_freqtomidi(440.) != 69.", null);
- }
- System.out.print(freq);
- System.out.print(" Hz corresponds to midi note ");- System.out.println(midi);
- }
-}
-