diff options
| author | Frederic Peters <fpeters@entrouvert.com> | 2008-04-29 12:08:27 +0000 |
|---|---|---|
| committer | Frederic Peters <fpeters@entrouvert.com> | 2008-04-29 12:08:27 +0000 |
| commit | 7b549d0ce332cf7ca00df99d3bd734becd5bbcf7 (patch) | |
| tree | 5060511097b07265ece92f4b4f2e05fb5c03b7de /bindings/java | |
| parent | 3386a3e6beabcd4ab374d20fecf117aead9833fa (diff) | |
| download | lasso-7b549d0ce332cf7ca00df99d3bd734becd5bbcf7.tar.gz lasso-7b549d0ce332cf7ca00df99d3bd734becd5bbcf7.tar.xz lasso-7b549d0ce332cf7ca00df99d3bd734becd5bbcf7.zip | |
[project @ fpeters@0d.be-20080325172346-eitu3onvzps4b30z]
merging benjamin stuff and adding --enable-id-wsf when id-wsf is asked
Original author: Frederic Peters <fpeters@0d.be>
Date: 2008-03-25 18:23:46.535000+01:00
Diffstat (limited to 'bindings/java')
| -rw-r--r-- | bindings/java/Makefile.am | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am index ce3b0aa1..7c2b6e39 100644 --- a/bindings/java/Makefile.am +++ b/bindings/java/Makefile.am @@ -9,7 +9,11 @@ CLASSPATH=.:tests java_extension_LTLIBRARIES = libjnilasso.la java_extensiondir = ${libdir}/java -java_lasso_source_files = $(shell python $(top_srcdir)/bindings/bindings.py -l java-list --src-dir=$(top_srcdir)/lasso/) +if WSF_ENABLED +EXTRA_ARGS = --enable-id-wsf +endif + +java_lasso_source_files = $(shell python $(top_srcdir)/bindings/bindings.py -l java-list --src-dir=$(top_srcdir)/lasso/ $(EXTRA_ARGS) ) lasso_jardir=$(prefix)/share/java lasso_jar_DATA=lasso.jar @@ -35,7 +39,7 @@ doc: com_entrouvert_lasso_LassoJNI.h: com/entrouvert/lasso/LassoJNI.class $(java_lasso_source_files:.java=.class) $(JAVAH) $(JAVAH_FLAGS) -classpath . `echo $< | sed 'su/u.ug;su.classuu'` -libjnilasso_la_CFLAGS = -fno-strict-aliasing $(LASSO_CORE_CFLAGS) -I$(top_srcdir) -I$(top_builddir) +libjnilasso_la_CFLAGS = -fno-strict-aliasing $(LASSO_CORE_CFLAGS) -I$(top_srcdir) -I$(top_builddir) @JAVA_INCLUDE@ libjnilasso_la_LDFLAGS = -export-dynamic -prefer-pic -module -avoid-version libjnilasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS) nodist_libjnilasso_la_SOURCES = com_entrouvert_lasso_LassoJNI.c @@ -45,7 +49,7 @@ BUILT_SOURCES = com_entrouvert_lasso_LassoJNI.c com_entrouvert_lasso_LassoJNI.h BINDING_OPTION=#--enable-exception-docs $(java_lasso_source_files) com_entrouvert_lasso_LassoJNI.c: ../lang_java_wrapper_top.c ../lang_java.py - $(PYTHON) $(top_srcdir)/bindings/bindings.py $(BINDING_OPTION) -l java --src-dir=$(top_srcdir)/lasso/ + $(PYTHON) $(top_srcdir)/bindings/bindings.py $(BINDING_OPTION) -l java --src-dir=$(top_srcdir)/lasso/ $(EXTRA_ARGS) cp $(srcdir)/GObject.java com/entrouvert/lasso |