projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 1.9.6.2
[fw/altos]
/
libaltos
/
Makefile.am
diff --git
a/libaltos/Makefile.am
b/libaltos/Makefile.am
index ae7316335f580cb3fc202df5ff3c3dd1e840f7f0..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_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
altoslibdir=$(libdir)/altos
@@
-8,14
+7,31
@@
altoslib_LTLIBRARIES=libaltos.la
libaltos_la_LDFLAGS=-version-info 1:0:1 -Wl,-znoexecstack
libaltos_la_SOURCES=\
libaltos_la_LDFLAGS=-version-info 1:0:1 -Wl,-znoexecstack
libaltos_la_SOURCES=\
- libaltos.c \
+ libaltos_common.c \
+ libaltos_posix.c \
+ libaltos_linux.c \
+ libaltos_wrap.c \
+ libaltos.h \
+ libaltos_posix.h \
+ libaltos_private.h
+
+WINDOWS_SRC=\
+ libaltos_common.c\
+ libaltos_windows.c\
libaltos_wrap.c
libaltos_wrap.c
-noinst_PROGRAMS=cjnitest
+WINDOWS_H=\
+ libaltos.h
+
+noinst_PROGRAMS=cjnitest btletest
cjnitest_SOURCES=cjnitest.c
cjnitest_LDADD=libaltos.la
cjnitest_SOURCES=cjnitest.c
cjnitest_LDADD=libaltos.la
+btletest_SOURCES=btletest.c
+
+btletest_LDADD=-lbluetooth
+
if MULTI_ARCH
altoslib_LTLIBRARIES+=libaltos32.la libaltos64.la
if MULTI_ARCH
altoslib_LTLIBRARIES+=libaltos32.la libaltos64.la
@@
-64,16
+80,17
@@
classlibaltos.stamp: $(SWIG_FILE)
MINGCC32=i686-w64-mingw32-gcc
MINGCC64=x86_64-w64-mingw32-gcc
MINGCC32=i686-w64-mingw32-gcc
MINGCC64=x86_64-w64-mingw32-gcc
-MINGFLAGS=-Wall -
DWINDOWS -DBUILD_DLL
-I$(JVM_INCLUDE) -I$(JVM_INCLUDE)/linux
-MINGLIBS=-lsetupapi
+MINGFLAGS=-Wall -
Wextra -DWINDOWS -DBUILD_DLL -mconsole
-I$(JVM_INCLUDE) -I$(JVM_INCLUDE)/linux
+MINGLIBS=-lsetupapi
-lws2_32
fat: all altos.dll altos64.dll
fat: all altos.dll altos64.dll
-
altos.dll: $(libaltos_la_SOURCES
)
-
$(MINGCC32) -o $@ $(MINGFLAGS) -shared $(libaltos_la_SOURCES
) $(MINGLIBS)
+
#altos.dll: $(WINDOWS_SRC) $(WINDOWS_H
)
+
# $(MINGCC32) -o $@ $(MINGFLAGS) -shared $(WINDOWS_SRC
) $(MINGLIBS)
-
altos64.dll: $(libaltos_la_SOURCES
)
-
$(MINGCC64) -o $@ $(MINGFLAGS) -shared $(libaltos_la_SOURCES
) $(MINGLIBS)
+
#altos64.dll: $(WINDOWS_SRC) $(WINDOWS_H
)
+
# $(MINGCC64) -o $@ $(MINGFLAGS) -shared $(WINDOWS_SRC
) $(MINGLIBS)
clean-local:
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