From: eap <eap@opencascade.com>
Date: Tue, 25 Apr 2006 13:14:52 +0000 (+0000)
Subject: Second merge from OCC_debug_for_3_2_0b1
X-Git-Tag: T3_2_0b1_pre1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ab94409a72260a5ef108027a22e77ce31bd7e8db;p=tools%2Fmedcoupling.git

Second merge from OCC_debug_for_3_2_0b1
---

diff --git a/doc/MEDMEM/Makefile.in b/doc/MEDMEM/Makefile.in
index ede100006..c93a675cb 100644
--- 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=