Remove the wrong declaration du MALLOC 45/10645/2
Sylvestre Ledru [Thu, 28 Feb 2013 17:16:31 +0000 (18:16 +0100)]
Change-Id: I914d5c9ba6af7eb74f8d88260367d7dca42f7a94

124 files changed:
scilab/modules/action_binding/Makefile.am
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.am
scilab/modules/api_scilab/Makefile.in
scilab/modules/arnoldi/Makefile.am
scilab/modules/arnoldi/Makefile.in
scilab/modules/boolean/Makefile.am
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/call_scilab/Makefile.am
scilab/modules/call_scilab/Makefile.in
scilab/modules/commons/Makefile.am
scilab/modules/commons/Makefile.in
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/Makefile.in
scilab/modules/differential_equations/Makefile.am
scilab/modules/differential_equations/Makefile.in
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/external_objects/Makefile.am
scilab/modules/external_objects/Makefile.in
scilab/modules/fftw/Makefile.am
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/functions/Makefile.am
scilab/modules/functions/Makefile.in
scilab/modules/graphic_export/Makefile.am
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_objects/Makefile.am
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/history_browser/Makefile.am
scilab/modules/history_browser/Makefile.in
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/Makefile.in
scilab/modules/integer/Makefile.am
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.am
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.am
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/javasci/Makefile.am
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/matio/Makefile.am
scilab/modules/matio/Makefile.in
scilab/modules/mexlib/Makefile.am
scilab/modules/mexlib/Makefile.in
scilab/modules/optimization/Makefile.am
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/parallel/Makefile.am
scilab/modules/parallel/Makefile.in
scilab/modules/parameters/Makefile.am
scilab/modules/parameters/Makefile.in
scilab/modules/polynomials/Makefile.am
scilab/modules/polynomials/Makefile.in
scilab/modules/preferences/Makefile.am
scilab/modules/preferences/Makefile.in
scilab/modules/randlib/Makefile.am
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.am
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scinotes/Makefile.am
scilab/modules/scinotes/Makefile.in
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/Makefile.in
scilab/modules/sound/Makefile.am
scilab/modules/sound/Makefile.in
scilab/modules/sparse/Makefile.am
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/spreadsheet/Makefile.am
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.am
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/symbolic/Makefile.am
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.am
scilab/modules/tclsci/Makefile.in
scilab/modules/time/Makefile.am
scilab/modules/time/Makefile.in
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/umfpack/Makefile.am
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.am
scilab/modules/windows_tools/Makefile.in
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xml/Makefile.am
scilab/modules/xml/Makefile.in

index 0926d0a..1a926ae 100644 (file)
@@ -40,7 +40,6 @@ endif
 
 libsciaction_binding_disable_la_SOURCES = src/noaction_binding/noaction_binding.c
 libsciaction_binding_disable_la_CPPFLAGS =     -I$(srcdir)/includes/ \
-                                                                                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                                                                                        -I$(top_srcdir)/modules/localization/includes/ \
                                                                                        -I$(top_srcdir)/modules/output_stream/includes \
                                                                                        $(AM_CPPFLAGS)
@@ -50,7 +49,6 @@ libsciaction_binding_la_CPPFLAGS=     $(JAVA_JNI_INCLUDE) \
 -I$(srcdir)/includes/ \
 -I$(srcdir)/src/c/ \
 -I$(srcdir)/src/jni/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/jvm/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
 -I$(top_srcdir)/modules/commons/src/jni/ \
index 1708174..b6df6ec 100644 (file)
@@ -477,7 +477,6 @@ GIWS_WRAPPERS = src/jni/Signal.giws.xml
 BUILT_SOURCES = $(am__append_1) $(am__append_2)
 libsciaction_binding_disable_la_SOURCES = src/noaction_binding/noaction_binding.c
 libsciaction_binding_disable_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                                                                                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                                                                                        -I$(top_srcdir)/modules/localization/includes/ \
                                                                                        -I$(top_srcdir)/modules/output_stream/includes \
                                                                                        $(AM_CPPFLAGS)
@@ -488,7 +487,6 @@ libsciaction_binding_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
 -I$(srcdir)/includes/ \
 -I$(srcdir)/src/c/ \
 -I$(srcdir)/src/jni/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/jvm/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
 -I$(top_srcdir)/modules/commons/src/jni/ \
index 55bb20f..979e351 100644 (file)
@@ -23,7 +23,6 @@ libsciapi_scilab_la_CPPFLAGS=-I$(srcdir)/includes/ \
 -I$(srcdir)/src/cpp/ \
 -I$(top_srcdir)/modules/core/includes/ \
 -I$(top_srcdir)/modules/call_scilab/includes/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/localization/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
 -I$(top_srcdir)/modules/string/includes/ \
index 8cd9154..a0f855d 100644 (file)
@@ -447,7 +447,6 @@ libsciapi_scilab_la_CPPFLAGS = -I$(srcdir)/includes/ \
 -I$(srcdir)/src/cpp/ \
 -I$(top_srcdir)/modules/core/includes/ \
 -I$(top_srcdir)/modules/call_scilab/includes/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/localization/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
 -I$(top_srcdir)/modules/string/includes/ \
index 6d88d52..5a44cd2 100644 (file)
@@ -20,7 +20,6 @@ GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_eigs.c
 
 libsciarnoldi_la_CPPFLAGS = \
-    -I$(top_srcdir)/libs/MALLOC/includes/ \
     -I$(srcdir)/includes/ \
     -I$(top_srcdir)/modules/api_scilab/includes/ \
     -I$(top_srcdir)/modules/localization/includes/ \
index 636499c..9d4163c 100644 (file)
@@ -440,7 +440,6 @@ GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_eigs.c
 
 libsciarnoldi_la_CPPFLAGS = \
-    -I$(top_srcdir)/libs/MALLOC/includes/ \
     -I$(srcdir)/includes/ \
     -I$(top_srcdir)/modules/api_scilab/includes/ \
     -I$(top_srcdir)/modules/localization/includes/ \
index 3370ebd..86b725a 100644 (file)
@@ -22,7 +22,6 @@ sci_gateway/fortran/sci_f_find.f
 
 libsciboolean_la_CPPFLAGS= -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
index f3c311f..6497093 100644 (file)
@@ -454,7 +454,6 @@ sci_gateway/fortran/sci_f_find.f
 
 libsciboolean_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
index 57e4597..e8093c5 100644 (file)
@@ -199,7 +199,6 @@ sci_gateway/fortran/sci_f_linmeq.f \
 sci_gateway/fortran/sci_f_rankqr.f
 
 libscicacsd_la_CPPFLAGS= -I$(srcdir)/includes/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
index b42275e..5fda28d 100644 (file)
@@ -665,7 +665,6 @@ sci_gateway/fortran/sci_f_linmeq.f \
 sci_gateway/fortran/sci_f_rankqr.f
 
 libscicacsd_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
index 143edf9..9d7b09e 100644 (file)
@@ -16,7 +16,6 @@ GATEWAY_C_SOURCES = sci_gateway/c/sci_fromjava.c \
 
 libscicall_scilab_la_CPPFLAGS= -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        -I$(top_srcdir)/modules/action_binding/includes/ \
index 1f232d6..02b72fa 100644 (file)
@@ -444,7 +444,6 @@ GATEWAY_C_SOURCES = sci_gateway/c/sci_fromjava.c \
 
 libscicall_scilab_la_CPPFLAGS = -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        -I$(top_srcdir)/modules/action_binding/includes/ \
index aa5361c..46b5406 100644 (file)
@@ -38,7 +38,6 @@ COMMONS_FORTRAN_SOURCES = src/fortran/empty.f
 libscicommons_la_CPPFLAGS= $(JAVA_JNI_INCLUDE) \
                        -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/jni/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
                        -I$(top_srcdir)/modules/fileio/includes/ \
                        $(AM_CPPFLAGS)
