X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=blobdiff_plain;f=scilab%2Fmodules%2Fpreferences%2FMakefile.am;h=0b2806034d29116d7c49b92ff94c123e687fcbfd;hp=6ca5677d47cdd1561f7e665f814340e28b13b3c5;hb=45ff10dd3d80984a754f3839b221f35b8573321c;hpb=e24c3a302fcdbc8f5781f447c17369a4b285367f

diff --git a/scilab/modules/preferences/Makefile.am b/scilab/modules/preferences/Makefile.am
index 6ca5677..0b28060 100644
--- a/scilab/modules/preferences/Makefile.am
+++ b/scilab/modules/preferences/Makefile.am
@@ -6,7 +6,7 @@
 # This source file is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
 # are also available at
-# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+# http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
 #
 
 #### Target ######
@@ -62,7 +62,6 @@ libscipreferences_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
     -I$(srcdir)/src/c/ \
     -I$(srcdir)/src/jni/ \
     $(XML_FLAGS) \
-    -I$(top_srcdir)/libs/MALLOC/includes/ \
     -I$(top_srcdir)/modules/commons/src/jni/ \
     -I$(top_srcdir)/modules/jvm/includes/ \
     -I$(top_srcdir)/modules/fileio/includes/ \
@@ -83,7 +82,7 @@ libscipreferences_cli_la_CPPFLAGS = -I$(srcdir)/includes/ \
 PREFERENCES_CLI_C_SOURCES = src/nopreferences/nopreferences.c
 libscipreferences_cli_la_SOURCES = $(PREFERENCES_CLI_C_SOURCES)
 
-libscipreferences_la_LDFLAGS = $(X_LIBS) $(X_EXTRA_LIBS) $(XML_LIBS) $(AM_LDFLAGS)
+libscipreferences_la_LDFLAGS = $(AM_LDFLAGS)
 
 pkglib_LTLIBRARIES = libscipreferences-cli.la
 
@@ -115,7 +114,7 @@ BUILT_SOURCES+=swig
 endif
 
 libscipreferences_cli_la_LIBADD = libscipreferences-algo.la
-libscipreferences_la_LIBADD = libscipreferences-algo.la
+libscipreferences_la_LIBADD = libscipreferences-algo.la $(X_LIBS) $(X_EXTRA_LIBS) $(XML_LIBS)
 
 
 #### preferences : gateway declaration ####