Second merge from OCC_debug_for_3_2_0b1

diff --git a/doc/MEDMEM/Makefile.in b/doc/MEDMEM/Makefile.in
index ede1000062632122b6677399cff01840eed5923e..c93a675cb9fe88ae7f66577f8888796dd1d90ca6 100644 (file)
--- a/doc/MEDMEM/Makefile.in
+++ b/doc/MEDMEM/Makefile.in
@@ -15,16 +15,16 @@ doxygen=@DOXYGEN@
 # Executables targets
 BIN = MESHgeneral MESHcoordinates MESHconnectivities MESHINGexample FIELDcreate FIELDgeneral MEDMEM_InvokingDriverByAttachingItToAnObject MEDMEM_InvokingDriverFromStandardObjectMethod MEDMEM_InvokingDriverAtObjectCreationTime 
 
-CPPFLAGS+=$(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_CXXFLAGS}
+CPPFLAGS+=$(MED2_INCLUDES) $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS)
 
-CXXFLAGS+=-ftemplate-depth-42 -I${KERNEL_CXXFLAGS}
+CXXFLAGS+=-ftemplate-depth-42 $(KERNEL_CXXFLAGS)
 
 # change motivated by the bug KERNEL4778.
-#LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -lSalomeLoggerServer ${KERNEL_LDFLAGS}
-LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) ${KERNEL_LDFLAGS}
+#LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -lSalomeLoggerServer $(KERNEL_LDFLAGS)
+LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) $(KERNEL_LDFLAGS)
 
-#LDFLAGSFORBIN+=$(MED2_LIBS) $(HDF5_LIBS) -lSalomeLoggerServer ${KERNEL_LDFLAGS} -lmedmem
-LDFLAGSFORBIN+=$(MED2_LIBS) $(HDF5_LIBS) -lSALOMELocalTrace ${KERNEL_LDFLAGS} -lmedmem
+#LDFLAGSFORBIN+=$(MED2_LIBS) $(HDF5_LIBS) -lSalomeLoggerServer $(KERNEL_LDFLAGS) -lmedmem
+LDFLAGSFORBIN+=$(MED2_LIBS) $(HDF5_LIBS) -lSALOMELocalTrace $(KERNEL_LDFLAGS) -lmedmem
 
 LIBSFORBIN=