index 2fc1d16..bb19fa3 100644 (file)
@@ -479,7 +479,6 @@ COMMONS_FORTRAN_SOURCES = src/fortran/empty.f
 libscicommons_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                        -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/jni/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
                        -I$(top_srcdir)/modules/fileio/includes/ \
                        $(AM_CPPFLAGS)
index 07b39c7..1339589 100644 (file)
@@ -39,7 +39,6 @@ sci_gateway/c/gw_completion.c
 libscicompletion_la_CPPFLAGS = -I$(srcdir)/includes/ \
     -I$(srcdir)/src/c/ \
     -I$(srcdir)/src/cpp/ \
-       -I$(top_srcdir)/libs/MALLOC/includes/ \
     -I$(top_srcdir)/modules/api_scilab/includes/ \
     -I$(top_srcdir)/modules/functions/includes/ \
        -I$(top_srcdir)/modules/localization/includes/ \
index 5880cd9..ae88a9e 100644 (file)
@@ -497,7 +497,6 @@ sci_gateway/c/gw_completion.c
 libscicompletion_la_CPPFLAGS = -I$(srcdir)/includes/ \
     -I$(srcdir)/src/c/ \
     -I$(srcdir)/src/cpp/ \
-       -I$(top_srcdir)/libs/MALLOC/includes/ \
     -I$(top_srcdir)/modules/api_scilab/includes/ \
     -I$(top_srcdir)/modules/functions/includes/ \
        -I$(top_srcdir)/modules/localization/includes/ \
index 64d362b..1a6b86b 100644 (file)
@@ -113,7 +113,6 @@ endif
 
 libsciconsole_minimal_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/fileio/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/history_manager/includes/ \
@@ -136,7 +135,6 @@ libsciconsole_la_CPPFLAGS= -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/cpp/ \
                                -I$(srcdir)/src/jni/ \
                                -I$(top_srcdir)/modules/commons/src/jni/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/fileio/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/history_manager/includes/ \
index 2cb407b..9e0ee32 100644 (file)
@@ -592,7 +592,6 @@ CONSOLE_C_SOURCES = src/c/GuiManagement.c src/c/dropFiles.c \
        $(am__append_3)
 libsciconsole_minimal_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/fileio/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/history_manager/includes/ \
@@ -613,7 +612,6 @@ libsciconsole_minimal_la_CPPFLAGS = -I$(srcdir)/includes/ \
 libsciconsole_la_CPPFLAGS = -I$(srcdir)/includes/ -I$(srcdir)/src/c/ \
        -I$(srcdir)/src/c/cmdLine -I$(srcdir)/src/cpp/ \
        -I$(srcdir)/src/jni/ -I$(top_srcdir)/modules/commons/src/jni/ \
-       -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/modules/fileio/includes/ \
        -I$(top_srcdir)/modules/output_stream/includes/ \
        -I$(top_srcdir)/modules/history_manager/includes/ \
index 2cbaadf..88f5b11 100644 (file)
@@ -97,8 +97,8 @@ src/c/setlines.c \
 src/c/setformat.c \
 src/c/InitializePreferences.c \
 src/c/sci_tools.c \
-src/c/sci_mem_alloc.c \
 src/c/getmaxMALLOC.c \
+src/c/sci_mem_alloc.c \
 src/c/hashtable/hashtable.c \
 src/c/hashtable/hashtable_itr.c \
 src/c/hashtable/hashtable_utility.c
@@ -281,7 +281,6 @@ sci_gateway/fortran/sci_f_isglobal.f
 libscicore_la_CPPFLAGS = -I$(srcdir)/includes/ \
        -I$(srcdir)/src/c/ \
        -I$(srcdir)/src/cpp/ \
-       -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/modules/intersci/includes/ \
        -I$(top_srcdir)/modules/call_scilab/includes/ \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
@@ -382,8 +381,6 @@ includes/getversion.h \
 includes/warningmode.h \
 includes/Thread_Wrapper.h \
 includes/backtrace_print.h \
-includes/MALLOC.h \
-includes/getmaxMALLOC.h \
 includes/sci_mem_alloc.h \
 includes/hashtable_itr.h \
 includes/hashtable.h \
index 48e4bed..2a1dff3 100644 (file)
@@ -181,7 +181,7 @@ am__libscicore_algo_la_SOURCES_DIST = src/c/inffic.c src/c/cs2st.c \
        src/c/suspendProcess.c src/c/windowsChangeManagement.c \
        src/c/setieee.c src/c/setlines.c src/c/setformat.c \
        src/c/InitializePreferences.c src/c/sci_tools.c \
-       src/c/sci_mem_alloc.c src/c/getmaxMALLOC.c \
+       src/c/getmaxMALLOC.c src/c/sci_mem_alloc.c \
        src/c/hashtable/hashtable.c src/c/hashtable/hashtable_itr.c \
        src/c/hashtable/hashtable_utility.c src/c/scimem64.c \
        src/cpp/hashtable_core.cpp src/cpp/namstr.cpp \
@@ -292,8 +292,8 @@ am__objects_2 = libscicore_algo_la-inffic.lo \
        libscicore_algo_la-setformat.lo \
        libscicore_algo_la-InitializePreferences.lo \
        libscicore_algo_la-sci_tools.lo \
-       libscicore_algo_la-sci_mem_alloc.lo \
        libscicore_algo_la-getmaxMALLOC.lo \
+       libscicore_algo_la-sci_mem_alloc.lo \
        libscicore_algo_la-hashtable.lo \
        libscicore_algo_la-hashtable_itr.lo \
        libscicore_algo_la-hashtable_utility.lo $(am__objects_1)
@@ -698,7 +698,7 @@ CORE_C_SOURCES = src/c/inffic.c src/c/cs2st.c src/c/tmpdir.c \
        src/c/suspendProcess.c src/c/windowsChangeManagement.c \
        src/c/setieee.c src/c/setlines.c src/c/setformat.c \
        src/c/InitializePreferences.c src/c/sci_tools.c \
-       src/c/sci_mem_alloc.c src/c/getmaxMALLOC.c \
+       src/c/getmaxMALLOC.c src/c/sci_mem_alloc.c \
        src/c/hashtable/hashtable.c src/c/hashtable/hashtable_itr.c \
        src/c/hashtable/hashtable_utility.c $(am__append_1)
 CORE_CXX_SOURCES = src/cpp/hashtable_core.cpp \
@@ -819,7 +819,7 @@ sci_gateway/fortran/sci_f_comp.f \
 sci_gateway/fortran/sci_f_isglobal.f
 
 libscicore_la_CPPFLAGS = -I$(srcdir)/includes/ -I$(srcdir)/src/c/ \
-       -I$(srcdir)/src/cpp/ -I$(top_srcdir)/libs/MALLOC/includes/ \
+       -I$(srcdir)/src/cpp/ \
        -I$(top_srcdir)/modules/intersci/includes/ \
        -I$(top_srcdir)/modules/call_scilab/includes/ \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
@@ -905,8 +905,6 @@ includes/getversion.h \
 includes/warningmode.h \
 includes/Thread_Wrapper.h \
 includes/backtrace_print.h \
-includes/MALLOC.h \
-includes/getmaxMALLOC.h \
 includes/sci_mem_alloc.h \
 includes/hashtable_itr.h \
 includes/hashtable.h \
@@ -1866,13 +1864,6 @@ libscicore_algo_la-sci_tools.lo: src/c/sci_tools.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscicore_algo_la-sci_tools.lo `test -f 'src/c/sci_tools.c' || echo '$(srcdir)/'`src/c/sci_tools.c
 
