diff options
| author | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2008-05-26 22:58:38 +0000 |
|---|---|---|
| committer | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2008-05-26 22:58:38 +0000 |
| commit | dab2625c95627db39ea62cbb86508e1bd408ecde (patch) | |
| tree | 7512b540ab37b8702764c403b25462190f9bdea3 /java | |
| parent | 477c0dbd7d48d3380a75095b6ba346302d8da9f6 (diff) | |
| download | lasso-dab2625c95627db39ea62cbb86508e1bd408ecde.tar.gz lasso-dab2625c95627db39ea62cbb86508e1bd408ecde.tar.xz lasso-dab2625c95627db39ea62cbb86508e1bd408ecde.zip | |
fix INCLUDES, remove obsolete JDK_INCLUDES definition
Diffstat (limited to 'java')
| -rw-r--r-- | java/Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/java/Makefile.am b/java/Makefile.am index e843373c..7ae408b0 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -1,6 +1,5 @@ # Define java Package directory, the tailing '/' is mandatory. JAVA_PATH = com/entrouvert/lasso/ -JDK_INCLUDES = @JDK_INCLUDE@ -I$(top_builddir) CLASSPATH = . javalibdir = $(prefix)/lib/java @@ -14,13 +13,13 @@ javalib_LTLIBRARIES = libjlasso.la endif jlasso_la_SOURCES = lasso_wrap.c -jlasso_la_CFLAGS = -fno-strict-aliasing $(JAVA_INCLUDE) $(LASSO_CORE_CFLAGS) -I$(top_srcdir) +jlasso_la_CFLAGS = -fno-strict-aliasing $(JAVA_INCLUDE) $(LASSO_CORE_CFLAGS) -I$(top_builddir) -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 = -fno-strict-aliasing $(JAVA_INCLUDE) $(LASSO_CORE_CFLAGS) -I$(top_srcdir) +libjlasso_la_CFLAGS = -fno-strict-aliasing $(JAVA_INCLUDE) $(LASSO_CORE_CFLAGS) -I$(top_builddir) -I$(top_srcdir) libjlasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS) libjlasso_la_LDFLAGS = -no-undefined -avoid-version -module |