From da92730944f6ef60c5777237e132867231dd9fb1 Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Thu, 5 Nov 2009 17:31:31 +0100 Subject: [PATCH] interfaces/java: moved to java-aubio branch --- Makefile.am | 5 +---- configure.ac | 6 ------ interfaces/java/aubio/Makefile.am | 31 ------------------------------- interfaces/java/aubio/main.java | 19 ------------------- 4 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 interfaces/java/aubio/Makefile.am delete mode 100644 interfaces/java/aubio/main.java diff --git a/Makefile.am b/Makefile.am index dab21808..8357c9fe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,13 +7,10 @@ SWIGDIR = swig 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: diff --git a/configure.ac b/configure.ac index 71a1a6ac..1f2cd434 100644 --- a/configure.ac +++ b/configure.ac @@ -244,10 +244,6 @@ dnl Check for docbook-to-man 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 @@ AC_OUTPUT([ swig/Makefile python/Makefile python/aubio/Makefile - interfaces/java/Makefile - interfaces/java/aubio/Makefile doc/Makefile ]) diff --git a/interfaces/java/aubio/Makefile.am b/interfaces/java/aubio/Makefile.am deleted file mode 100644 index ead43cc4..00000000 --- a/interfaces/java/aubio/Makefile.am +++ /dev/null @@ -1,31 +0,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 diff --git a/interfaces/java/aubio/main.java b/interfaces/java/aubio/main.java deleted file mode 100644 index f315387d..00000000 --- a/interfaces/java/aubio/main.java +++ /dev/null @@ -1,19 +0,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); - } -} - -- 2.26.2