-libscicore_algo_la-sci_mem_alloc.lo: src/c/sci_mem_alloc.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscicore_algo_la-sci_mem_alloc.lo -MD -MP -MF $(DEPDIR)/libscicore_algo_la-sci_mem_alloc.Tpo -c -o libscicore_algo_la-sci_mem_alloc.lo `test -f 'src/c/sci_mem_alloc.c' || echo '$(srcdir)/'`src/c/sci_mem_alloc.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscicore_algo_la-sci_mem_alloc.Tpo $(DEPDIR)/libscicore_algo_la-sci_mem_alloc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/sci_mem_alloc.c' object='libscicore_algo_la-sci_mem_alloc.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscicore_algo_la-sci_mem_alloc.lo `test -f 'src/c/sci_mem_alloc.c' || echo '$(srcdir)/'`src/c/sci_mem_alloc.c
-
 libscicore_algo_la-getmaxMALLOC.lo: src/c/getmaxMALLOC.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscicore_algo_la-getmaxMALLOC.lo -MD -MP -MF $(DEPDIR)/libscicore_algo_la-getmaxMALLOC.Tpo -c -o libscicore_algo_la-getmaxMALLOC.lo `test -f 'src/c/getmaxMALLOC.c' || echo '$(srcdir)/'`src/c/getmaxMALLOC.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscicore_algo_la-getmaxMALLOC.Tpo $(DEPDIR)/libscicore_algo_la-getmaxMALLOC.Plo
@@ -1880,6 +1871,13 @@ libscicore_algo_la-getmaxMALLOC.lo: src/c/getmaxMALLOC.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscicore_algo_la-getmaxMALLOC.lo `test -f 'src/c/getmaxMALLOC.c' || echo '$(srcdir)/'`src/c/getmaxMALLOC.c
 
+libscicore_algo_la-sci_mem_alloc.lo: src/c/sci_mem_alloc.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscicore_algo_la-sci_mem_alloc.lo -MD -MP -MF $(DEPDIR)/libscicore_algo_la-sci_mem_alloc.Tpo -c -o libscicore_algo_la-sci_mem_alloc.lo `test -f 'src/c/sci_mem_alloc.c' || echo '$(srcdir)/'`src/c/sci_mem_alloc.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscicore_algo_la-sci_mem_alloc.Tpo $(DEPDIR)/libscicore_algo_la-sci_mem_alloc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/sci_mem_alloc.c' object='libscicore_algo_la-sci_mem_alloc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscicore_algo_la-sci_mem_alloc.lo `test -f 'src/c/sci_mem_alloc.c' || echo '$(srcdir)/'`src/c/sci_mem_alloc.c
+
 libscicore_algo_la-hashtable.lo: src/c/hashtable/hashtable.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscicore_algo_la-hashtable.lo -MD -MP -MF $(DEPDIR)/libscicore_algo_la-hashtable.Tpo -c -o libscicore_algo_la-hashtable.lo `test -f 'src/c/hashtable/hashtable.c' || echo '$(srcdir)/'`src/c/hashtable/hashtable.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscicore_algo_la-hashtable.Tpo $(DEPDIR)/libscicore_algo_la-hashtable.Plo
index 719b77c..a755430 100644 (file)
@@ -42,7 +42,6 @@ sci_gateway/fortran/sci_f_lstcat.f \
 sci_gateway/fortran/sci_f_list.f
 
 libscidata_structures_la_CPPFLAGS = -I$(srcdir)/includes/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/localization/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
index 7d15502..e7e3c93 100644 (file)
@@ -509,7 +509,6 @@ sci_gateway/fortran/sci_f_lstcat.f \
 sci_gateway/fortran/sci_f_list.f
 
 libscidata_structures_la_CPPFLAGS = -I$(srcdir)/includes/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/localization/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
index 57cf859..aee87d8 100644 (file)
@@ -127,7 +127,6 @@ sci_gateway/fortran/bbvode.f
 
 
 libscidifferential_equations_la_CPPFLAGS = -I$(srcdir)/includes/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/localization/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
index 5e7bc94..49486e3 100644 (file)
@@ -600,7 +600,6 @@ sci_gateway/fortran/Ex-bvode.f \
 sci_gateway/fortran/bbvode.f
 
 libscidifferential_equations_la_CPPFLAGS = -I$(srcdir)/includes/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/localization/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
index 1605340..4bc5ad0 100644 (file)
@@ -24,7 +24,6 @@ GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/sci_fort.f
 
 libscidynamic_link_la_CPPFLAGS = \
 -I$(top_srcdir)/modules/output_stream/includes/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/fileio/includes/ \
 -I$(top_srcdir)/modules/localization/includes/ \
 -I$(top_srcdir)/modules/string/includes/ \
index ec96e4c..1f02f60 100644 (file)
@@ -475,7 +475,6 @@ sci_gateway/c/sci_ilib_verbose.c
 GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/sci_fort.f
 libscidynamic_link_la_CPPFLAGS = \
 -I$(top_srcdir)/modules/output_stream/includes/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/fileio/includes/ \
 -I$(top_srcdir)/modules/localization/includes/ \
 -I$(top_srcdir)/modules/string/includes/ \
index e6c3dea..59e6deb 100644 (file)
@@ -375,7 +375,6 @@ libdummy_elementary_functions_la_CPPFLAGS = -I$(srcdir)/includes/ \
 libscielementary_functions_la_CPPFLAGS = -I$(srcdir)/includes/ \
        -I$(srcdir)/src/cpp/ \
        -I$(srcdir)/src/c/ \
-       -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/core/src/c/ \
        -I$(top_srcdir)/modules/localization/includes/ \
index c84c0e1..73f68b4 100644 (file)
@@ -942,7 +942,6 @@ libdummy_elementary_functions_la_CPPFLAGS = -I$(srcdir)/includes/ \
 libscielementary_functions_la_CPPFLAGS = -I$(srcdir)/includes/ \
        -I$(srcdir)/src/cpp/ \
        -I$(srcdir)/src/c/ \
-       -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/core/src/c/ \
        -I$(top_srcdir)/modules/localization/includes/ \
index 0309f64..be860fd 100644 (file)
@@ -110,7 +110,6 @@ GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_percent_EObj_e.cpp \
        sci_gateway/cpp/sci_percent_EObj_disp.cpp
 
 libsciexternal_objects_la_CFLAGS= -I$(srcdir)/includes/ \
-             -I$(top_srcdir)/libs/MALLOC/includes/ \
              -I$(top_srcdir)/modules/core/includes \
              -I$(top_srcdir)/modules/api_scilab/includes \
              -I$(top_srcdir)/modules/output_stream/includes \
@@ -121,7 +120,6 @@ libsciexternal_objects_la_CFLAGS= -I$(srcdir)/includes/ \
 libsciexternal_objects_la_CPPFLAGS = -I$(srcdir)/includes/ \
     -I$(srcdir)/src/cpp/ \
     -I$(srcdir)/src/c/ \
-    -I$(top_srcdir)/libs/MALLOC/includes/ \
     -I$(top_srcdir)/modules/localization/includes \
     -I$(top_srcdir)/modules/api_scilab/includes \
     -I$(top_srcdir)/modules/output_stream/includes \
index 7889d35..76a4f8f 100644 (file)
@@ -693,7 +693,6 @@ GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_percent_EObj_e.cpp \
        sci_gateway/cpp/sci_percent_EObj_disp.cpp
 
 libsciexternal_objects_la_CFLAGS = -I$(srcdir)/includes/ \
-             -I$(top_srcdir)/libs/MALLOC/includes/ \
              -I$(top_srcdir)/modules/core/includes \
              -I$(top_srcdir)/modules/api_scilab/includes \
              -I$(top_srcdir)/modules/output_stream/includes \
@@ -703,7 +702,6 @@ libsciexternal_objects_la_CFLAGS = -I$(srcdir)/includes/ \
 libsciexternal_objects_la_CPPFLAGS = -I$(srcdir)/includes/ \
     -I$(srcdir)/src/cpp/ \
     -I$(srcdir)/src/c/ \
