diff options
| author | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2011-05-30 22:24:39 +0200 |
|---|---|---|
| committer | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2011-05-30 22:24:39 +0200 |
| commit | 8aadadef4d74937ee05e3d61c646ae148d3fad40 (patch) | |
| tree | f950a0d8dfe187ef8780cf8a48308d1420504711 /bindings | |
| parent | 9cedec628ee6fceb41f6d54d1e7c228e7bb9ba0f (diff) | |
| download | lasso-8aadadef4d74937ee05e3d61c646ae148d3fad40.tar.gz lasso-8aadadef4d74937ee05e3d61c646ae148d3fad40.tar.xz lasso-8aadadef4d74937ee05e3d61c646ae148d3fad40.zip | |
[java] try to make test works under Mac Os X
Diffstat (limited to 'bindings')
| -rw-r--r-- | bindings/java/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am index b3a28d09..f48f1189 100644 --- a/bindings/java/Makefile.am +++ b/bindings/java/Makefile.am @@ -55,7 +55,7 @@ com_entrouvert_lasso_LassoJNI.h: com/entrouvert/lasso/LassoJNI.class $(java_las libjnilasso_la_CFLAGS = -fno-strict-aliasing $(LASSO_CORE_CFLAGS) -I$(top_srcdir) -I$(top_builddir) $(AM_CFLAGS) @JAVA_INCLUDE@ libjnilasso_la_CFLAGS += -Wno-unused-parameter -libjnilasso_la_LDFLAGS = -export-dynamic -prefer-pic -module -avoid-version +libjnilasso_la_LDFLAGS = -export-dynamic -prefer-pic -module -avoid-version $(JNI_EXTRA_LDFLAGS) libjnilasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS) nodist_libjnilasso_la_SOURCES = com_entrouvert_lasso_LassoJNI.c @@ -105,8 +105,8 @@ AllJunitTests: JAVAFLAGS +="-Dsrcdir=$(srcdir)" AllJunitTests: $(test_source_files:.java=.class) echo "#! /bin/sh" > $@ echo "OBJDIR=`libtool --config | grep ^objdir | sed s/.*=//`" >> $@ - echo 'LD_LIBRARY_PATH=$$OBJDIR @JUNIT@ BindingTests' >> $@ - echo 'LD_LIBRARY_PATH=$$OBJDIR @JUNIT@ LoginTest' >> $@ + echo 'LD_LIBRARY_PATH=$$OBJDIR DYLD_LIBRARY_PATH=$$OBJDIR @JUNIT@ -Djava.library.path=$$OBJDIR BindingTests' >> $@ + echo 'LD_LIBRARY_PATH=$$OBJDIR DYLD_LIBRARY_PATH=$$OBJDIR @JUNIT@ -Djava.library.path=$$OBJDIR LoginTest' >> $@ chmod +x $@ endif |