summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorBenjamin Dauvergne <bdauvergne@entrouvert.com>2008-05-23 22:44:18 +0000
committerBenjamin Dauvergne <bdauvergne@entrouvert.com>2008-05-23 22:44:18 +0000
commit048b1ca8b68d707a8ef695d5510ca795ee1521e2 (patch)
treee469aae8c5b4b9a70f467e7f730bbd6844f73d70 /java
parent7cdabd45e926eb2cbecaa5713b5f22f37d1724b5 (diff)
downloadlasso-048b1ca8b68d707a8ef695d5510ca795ee1521e2.tar.gz
lasso-048b1ca8b68d707a8ef695d5510ca795ee1521e2.tar.xz
lasso-048b1ca8b68d707a8ef695d5510ca795ee1521e2.zip
re-add swig/java binding to makefile, make it use the JAVA_INCLUDE path, JDK_INCLUDES does not exist
Diffstat (limited to 'java')
-rw-r--r--java/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/Makefile.am b/java/Makefile.am
index a602cf98..cf41fef7 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -14,13 +14,13 @@ javalib_LTLIBRARIES = libjlasso.la
endif
jlasso_la_SOURCES = lasso_wrap.c
-jlasso_la_CFLAGS = $(JDK_INCLUDES) $(LASSO_CORE_CFLAGS) -I$(top_srcdir)
+jlasso_la_CFLAGS = $(JAVA_INCLUDE) $(LASSO_CORE_CFLAGS) -I$(top_srcdir)
jlasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS)
jlasso_la_LDFLAGS = -no-undefined -avoid-version -module \
-Wl,--add-stdcall-alias
libjlasso_la_SOURCES = lasso_wrap.c
-libjlasso_la_CFLAGS = $(JDK_INCLUDES) $(LASSO_CORE_CFLAGS) -I$(top_srcdir)
+libjlasso_la_CFLAGS = $(JAVA_INCLUDE) $(LASSO_CORE_CFLAGS) -I$(top_srcdir)
libjlasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS)
libjlasso_la_LDFLAGS = -no-undefined -avoid-version -module