-    -I$(top_srcdir)/libs/MALLOC/includes/ \
     -I$(top_srcdir)/modules/localization/includes \
     -I$(top_srcdir)/modules/api_scilab/includes \
     -I$(top_srcdir)/modules/output_stream/includes \
index 23bae6b..c968a91 100644 (file)
@@ -70,7 +70,6 @@ libscifftw_la_LIBADD = libscifftw-algo.la
 
 libscifftw_la_CPPFLAGS = -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/dynamic_link/includes/ \
                        -I$(top_srcdir)/modules/fileio/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
index b418e8a..199cc94 100644 (file)
@@ -525,7 +525,6 @@ libscifftw_la_etc_DATA = etc/fftw.quit etc/fftw.start
 
 @FFTW_TRUE@libscifftw_la_CPPFLAGS = -I$(srcdir)/includes/ \
 @FFTW_TRUE@                    -I$(srcdir)/src/c/ \
-@FFTW_TRUE@                    -I$(top_srcdir)/libs/MALLOC/includes/ \
 @FFTW_TRUE@                    -I$(top_srcdir)/modules/dynamic_link/includes/ \
 @FFTW_TRUE@                    -I$(top_srcdir)/modules/fileio/includes/ \
 @FFTW_TRUE@                    -I$(top_srcdir)/modules/output_stream/includes/ \
index 41a63bb..bebdb7f 100644 (file)
@@ -110,7 +110,6 @@ sci_gateway/c/sci_tempname.c
 
 libscifileio_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/io/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
index f68575e..8cd4bbc 100644 (file)
@@ -606,7 +606,6 @@ sci_gateway/c/sci_tempname.c
 
 libscifileio_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/io/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
index 31edeb5..ad00a1f 100644 (file)
@@ -27,7 +27,6 @@ sci_gateway/fortran/intexec.f
 
 libscifunctions_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/core/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
index cb5579d..340cd67 100644 (file)
@@ -463,7 +463,6 @@ sci_gateway/fortran/intexec.f
 
 libscifunctions_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/core/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
index 38b4843..2016396 100644 (file)
@@ -53,7 +53,6 @@ libscigraphic_export_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                                -I$(srcdir)/src/cpp/ \
                                -I$(srcdir)/src/jni/ \
                                -I$(srcdir)/src/c/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
                                -I$(top_srcdir)/modules/jvm/includes/ \
@@ -92,7 +91,6 @@ endif
 libscigraphic_export_disable_la_SOURCES = src/nographic_export/nographic_export.c
 
 libscigraphic_export_disable_la_CPPFLAGS = -I$(srcdir)/includes/ \
-       -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/localization/includes/ \
        -I$(top_srcdir)/modules/output_stream/includes/ \
index 10caeec..b6cc93f 100644 (file)
@@ -510,7 +510,6 @@ libscigraphic_export_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                                -I$(srcdir)/src/cpp/ \
                                -I$(srcdir)/src/jni/ \
                                -I$(srcdir)/src/c/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
                                -I$(top_srcdir)/modules/jvm/includes/ \
@@ -542,7 +541,6 @@ BUILT_SOURCES = $(am__append_1)
 # All the sources needed by libscigraphic_export.la
 libscigraphic_export_disable_la_SOURCES = src/nographic_export/nographic_export.c
 libscigraphic_export_disable_la_CPPFLAGS = -I$(srcdir)/includes/ \
-       -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/localization/includes/ \
        -I$(top_srcdir)/modules/output_stream/includes/ \
index 5d80054..ae79e85 100644 (file)
@@ -83,7 +83,6 @@ libscigraphic_objects_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                        -I$(srcdir)/src/cpp/ \
                        -I$(srcdir)/src/c/ \
                        -I$(srcdir)/src/jni/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
                        -I$(top_srcdir)/modules/commons/src/jni/ \
                        -I$(top_srcdir)/modules/core/includes/ \
@@ -94,7 +93,6 @@ libscigraphic_objects_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
 
 # Without the graphic_objects module
 libscigraphic_objects_disable_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        $(AM_CPPFLAGS)
@@ -124,8 +122,7 @@ if SWIG
   BUILT_SOURCES += swig
 endif
 
