Fix the library linking declaration
[scilab.git] / scilab / modules / preferences / Makefile.am
index 73f7c69..0b28060 100644 (file)
@@ -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 ######
@@ -24,6 +24,8 @@ libscipreferences_la_etc_DATA = \
        etc/preferences.quit \
        etc/preferences.start \
        etc/XConfiguration.xml \
+       etc/XConfiguration-preference.xml \
+       etc/XConfiguration-preference.xsl \
        etc/XWizard-expression.xml \
        etc/XWizard-function.xml \
        etc/XWizard-xcos.xml \
@@ -46,22 +48,21 @@ libscipreferences_la_src_xslt_xwizard_DATA = \
 
 PREFERENCES_JNI_SOURCES = src/jni/ScilabPreferences.cpp
 
-PREFERENCES_C_SOURCES =
-
-PREFERENCES_CXX_SOURCES =
+PREFERENCES_C_SOURCES = src/c/getScilabPreference.c
 
 GATEWAY_C_SOURCES = sci_gateway/c/gw_preferences.c
 
 GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_addModulePreferences.cpp \
-                      sci_gateway/cpp/sci_removeModulePreferences.cpp
+                      sci_gateway/cpp/sci_removeModulePreferences.cpp \
+                      sci_gateway/cpp/sci_preferences.cpp
 
 libscipreferences_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
     -I$(srcdir)/includes/ \
     -I$(srcdir)/src/cpp/ \
     -I$(srcdir)/src/c/ \
     -I$(srcdir)/src/jni/ \
-    -I$(top_srcdir)/libs/MALLOC/includes/ \
-    -I$(top_srcdir)/modules/commons/src/jni \
+    $(XML_FLAGS) \
+    -I$(top_srcdir)/modules/commons/src/jni/ \
     -I$(top_srcdir)/modules/jvm/includes/ \
     -I$(top_srcdir)/modules/fileio/includes/ \
     -I$(top_srcdir)/modules/output_stream/includes/ \
@@ -69,18 +70,21 @@ libscipreferences_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
     -I$(top_srcdir)/modules/api_scilab/includes/ \
     -I$(top_srcdir)/modules/core/includes/ \
     -I$(top_srcdir)/modules/functions/includes/ \
+    -I$(top_srcdir)/modules/string/includes/ \
     $(AM_CPPFLAGS)
 
 # Without the preferences module 
-libscipreferences_disable_la_CPPFLAGS = -I$(srcdir)/includes/ \
+libscipreferences_cli_la_CPPFLAGS = -I$(srcdir)/includes/ \
        -I$(top_srcdir)/modules/localization/includes/ \
        -I$(top_srcdir)/modules/output_stream/includes \
        $(AM_CPPFLAGS)
 
-PREFERENCES_DISABLE_C_SOURCES = src/nopreferences/nopreferences.c
-libscipreferences_disable_la_SOURCES = $(PREFERENCES_DISABLE_C_SOURCES)
+PREFERENCES_CLI_C_SOURCES = src/nopreferences/nopreferences.c
+libscipreferences_cli_la_SOURCES = $(PREFERENCES_CLI_C_SOURCES)
+
+libscipreferences_la_LDFLAGS = $(AM_LDFLAGS)
 
-pkglib_LTLIBRARIES = libscipreferences-disable.la
+pkglib_LTLIBRARIES = libscipreferences-cli.la
 
 if GUI
     pkglib_LTLIBRARIES += libscipreferences.la 
@@ -88,8 +92,8 @@ if GUI
 endif
 
 
-libscipreferences_algo_la_SOURCES = $(PREFERENCES_C_SOURCES) $(PREFERENCES_JNI_SOURCES) $(PREFERENCES_CXX_SOURCES)
-libscipreferences_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CXX_SOURCES) 
+libscipreferences_algo_la_SOURCES = $(PREFERENCES_C_SOURCES)
+libscipreferences_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CXX_SOURCES)  $(PREFERENCES_JNI_SOURCES)
 libscipreferences_algo_la_CFLAGS = $(libscipreferences_la_CFLAGS)
 libscipreferences_algo_la_CPPFLAGS = $(libscipreferences_la_CPPFLAGS)
 
@@ -109,10 +113,8 @@ if SWIG
 BUILT_SOURCES+=swig
 endif
 
-libscipreferences_la_LIBADD = libscipreferences-algo.la \
-    $(top_builddir)/libs/MALLOC/libscimalloc.la \
-    $(top_builddir)/modules/jvm/libscijvm.la \
-    $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscipreferences_cli_la_LIBADD = libscipreferences-algo.la
+libscipreferences_la_LIBADD = libscipreferences-algo.la $(X_LIBS) $(X_EXTRA_LIBS) $(XML_LIBS)
 
 
 #### preferences : gateway declaration ####