X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=libaltos%2FMakefile.am;h=ae7316335f580cb3fc202df5ff3c3dd1e840f7f0;hb=ad07578d04926cb4b96c40a446c47ad3f9bad7df;hp=969aa8ad95ac483b6967d6df5354d08880a5f997;hpb=8bff2822c242d2878b408b9c0d8a7647108ea4b1;p=fw%2Faltos

diff --git a/libaltos/Makefile.am b/libaltos/Makefile.am
index 969aa8ad..ae731633 100644
--- a/libaltos/Makefile.am
+++ b/libaltos/Makefile.am
@@ -1,11 +1,11 @@
 JAVAC=javac
-AM_CFLAGS=-DLINUX -DPOSIX_TTY -I$(JVM_INCLUDE)
+AM_CFLAGS=-DLINUX -DPOSIX_TTY -I$(JVM_INCLUDE) -I$(JVM_INCLUDE)/linux
 AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -source 6
 
 altoslibdir=$(libdir)/altos
 
 altoslib_LTLIBRARIES=libaltos.la
-libaltos_la_LDFLAGS=-version-info 1:0:1
+libaltos_la_LDFLAGS=-version-info 1:0:1 -Wl,-znoexecstack
 
 libaltos_la_SOURCES=\
 	libaltos.c \
@@ -41,8 +41,7 @@ cjnitest64_LDADD=libaltos64.la
 
 endif
 
-
-LIBS=-lbluetooth
+LIBS=-ldl
 
 HFILES=libaltos.h
 
@@ -65,7 +64,7 @@ classlibaltos.stamp: $(SWIG_FILE)
 
 MINGCC32=i686-w64-mingw32-gcc
 MINGCC64=x86_64-w64-mingw32-gcc
-MINGFLAGS=-Wall -DWINDOWS -DBUILD_DLL -I$(JVM_INCLUDE)
+MINGFLAGS=-Wall -DWINDOWS -DBUILD_DLL -I$(JVM_INCLUDE) -I$(JVM_INCLUDE)/linux
 MINGLIBS=-lsetupapi
 
 fat: all altos.dll altos64.dll