Version 1.9.7

[fw/altos] / libaltos / Makefile.am

diff --git a/libaltos/Makefile.am b/libaltos/Makefile.am
index 8f69c1ad9661df9b95290c007d89467a8ca8ec9a..8c57b3f9d92f4d7a23e4a9fd28977c46d03074aa 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
 
@@ -82,11 +85,12 @@ MINGLIBS=-lsetupapi -lws2_32
 
 fat: all altos.dll altos64.dll
 
-altos.dll: $(WINDOWS_SRC) $(WINDOWS_H)
-       $(MINGCC32) -o $@ $(MINGFLAGS) -shared $(WINDOWS_SRC) $(MINGLIBS)
+#altos.dll: $(WINDOWS_SRC) $(WINDOWS_H)
+#      $(MINGCC32) -o $@ $(MINGFLAGS) -shared $(WINDOWS_SRC) $(MINGLIBS)
 
-altos64.dll: $(WINDOWS_SRC) $(WINDOWS_H)
-       $(MINGCC64) -o $@ $(MINGFLAGS) -shared $(WINDOWS_SRC) $(MINGLIBS)
+#altos64.dll: $(WINDOWS_SRC) $(WINDOWS_H)
+#      $(MINGCC64) -o $@ $(MINGFLAGS) -shared $(WINDOWS_SRC) $(MINGLIBS)
 
 clean-local:
-       -rm -rf libaltosJNI *.class *.java classlibaltos.stamp $(SWIG_FILE) libaltos_wrap.c altos.dll altos64.dll
+       -rm -rf libaltosJNI *.class *.java classlibaltos.stamp $(SWIG_FILE) libaltos_wrap.c
+#      -rm -rf  altos.dll altos64.dll