NRI : Merge from V1_2.

diff --git a/configure.in.base b/configure.in.base
index cd4445d7a1c2d70c8bae809fd81a267e480b679f..0c666c610193db3b1b2a044616c4ef2a2d91e185 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -280,7 +280,7 @@ echo ---------------------------------------------
 echo
 
 echo Configure
-variables="cc_ok lex_yacc_ok python_ok java_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok mico_ok occ_ok qwt_ok doxygen_ok graphviz_ok Kernel_ok Med_ok"
+variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok occ_ok qwt_ok doxygen_ok graphviz_ok Kernel_ok Med_ok"
 
 for var in $variables
 do

diff --git a/src/VISUGUI/Makefile.in b/src/VISUGUI/Makefile.in
index f6e08af4049f7048a38f9c38920b6e8d9e5c6600..414d38a7e7d6a9967f6f870e227320606b507c58 100644 (file)
--- a/src/VISUGUI/Makefile.in
+++ b/src/VISUGUI/Makefile.in
@@ -101,11 +101,15 @@ LIB_SERVER_IDL =
 
 # additionnal information to compil and link file
 
-CPPFLAGS +=  -ftemplate-depth-32 $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) $(QWT_INCLUDES)
-CXXFLAGS +=  -ftemplate-depth-32 $(OCC_CXXFLAGS)
+CPPFLAGS +=  -ftemplate-depth-32 $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) $(QWT_INCLUDES) \
+       -I${KERNEL_ROOT_DIR}/include/salome
+
+CXXFLAGS +=  -ftemplate-depth-32 $(OCC_CXXFLAGS) \
+       -I${KERNEL_ROOT_DIR}/include/salome
+
 
 LDFLAGS += $(MED2_LIBS) $(HDF5_LIBS) $(VTK_LIBS) $(QWT_LIBS) -lSalomeGUI -lSalomeNS \
-       -lVisuObject -lVISUEngine -lmed -lVTKViewer -L${KERNEL_ROOT_DIR}/lib/salome
+       -lVisuObject -lVISUEngine -lmed -lVTKViewer -L${KERNEL_ROOT_DIR}/lib/salome -L${KERNEL_ROOT_DIR}/lib/salome
 
 
 @CONCLUDE@

diff --git a/src/VISU_I/Makefile.in b/src/VISU_I/Makefile.in
index 3de2fe60c2d481890e558c14acb196ae0fcf994c..3be2f51f7b509d4097aaa38e26b4c056cdc67fc8 100644 (file)
--- a/src/VISU_I/Makefile.in
+++ b/src/VISU_I/Makefile.in
@@ -16,7 +16,7 @@ VPATH=.:@srcdir@:@top_srcdir@/idl
 @COMMENCE@
 
 # Libraries targets
-LIB = libVisuEngine.la
+LIB = libVISUEngine.la
 LIB_SRC = VISU_Gen_i.cc VISU_Result_i.cc \
        VISU_PrsObject_i.cc VISU_ViewManager_i.cc VISU_Table_i.cc \
        VISU_Extractor.cxx VISU_FieldTransform.cxx \
@@ -41,14 +41,16 @@ EXPORT_HEADERS = VISUConfig.hh VISU_Gen_i.hh VISU_Result_i.hh \
        VISU_Extractor.hxx VISU_FieldTransform.hxx VISU_Convertor.hxx \
        VISU_TimeAnimation.h
 # additionnal information to compil and link file
+
 CPPFLAGS += -ftemplate-depth-32 $(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) \
        $(MED2_INCLUDES) $(HDF5_INCLUDES) $(QWT_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
-LDFLAGS  += $(QT_MT_LIBS) $(VTK_LIBS) $(QWT_LIBS) -lSalomeNS -lSalomeDS \
+LDFLAGS  += $(QT_MT_LIBS) $(VTK_LIBS) $(QWT_LIBS) -lSalomeNS -lSalomeDS -lTOOLSDS -lSalomeHDFPersist \
        -lSalomeContainer -lOpUtil -lSalomeGUI -lVTKViewer -lVisuObject \
        -L${KERNEL_ROOT_DIR}/lib/salome
 
 LIBS+= $(PYTHON_LIBS) $(MED2_LIBS) $(HDF5_LIBS) -lPlot2d -lSalomeHDFPersist -lSalomeLoggerServer -lRegistry -lqsplitterP -lSalomeLifeCycleCORBA -lSalomeObject -lSalomeNotification -L${KERNEL_ROOT_DIR}/lib/salome
 
+
 # additional file to be cleaned
 MOSTLYCLEAN =
 CLEAN =