-libscigraphic_objects_la_LIBADD = $(top_builddir)/libs/MALLOC/libscimalloc.la \
-$(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscigraphic_objects_la_LIBADD = $(top_builddir)/modules/output_stream/libscioutput_stream.la
 
 
 #### graphic_objects : gateway declaration ####
index 3fc5161..722e6ee 100644 (file)
@@ -147,7 +147,6 @@ am_libscigraphic_objects_disable_la_OBJECTS = $(am__objects_1)
 libscigraphic_objects_disable_la_OBJECTS =  \
        $(am_libscigraphic_objects_disable_la_OBJECTS)
 libscigraphic_objects_la_DEPENDENCIES =  \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la
 am__objects_2 = libscigraphic_objects_la-DataLoader_wrap.lo \
        libscigraphic_objects_la-ScilabNativeView_wrap.lo
@@ -625,7 +624,6 @@ libscigraphic_objects_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                        -I$(srcdir)/src/cpp/ \
                        -I$(srcdir)/src/c/ \
                        -I$(srcdir)/src/jni/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
                        -I$(top_srcdir)/modules/commons/src/jni/ \
                        -I$(top_srcdir)/modules/core/includes/ \
@@ -637,7 +635,6 @@ libscigraphic_objects_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
 
 # Without the graphic_objects module
 libscigraphic_objects_disable_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        $(AM_CPPFLAGS)
@@ -656,9 +653,7 @@ INCLUDE_FLAGS = $(libscigraphic_objects_la_CPPFLAGS)
 SWIG_WRAPPERS = src/jni/DataLoader.i \
                                src/jni/ScilabNativeView.i
 
-libscigraphic_objects_la_LIBADD = $(top_builddir)/libs/MALLOC/libscimalloc.la \
-$(top_builddir)/modules/output_stream/libscioutput_stream.la
-
+libscigraphic_objects_la_LIBADD = $(top_builddir)/modules/output_stream/libscioutput_stream.la
 
 #### graphic_objects : gateway declaration ####
 libscigraphic_objects_la_sci_gatewaydir = $(mydatadir)/sci_gateway
index c910490..bf09774 100644 (file)
@@ -399,7 +399,6 @@ libscigraphics_la_CPPFLAGS = \
        -I$(srcdir)/src/c/getHandleProperty/ \
        -I$(srcdir)/src/cpp/ \
        -I$(top_srcdir)/libs/hashtable/ \
-       -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/modules/action_binding/includes/ \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/elementary_functions/includes/ \
@@ -475,7 +474,6 @@ libscigraphics_disable_la_CPPFLAGS = \
        -I$(srcdir)/src/c/ \
        -I$(srcdir)/src/c/getHandleProperty/ \
        -I$(srcdir)/src/cpp/ \
-       -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/libs/hashtable/ \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/localization/includes/ \
index 84b0bd5..9c107ad 100644 (file)
@@ -1179,7 +1179,6 @@ libscigraphics_la_CPPFLAGS = \
        -I$(srcdir)/src/c/getHandleProperty/ \
        -I$(srcdir)/src/cpp/ \
        -I$(top_srcdir)/libs/hashtable/ \
-       -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/modules/action_binding/includes/ \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/elementary_functions/includes/ \
@@ -1251,7 +1250,6 @@ libscigraphics_disable_la_CPPFLAGS = \
        -I$(srcdir)/src/c/ \
        -I$(srcdir)/src/c/getHandleProperty/ \
        -I$(srcdir)/src/cpp/ \
-       -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/libs/hashtable/ \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/localization/includes/ \
index da7536b..f364df6 100644 (file)
@@ -199,7 +199,6 @@ libscigui_la_CPPFLAGS = \
                        -I$(srcdir)/src/c/ \
                        -I$(srcdir)/src/jni/ \
                        -I$(top_srcdir)/libs/hashtable/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
                        -I$(top_srcdir)/modules/commons/src/jni/ \
                        -I$(top_srcdir)/modules/console/includes/ \
@@ -225,7 +224,6 @@ libscigui_la_CPPFLAGS = \
 
 # Without the GUI module
 libscigui_disable_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
index 808b927..d0aa0a6 100644 (file)
@@ -729,7 +729,6 @@ libscigui_la_CPPFLAGS = \
                        -I$(srcdir)/src/c/ \
                        -I$(srcdir)/src/jni/ \
                        -I$(top_srcdir)/libs/hashtable/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
                        -I$(top_srcdir)/modules/commons/src/jni/ \
                        -I$(top_srcdir)/modules/console/includes/ \
@@ -756,7 +755,6 @@ libscigui_la_CPPFLAGS = \
 
 # Without the GUI module
 libscigui_disable_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
index 694a9ea..111f918 100644 (file)
@@ -42,7 +42,6 @@ libscihdf5_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
                                -I$(srcdir)/src/cpp/ \
                                -I$(srcdir)/src/jni/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                 -I$(top_srcdir)/modules/jvm/includes/ \
index c033904..61fc9d0 100644 (file)
@@ -468,7 +468,6 @@ libscihdf5_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
                                -I$(srcdir)/src/cpp/ \
                                -I$(srcdir)/src/jni/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                 -I$(top_srcdir)/modules/jvm/includes/ \
index 7bfb0c9..84d7560 100644 (file)
@@ -40,7 +40,6 @@ pkglib_LTLIBRARIES = libscihelptools.la
 libscihelptools_la_CPPFLAGS= $(JAVA_JNI_INCLUDE) \
                                -I$(srcdir)/src/jni/ \
                                -I$(srcdir)/includes/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
                                -I$(top_srcdir)/modules/jvm/includes/ \
                                -I$(top_srcdir)/modules/commons/src/jni \
index 2bb09e1..aaac818 100644 (file)
@@ -480,7 +480,6 @@ pkglib_LTLIBRARIES = libscihelptools.la
 libscihelptools_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                                -I$(srcdir)/src/jni/ \
                                -I$(srcdir)/includes/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
                                -I$(top_srcdir)/modules/jvm/includes/ \
                                -I$(top_srcdir)/modules/commons/src/jni \
index ec42b2e..6afcbac 100755 (executable)
@@ -44,7 +44,6 @@ libscihistory_browser_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
 -I$(srcdir)/src/jni/ \
 -I$(srcdir)/src/c/ \
 -I$(srcdir)/includes/ \
--I$(top_srcdir)/libs/MALLOC/includes \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
 -I$(top_srcdir)/modules/jvm/includes/ \
 -I$(top_srcdir)/modules/commons/src/jni/ \
index 28ac2ab..5b8c694 100644 (file)
@@ -487,7 +487,6 @@ libscihistory_browser_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
 -I$(srcdir)/src/jni/ \
 -I$(srcdir)/src/c/ \
 -I$(srcdir)/includes/ \
--I$(top_srcdir)/libs/MALLOC/includes \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
 -I$(top_srcdir)/modules/jvm/includes/ \
 -I$(top_srcdir)/modules/commons/src/jni/ \
index f8b10ff..264f3c9 100644 (file)
@@ -50,7 +50,6 @@ libscihistory_manager_la_CPPFLAGS =  $(JAVA_JNI_INCLUDE) \
 -I$(srcdir)/src/cpp/ \
 -I$(srcdir)/src/c/ \
 -I$(srcdir)/src/jni/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
 -I$(top_srcdir)/modules/console/includes/ \
 -I$(top_srcdir)/modules/fileio/includes/ \
index 7ba5773..c37b65f 100644 (file)
@@ -502,7 +502,6 @@ libscihistory_manager_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
 -I$(srcdir)/src/cpp/ \
 -I$(srcdir)/src/c/ \
 -I$(srcdir)/src/jni/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
 -I$(top_srcdir)/modules/console/includes/ \
 -I$(top_srcdir)/modules/fileio/includes/ \
index e4c3fe0..d297459 100644 (file)
@@ -114,7 +114,6 @@ sci_gateway/fortran/sci_i_min.f \
 sci_gateway/fortran/sci_inttype.f
 
 libsciinteger_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
index 97a5ae9..33e6301 100644 (file)
@@ -598,7 +598,6 @@ sci_gateway/fortran/sci_i_min.f \
 sci_gateway/fortran/sci_inttype.f
 
 libsciinteger_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
index 73b291c..fbca440 100644 (file)
@@ -29,7 +29,6 @@ sci_gateway/c/sci_eval_cshep2d.c
 
 libsciinterpolation_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
index 23aba2f..eea3175 100644 (file)
@@ -469,7 +469,6 @@ sci_gateway/c/sci_eval_cshep2d.c
 
 libsciinterpolation_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
index d4291cb..e4b7a0e 100644 (file)
@@ -36,8 +36,7 @@ bin_PROGRAMS = intersci
 intersci_SOURCES = $(INTERSCI_EXE_C_SOURCES)
 
 libsciintersci_la_SOURCES = $(INTERSCI_LIB_C_SOURCES)
-
-libsciintersci_la_CPPFLAGS = -I$(top_srcdir)/libs/MALLOC/includes/ \
+libsciintersci_la_CPPFLAGS = \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(srcdir)/includes/ \
                 -I$(top_srcdir)/modules/string/includes/ \
index 8423a80..5ed05ac 100644 (file)
@@ -451,7 +451,7 @@ libsciintersci_la_include_HEADERS = includes/libinter.h
 @MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libsciintersci.la
 intersci_SOURCES = $(INTERSCI_EXE_C_SOURCES)
 libsciintersci_la_SOURCES = $(INTERSCI_LIB_C_SOURCES)
-libsciintersci_la_CPPFLAGS = -I$(top_srcdir)/libs/MALLOC/includes/ \
+libsciintersci_la_CPPFLAGS = \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(srcdir)/includes/ \
                 -I$(top_srcdir)/modules/string/includes/ \
index 86f4fd8..faf37ef 100644 (file)
@@ -42,7 +42,6 @@ sci_gateway/fortran/intfile.f
 
 libsciio_la_CPPFLAGS = -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/core/includes/ \
                        -I$(top_srcdir)/modules/fileio/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
index 5270817..d61db07 100644 (file)
@@ -480,7 +480,6 @@ sci_gateway/fortran/intfile.f
 
 libsciio_la_CPPFLAGS = -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/core/includes/ \
                        -I$(top_srcdir)/modules/fileio/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
index 0a9e629..aae25db 100644 (file)
@@ -46,7 +46,6 @@ libjavasci2_la_CPPFLAGS = -I$(srcdir)/includes/ \
                        $(JAVA_JNI_INCLUDE) \
                        $(TCL_INC_PATH) \
                        $(TK_INC_PATH) \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/tclsci/includes/ \
                        -I$(top_srcdir)/modules/call_scilab/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
@@ -56,7 +55,6 @@ libjavasci2_la_CPPFLAGS = -I$(srcdir)/includes/ \
                        $(AM_CPPFLAGS)
 
 libjavasci2_la_LIBADD = \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
        $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
        $(top_builddir)/modules/libscilab.la
 
index aa027c6..0d8945e 100644 (file)
@@ -139,9 +139,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libjavasci2_la_etcdir)" \
        "$(DESTDIR)$(libjavasci2_la_rootdir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
-@JAVASCI_TRUE@libjavasci2_la_DEPENDENCIES =  \
-@JAVASCI_TRUE@ $(top_builddir)/libs/MALLOC/libscimalloc.la \
-@JAVASCI_TRUE@ $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
+@JAVASCI_TRUE@libjavasci2_la_DEPENDENCIES = $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
 @JAVASCI_TRUE@ $(top_builddir)/modules/libscilab.la
 am__libjavasci2_la_SOURCES_DIST = src/jni/call_scilab_wrap.c \
        src/jni/putLists.c src/c/javasci2_helper.c
@@ -459,7 +457,6 @@ libjavasci2_la_etc_DATA = etc/javasci.quit etc/javasci.start
 @JAVASCI_TRUE@                 $(JAVA_JNI_INCLUDE) \
 @JAVASCI_TRUE@                 $(TCL_INC_PATH) \
 @JAVASCI_TRUE@                 $(TK_INC_PATH) \
-@JAVASCI_TRUE@                 -I$(top_srcdir)/libs/MALLOC/includes/ \
 @JAVASCI_TRUE@                 -I$(top_srcdir)/modules/tclsci/includes/ \
 @JAVASCI_TRUE@                 -I$(top_srcdir)/modules/call_scilab/includes/ \
 @JAVASCI_TRUE@                 -I$(top_srcdir)/modules/api_scilab/includes/ \
@@ -469,7 +466,6 @@ libjavasci2_la_etc_DATA = etc/javasci.quit etc/javasci.start
 @JAVASCI_TRUE@                 $(AM_CPPFLAGS)
 
 @JAVASCI_TRUE@libjavasci2_la_LIBADD = \
-@JAVASCI_TRUE@ $(top_builddir)/libs/MALLOC/libscimalloc.la \
 @JAVASCI_TRUE@ $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
 @JAVASCI_TRUE@ $(top_builddir)/modules/libscilab.la
 
index 3c403d7..3dffcd4 100644 (file)
@@ -26,7 +26,6 @@ libscijvm_la_etc_DATA = etc/jvm.quit etc/jvm.start
 
 
 libscijvm_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/dynamic_link/includes/ \
                        -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c \
@@ -102,7 +101,6 @@ src/c/getJvmOptions.c
 
 libscijvm_disable_la_SOURCES = src/nojvm/nojvm.c
 libscijvm_disable_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/call_scilab/includes/ \
                        -I$(srcdir)/src/c \
                        -I$(top_srcdir)/modules/localization/includes/ \
index 8f37c86..eb0b286 100644 (file)
@@ -475,7 +475,6 @@ libscijvm_la_root_DATA = license.txt
 libscijvm_la_etcdir = $(mydatadir)/etc
 libscijvm_la_etc_DATA = etc/jvm.quit etc/jvm.start
 libscijvm_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/dynamic_link/includes/ \
                        -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c \
@@ -540,7 +539,6 @@ src/c/getJvmOptions.c
 
 libscijvm_disable_la_SOURCES = src/nojvm/nojvm.c
 libscijvm_disable_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/call_scilab/includes/ \
                        -I$(srcdir)/src/c \
                        -I$(top_srcdir)/modules/localization/includes/ \
index b7b3c70..32888da 100644 (file)
@@ -90,7 +90,6 @@ GATEWAY_FORTRAN_SOURCES =
 
 libscilinear_algebra_la_CPPFLAGS = -I$(srcdir)/includes/ \
 -I$(srcdir)/src/c/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
 -I$(top_srcdir)/modules/dynamic_link/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
index 3a90c97..d141028 100644 (file)
@@ -559,7 +559,6 @@ sci_gateway/c/sci_zheev.c
 GATEWAY_FORTRAN_SOURCES = 
 libscilinear_algebra_la_CPPFLAGS = -I$(srcdir)/includes/ \
 -I$(srcdir)/src/c/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
 -I$(top_srcdir)/modules/dynamic_link/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
index 74e9373..f4464a8 100644 (file)
@@ -36,7 +36,6 @@ sci_gateway/c/sci_setdefaultlanguage.c
 libscilocalization_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                                -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/string/includes/ \
                                -I$(top_srcdir)/modules/fileio/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
index b0cf7c7..8b32c4f 100644 (file)
@@ -484,7 +484,6 @@ sci_gateway/c/sci_setdefaultlanguage.c
 libscilocalization_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                                -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/string/includes/ \
                                -I$(top_srcdir)/modules/fileio/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
index 912e484..003a38c 100644 (file)
@@ -47,7 +47,6 @@ endif
 libscimatio_la_CPPFLAGS = -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c/ \
                        -I$(srcdir)/src/matio/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        -I$(top_srcdir)/modules/string/includes/ \
index f65ef8c..12acb8d 100644 (file)
@@ -570,7 +570,6 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 libscimatio_la_CPPFLAGS = -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c/ \
                        -I$(srcdir)/src/matio/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        -I$(top_srcdir)/modules/string/includes/ \
index 6ebb3e1..6cbdd00 100644 (file)
@@ -7,7 +7,6 @@ MEXLIB_C_SOURCES = src/c/mexlib.c \
 src/c/sci_gateway.c
 
 MEXLIB_FLAGS = -I$(srcdir)/includes/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/call_scilab/includes/ \
 -I$(top_srcdir)/modules/elementary_functions/includes/ \
 -I$(top_srcdir)/modules/localization/includes/ \
index 93a461e..1660f71 100644 (file)
@@ -435,7 +435,6 @@ MEXLIB_C_SOURCES = src/c/mexlib.c \
 src/c/sci_gateway.c
 
 MEXLIB_FLAGS = -I$(srcdir)/includes/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/call_scilab/includes/ \
 -I$(top_srcdir)/modules/elementary_functions/includes/ \
 -I$(top_srcdir)/modules/localization/includes/ \
index 4a7b318..27d8f1a 100644 (file)
@@ -118,7 +118,6 @@ sci_gateway/fortran/Ex-fsolve.f \
 sci_gateway/fortran/Ex-lsqrsolve.f
 
 libscioptimization_la_CPPFLAGS = -I$(srcdir)/includes/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
 -I$(top_srcdir)/modules/localization/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
index 9d441c2..c4b45f1 100644 (file)
@@ -572,7 +572,6 @@ sci_gateway/fortran/Ex-fsolve.f \
 sci_gateway/fortran/Ex-lsqrsolve.f
 
 libscioptimization_la_CPPFLAGS = -I$(srcdir)/includes/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
 -I$(top_srcdir)/modules/localization/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
index 0c403dc..4d0a08f 100644 (file)
@@ -61,7 +61,7 @@ GATEWAY_C_SOURCES = sci_gateway/c/gw_output_stream.c \
 GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/intprint.f \
                        sci_gateway/fortran/intdisp.f
 
-libscioutput_stream_la_CPPFLAGS=  -I$(top_srcdir)/libs/MALLOC/includes/ \
+libscioutput_stream_la_CPPFLAGS= \
 -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/core/includes/ \
 -I$(srcdir)/src/cpp/ \
index 149d7b3..e6edac9 100644 (file)
@@ -535,7 +535,7 @@ GATEWAY_C_SOURCES = sci_gateway/c/gw_output_stream.c \
 GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/intprint.f \
                        sci_gateway/fortran/intdisp.f
 
-libscioutput_stream_la_CPPFLAGS = -I$(top_srcdir)/libs/MALLOC/includes/ \
+libscioutput_stream_la_CPPFLAGS = \
 -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/core/includes/ \
 -I$(srcdir)/src/cpp/ \
index 2264733..d7e289a 100644 (file)
@@ -17,7 +17,6 @@ GATEWAY_C_SOURCES = sci_gateway/c/gw_parallel.c \
 sci_gateway/c/sci_parallel_concurrency.c
 
 libsciparallel_la_CPPFLAGS= $(OPENMP_CPPFLAGS) \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/core/includes/ \
 -I$(srcdir)/src/cpp/ \
index 87bfcbe..7de688a 100644 (file)
@@ -449,7 +449,6 @@ GATEWAY_C_SOURCES = sci_gateway/c/gw_parallel.c \
 sci_gateway/c/sci_parallel_concurrency.c
 
 libsciparallel_la_CPPFLAGS = $(OPENMP_CPPFLAGS) \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/core/includes/ \
 -I$(srcdir)/src/cpp/ \
index 8bc048b..972411e 100644 (file)
@@ -15,7 +15,6 @@ libsciparameters_la_CPPFLAGS=-I$(srcdir)/includes/ \
 -I$(srcdir)/src/c/ \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
 -I$(top_srcdir)/modules/core/includes/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
 -I$(top_srcdir)/modules/localization/includes/ \
 $(AM_CPPFLAGS) 
index 5644d05..f3ebef7 100644 (file)
@@ -426,7 +426,6 @@ libsciparameters_la_CPPFLAGS = -I$(srcdir)/includes/ \
 -I$(srcdir)/src/c/ \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
 -I$(top_srcdir)/modules/core/includes/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
 -I$(top_srcdir)/modules/localization/includes/ \
 $(AM_CPPFLAGS) 
index bb3baf7..40c5514 100644 (file)
@@ -101,7 +101,6 @@ sci_gateway/fortran/sci_f_simpmd.f
 
 
 libscipolynomials_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
index 3d2493b..3ddee1a 100644 (file)
@@ -560,7 +560,6 @@ sci_gateway/fortran/sci_f_sfact.f \
 sci_gateway/fortran/sci_f_simpmd.f
 
 libscipolynomials_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
index 6ca5677..b465762 100644 (file)
@@ -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/ \
index 5bc2e04..bc140b4 100644 (file)
@@ -516,7 +516,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/ \
index 24a25a6..54d918b 100644 (file)
@@ -43,7 +43,6 @@ GATEWAY_C_SOURCES = sci_gateway/c/gw_randlib.c \
 sci_gateway/c/sci_grand.c
 
 libscirandlib_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
index dfe7ba1..d7995cd 100644 (file)
@@ -476,7 +476,6 @@ GATEWAY_C_SOURCES = sci_gateway/c/gw_randlib.c \
 sci_gateway/c/sci_grand.c
 
 libscirandlib_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
index a299191..136f92f 100644 (file)
@@ -38,7 +38,6 @@ libscirenderer_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                                -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/cpp/ \
                                -I$(srcdir)/src/jni/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
                                -I$(top_srcdir)/modules/jvm/includes/ \
                                -I$(top_srcdir)/modules/commons/src/jni \
index 2724cc0..7a61748 100644 (file)
@@ -456,7 +456,6 @@ libscirenderer_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                                -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/cpp/ \
                                -I$(srcdir)/src/jni/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
                                -I$(top_srcdir)/modules/jvm/includes/ \
                                -I$(top_srcdir)/modules/commons/src/jni \
index 038b6c0..abfd913 100644 (file)
@@ -109,7 +109,6 @@ sci_gateway/fortran/sci_f_vec2var.f
 
 libsciscicos_la_CPPFLAGS= -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        -I$(top_srcdir)/modules/graphics/includes/ \
                        -I$(top_srcdir)/modules/dynamic_link/includes/ \
index f8222be..bc80441 100644 (file)
@@ -944,7 +944,6 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 #CLEANFILES=includes/blocks.h build/Cblocknames build/Fblocknames
 @XCOS_TRUE@libsciscicos_la_CPPFLAGS = -I$(srcdir)/includes/ \
 @XCOS_TRUE@                    -I$(srcdir)/src/c/ \
-@XCOS_TRUE@                    -I$(top_srcdir)/libs/MALLOC/includes/ \
 @XCOS_TRUE@                    -I$(top_srcdir)/modules/output_stream/includes/ \
 @XCOS_TRUE@                    -I$(top_srcdir)/modules/graphics/includes/ \
 @XCOS_TRUE@                    -I$(top_srcdir)/modules/dynamic_link/includes/ \
index ab38740..28ff875 100644 (file)
@@ -411,7 +411,6 @@ libsciscicos_blocks_la_CPPFLAGS= -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c/ \
                        -I$(srcdir)/src/cpp/ \
                        -I$(srcdir)/src/jni/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
                        -I$(top_srcdir)/modules/commons/src/jni/ \
                        -I$(top_srcdir)/modules/elementary_functions/includes/ \
index aaff6f4..ef399a7 100644 (file)
@@ -1384,7 +1384,6 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 @XCOS_TRUE@                    -I$(srcdir)/src/c/ \
 @XCOS_TRUE@                    -I$(srcdir)/src/cpp/ \
 @XCOS_TRUE@                    -I$(srcdir)/src/jni/ \
-@XCOS_TRUE@                    -I$(top_srcdir)/libs/MALLOC/includes/ \
 @XCOS_TRUE@                    -I$(top_srcdir)/modules/api_scilab/includes/ \
 @XCOS_TRUE@                    -I$(top_srcdir)/modules/commons/src/jni/ \
 @XCOS_TRUE@                    -I$(top_srcdir)/modules/elementary_functions/includes/ \
index ca66064..5faafa1 100644 (file)
@@ -45,7 +45,6 @@ libsciscinotes_la_CPPFLAGS = -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/api_scilab/includes/ \
     -I$(top_srcdir)/modules/commons/src/jni/ \
     -I$(top_srcdir)/modules/core/includes/ \
index 138a18d..df7f089 100644 (file)
@@ -488,7 +488,6 @@ libsciscinotes_la_CPPFLAGS = -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/api_scilab/includes/ \
     -I$(top_srcdir)/modules/commons/src/jni/ \
     -I$(top_srcdir)/modules/core/includes/ \
index fbd5b99..f00803d 100644 (file)
@@ -90,7 +90,6 @@ sci_gateway/fortran/Ex-corr.f
 
 libscisignal_processing_la_CPPFLAGS = -I$(srcdir)/includes/ \
 -I$(srcdir)/src/c/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
 -I$(top_srcdir)/modules/localization/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
index 0a3a885..9619c8f 100644 (file)
@@ -544,7 +544,6 @@ sci_gateway/fortran/Ex-corr.f
 
 libscisignal_processing_la_CPPFLAGS = -I$(srcdir)/includes/ \
 -I$(srcdir)/src/c/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
 -I$(top_srcdir)/modules/localization/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
index 114702c..58d7d02 100644 (file)
@@ -10,7 +10,6 @@ sci_gateway/c/sci_PlaySound.c
 
 libscisound_la_CPPFLAGS=  -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
index 3de0a1e..d042566 100644 (file)
@@ -421,7 +421,6 @@ sci_gateway/c/sci_PlaySound.c
 
 libscisound_la_CPPFLAGS = -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
index aa0dc19..07f4123 100644 (file)
@@ -152,7 +152,6 @@ sci_gateway/fortran/sci_f_sfinit.f \
 sci_gateway/fortran/sci_f_ta2lpd.f
 
 libscisparse_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/elementary_functions/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
index 4ba2ac8..4018a5c 100644 (file)
@@ -619,7 +619,6 @@ sci_gateway/fortran/sci_f_sfinit.f \
 sci_gateway/fortran/sci_f_ta2lpd.f
 
 libscisparse_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/elementary_functions/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
index 3fa3fc5..4613e91 100644 (file)
@@ -41,7 +41,6 @@ sci_gateway/fortran/sci_f_calerf.f
 # Includes need for the compilation
 libscispecial_functions_la_CPPFLAGS = -I$(srcdir)/includes/ \
 -I$(srcdir)/src/c/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/core/src/c/ \
 -I$(top_srcdir)/modules/elementary_functions/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
index f208a7a..ab39d4f 100644 (file)
@@ -486,7 +486,6 @@ sci_gateway/fortran/sci_f_calerf.f
 # Includes need for the compilation
 libscispecial_functions_la_CPPFLAGS = -I$(srcdir)/includes/ \
 -I$(srcdir)/src/c/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/core/src/c/ \
 -I$(top_srcdir)/modules/elementary_functions/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
index ba20a0c..e299a16 100644 (file)
@@ -44,7 +44,6 @@ libscispreadsheet_la_CPPFLAGS = \
 -I$(srcdir)/includes/ \
 -I$(srcdir)/src/c/ \
 -I$(srcdir)/src/c/ripole \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/localization/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
 -I$(top_srcdir)/modules/io/includes/ \
index cf1b04b..0af4b90 100644 (file)
@@ -491,7 +491,6 @@ libscispreadsheet_la_CPPFLAGS = \
 -I$(srcdir)/includes/ \
 -I$(srcdir)/src/c/ \
 -I$(srcdir)/src/c/ripole \
--I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/localization/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
 -I$(top_srcdir)/modules/io/includes/ \
index 2ba9688..ab23917 100644 (file)
@@ -84,7 +84,6 @@ sci_gateway/c/sci_cdfnor.c
 
 libscistatistics_la_CPPFLAGS= -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
index 8ed5afc..700cb7f 100644 (file)
@@ -534,7 +534,6 @@ sci_gateway/c/sci_cdfnor.c
 
 libscistatistics_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
index 911752a..932cdcf 100644 (file)
@@ -69,7 +69,6 @@ sci_gateway/fortran/strops.f
 
 libscistring_la_CPPFLAGS = -I$(srcdir)/src/c \
        -I$(srcdir)/includes/ \
-       -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/modules/functions/includes/ \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/localization/includes/ \
index 5564199..02d88b5 100644 (file)
@@ -539,7 +539,6 @@ sci_gateway/fortran/strops.f
 
 libscistring_la_CPPFLAGS = -I$(srcdir)/src/c \
        -I$(srcdir)/includes/ \
-       -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/modules/functions/includes/ \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/localization/includes/ \
index c3dc775..c09765e 100644 (file)
@@ -25,7 +25,6 @@ src/fortran/isnum.f \
 src/fortran/termf.f
 
 libscisymbolic_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
index 9fbf2bd..4d2d551 100644 (file)
@@ -453,7 +453,6 @@ src/fortran/isnum.f \
 src/fortran/termf.f
 
 libscisymbolic_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/localization/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
index 2f978e7..75519de 100644 (file)
@@ -52,7 +52,6 @@ libscitclsci_la_LDFLAGS = $(TCLTK_LIBS) $(AM_LDFLAGS)
 libscitclsci_la_CPPFLAGS= -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c \
                        -I$(srcdir)/sci_gateway/c/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        $(TCL_INC_PATH) \
                        $(TK_INC_PATH) \
                        -I$(top_srcdir)/modules/action_binding/includes/ \
index f726ca8..c4cb3cd 100644 (file)
@@ -509,7 +509,6 @@ libscitclsci_la_LDFLAGS = $(TCLTK_LIBS) $(AM_LDFLAGS)
 libscitclsci_la_CPPFLAGS = -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c \
                        -I$(srcdir)/sci_gateway/c/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        $(TCL_INC_PATH) \
                        $(TK_INC_PATH) \
                        -I$(top_srcdir)/modules/action_binding/includes/ \
index 47bcaee..966d827 100644 (file)
@@ -17,7 +17,6 @@ sci_gateway/c/sci_getdate.c \
 sci_gateway/c/gw_time.c
 
 libscitime_la_CPPFLAGS= -I$(srcdir)/includes/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(srcdir)/src/c/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
index d61803d..aa7d642 100644 (file)
@@ -444,7 +444,6 @@ sci_gateway/c/sci_getdate.c \
 sci_gateway/c/gw_time.c
 
 libscitime_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(srcdir)/src/c/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
index 0110497..fb1ac5f 100644 (file)
@@ -70,7 +70,6 @@ libsciui_data_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                        -I$(srcdir)/src/cpp/ \
                        -I$(srcdir)/src/c/ \
                        -I$(srcdir)/src/jni/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/jvm/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        -I$(top_srcdir)/modules/commons/src/jni \
index bfa5eea..8a1f726 100644 (file)
@@ -513,7 +513,6 @@ libsciui_data_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                        -I$(srcdir)/src/cpp/ \
                        -I$(srcdir)/src/c/ \
                        -I$(srcdir)/src/jni/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/jvm/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        -I$(top_srcdir)/modules/commons/src/jni \
index e10df14..96b10e8 100644 (file)
@@ -68,7 +68,6 @@ libsciumfpack_la_LIBADD =  libsciumfpack-algo.la
 
 libsciumfpack_la_CPPFLAGS= -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/dynamic_link/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
index b149323..c70c0dc 100644 (file)
@@ -522,7 +522,6 @@ libsciumfpack_la_etc_DATA = etc/umfpack.quit etc/umfpack.start
 
 @UMFPACK_TRUE@libsciumfpack_la_CPPFLAGS = -I$(srcdir)/includes/ \
 @UMFPACK_TRUE@                 -I$(srcdir)/src/c/ \
-@UMFPACK_TRUE@                 -I$(top_srcdir)/libs/MALLOC/includes/ \
 @UMFPACK_TRUE@                 -I$(top_srcdir)/modules/dynamic_link/includes/ \
 @UMFPACK_TRUE@                 -I$(top_srcdir)/modules/output_stream/includes/ \
 @UMFPACK_TRUE@                 -I$(top_srcdir)/modules/api_scilab/includes/ \
index 0d8f08f..9da7174 100644 (file)
@@ -9,7 +9,6 @@ WINDOWS_TOOLS_C_SOURCES = src/nowindows_tools/nowindows_tools.c
 # Includes need for the compilation
 libsciwindows_tools_la_CPPFLAGS=  -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                $(AM_CPPFLAGS)
index 0940c0a..8ffeb29 100644 (file)
@@ -425,7 +425,6 @@ WINDOWS_TOOLS_C_SOURCES = src/nowindows_tools/nowindows_tools.c
 # Includes need for the compilation
 libsciwindows_tools_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                $(AM_CPPFLAGS)
index 0ddad61..a708ba0 100644 (file)
@@ -77,7 +77,6 @@ libscixcos_la_CPPFLAGS = \
                        -I$(srcdir)/src/jni/ \
                        -I$(srcdir)/src/cpp/ \
                        -I$(srcdir)/src/c/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/jvm/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        -I$(top_srcdir)/modules/commons/src/jni/ \
index 965fc44..06cd3af 100644 (file)
@@ -525,7 +525,6 @@ libscixcos_la_CPPFLAGS = \
                        -I$(srcdir)/src/jni/ \
                        -I$(srcdir)/src/cpp/ \
                        -I$(srcdir)/src/c/ \
-                       -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/modules/jvm/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        -I$(top_srcdir)/modules/commons/src/jni/ \
index f2ba347..47254d2 100644 (file)
@@ -86,7 +86,6 @@ GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_xmlRead.cpp \
 libscixml_la_CPPFLAGS = -I$(srcdir)/includes/ \
     -I$(srcdir)/src/cpp/ \
     -I$(srcdir)/src/c/ \
-    -I$(top_srcdir)/libs/MALLOC/includes/ \
     -I$(top_srcdir)/modules/core/includes/ \
     -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/localization/includes/ \
index 6216c91..2b8ef36 100644 (file)
@@ -621,7 +621,6 @@ GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_xmlRead.cpp \
 libscixml_la_CPPFLAGS = -I$(srcdir)/includes/ \
     -I$(srcdir)/src/cpp/ \
     -I$(srcdir)/src/c/ \
-    -I$(top_srcdir)/libs/MALLOC/includes/ \
     -I$(top_srcdir)/modules/core/includes/ \
     -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/localization/includes/ \