diff options
| author | Romain Chantereay <rchantereau@entrouvert.com> | 2004-08-19 16:55:15 +0000 |
|---|---|---|
| committer | Romain Chantereay <rchantereau@entrouvert.com> | 2004-08-19 16:55:15 +0000 |
| commit | 0d5a96551ed1de185c86d49d43ec32b68beeee66 (patch) | |
| tree | 1991c0077363a5becc74374f44952c746f3a3863 | |
| parent | 2a04314597ae112b9ed2fc47594d9fb1fef493bf (diff) | |
| download | lasso-0d5a96551ed1de185c86d49d43ec32b68beeee66.tar.gz lasso-0d5a96551ed1de185c86d49d43ec32b68beeee66.tar.xz lasso-0d5a96551ed1de185c86d49d43ec32b68beeee66.zip | |
Some modifications.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | java/Makefile.am | 18 | ||||
| -rw-r--r-- | python/Makefile.am | 3 |
3 files changed, 15 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 31e8ec60..19c8631a 100644 --- a/configure.ac +++ b/configure.ac @@ -532,7 +532,8 @@ AC_SUBST(LASSO_STATIC_BINARIES) dnl ========================================================================== dnl Final steps: lasso config dnl ========================================================================== -LASSO_CORE_CFLAGS="$LASSO_DEFINES -I${includedir}" +LASSO_CORE_CFLAGS="$LASSO_DEFINES" +dnl -I${includedir}" if test $MINGW -eq 1; then LASSO_CORE_LIBS="-llasso-0" else diff --git a/java/Makefile.am b/java/Makefile.am index 3d92cdc3..46e8bd7a 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -15,13 +15,17 @@ javasharedir=$(prefix)/share/java # Shared library. javalib_LTLIBRARIES=libjlasso.la -libjlasso_la_SOURCES=$(JAVA_MODULE)_wrap.c -libjlasso_la_CFLAGS=$(JDK_INCLUDES) $(LASSO_CFLAGS) -libjlasso_la_LIBADD=$(top_srcdir)/lasso/liblasso.la \ - $(LASSO_LIBS) \ - $(NULL) -libjlasso_la_LDFLAGS=-no-undefined -version-info @LASSO_VERSION_INFO@ \ - $(NULL) +libjlasso_la_SOURCES= $(JAVA_MODULE)_wrap.c +libjlasso_la_CFLAGS= $(JDK_INCLUDES) \ + $(LASSO_CFLAGS) \ + $(NULL) +libjlasso_la_LIBADD= $(top_srcdir)/lasso/liblasso.la \ + $(LASSO_LIBS) \ + $(NULL) +libjlasso_la_LDFLAGS= -no-undefined \ + -version-info @LASSO_VERSION_INFO@ \ + -avoid-version -module \ + $(NULL) # Java package javashare_DATA=lasso.jar diff --git a/python/Makefile.am b/python/Makefile.am index 197c0530..f847ea12 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -15,7 +15,8 @@ _lassomod_la_CFLAGS= $(LASSO_CFLAGS) \ _lassomod_la_LIBADD= $(top_srcdir)/lasso/liblasso.la \ $(LASSO_LIBS) \ $(NULL) -_lassomod_la_LDFLAGS= -module -avoid-version \ +_lassomod_la_LDFLAGS= -no-undefined \ + -module -avoid-version \ -version-info @LASSO_VERSION_INFO@ \ $(NULL) |