Use discovered java path for compiler and jni include files

[fw/altos] / libaltos / Makefile.am

diff --git a/libaltos/Makefile.am b/libaltos/Makefile.am
index 8f69c1ad9661df9b95290c007d89467a8ca8ec9a..eb5eb6774fc5e42fa8b14dc1b428e1dd7fd919c4 100644 (file)
--- a/libaltos/Makefile.am
+++ b/libaltos/Makefile.am
@@ -1,6 +1,5 @@
-JAVAC=javac
 AM_CFLAGS=-DLINUX -DPOSIX_TTY -I$(JVM_INCLUDE) -I$(JVM_INCLUDE)/linux
-AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -source 6
+AM_JAVACFLAGS=$(JAVAC_VERSION_FLAGS) -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked
 
 altoslibdir=$(libdir)/altos
 
@@ -24,11 +23,15 @@ WINDOWS_SRC=\
 WINDOWS_H=\
        libaltos.h
 
-noinst_PROGRAMS=cjnitest
+noinst_PROGRAMS=cjnitest btletest
 
 cjnitest_SOURCES=cjnitest.c
 cjnitest_LDADD=libaltos.la
 
+btletest_SOURCES=btletest.c
+
+btletest_LDADD=-lbluetooth
+
 if MULTI_ARCH
 altoslib_LTLIBRARIES+=libaltos32.la libaltos64.la