From a8cb6dca5a1b109513a604378406cf758bfc2b30 Mon Sep 17 00:00:00 2001 From: nadir Date: Fri, 4 Nov 2005 09:51:51 +0000 Subject: [PATCH] Commit changes after trying to use the MED module as a stand alone one. Practically linking with SALOMEBasics KERNEL Library should be done when $MED_WITH_KERNEL is equal to yes. The Med Module should be tested even in a stand alone configuration (ie without-kernel). --- src/INTERPOLATION/Makefile.in | 4 ++-- src/MEDMEM/Makefile.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/INTERPOLATION/Makefile.in b/src/INTERPOLATION/Makefile.in index 250f2a56a..da0fbfd98 100644 --- a/src/INTERPOLATION/Makefile.in +++ b/src/INTERPOLATION/Makefile.in @@ -85,7 +85,7 @@ CXXFLAGS+=-U_DEBUG_ @CXXTMPDPTHFLAGS@ LDFLAGS+=-lm $(MED2_LIBS) $(HDF5_LIBS) -lMEDWrapper_V2_1 #LDFLAGSFORBIN+=$(MED2_LIBS) $(HDF5_LIBS) -L../.libs -lmedmem -LDFLAGSFORBIN+=-lm $(MED2_LIBS) $(HDF5_LIBS) -L../.libs -lmedmem -lMEDWrapper_V2_1 -lMEDWrapperBase -lSALOMEBasics +LDFLAGSFORBIN+=-lm $(MED2_LIBS) $(HDF5_LIBS) -L../.libs -lmedmem -lMEDWrapper_V2_1 -lMEDWrapperBase ifeq ($(MED_WITH_KERNEL),yes) CPPFLAGS+= -I${KERNEL_ROOT_DIR}/include/salome @@ -94,7 +94,7 @@ ifeq ($(MED_WITH_KERNEL),yes) LDFLAGS+= -lSALOMELocalTrace -L${KERNEL_ROOT_DIR}/lib/salome #LDFLAGSFORBIN+= -lSalomeLoggerServer -L${KERNEL_ROOT_DIR}/lib/salome - LDFLAGSFORBIN+= -lSALOMELocalTrace -L${KERNEL_ROOT_DIR}/lib/salome + LDFLAGSFORBIN+= -lSALOMELocalTrace -lSALOMEBasics -L${KERNEL_ROOT_DIR}/lib/salome endif LIBSFORBIN= diff --git a/src/MEDMEM/Makefile.in b/src/MEDMEM/Makefile.in index 1f25a87fe..fb0adfb84 100644 --- a/src/MEDMEM/Makefile.in +++ b/src/MEDMEM/Makefile.in @@ -145,13 +145,13 @@ LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -lMEDWrapper_V2_1 $(STDLIB) #LDFLAGSFORBIN+=$(MED2_LIBS) $(HDF5_LIBS) # change motivated by the bug KERNEL4778. -LDFLAGSFORBIN+=-lm $(MED2_LIBS) $(HDF5_LIBS) -lMEDWrapper_V2_1 -lMEDWrapperBase -lSALOMEBasics +LDFLAGSFORBIN+=-lm $(MED2_LIBS) $(HDF5_LIBS) -lMEDWrapper_V2_1 -lMEDWrapperBase ifeq ($(MED_WITH_KERNEL),yes) CPPFLAGS+= -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS+= -I${KERNEL_ROOT_DIR}/include/salome LDFLAGS+= -lSALOMELocalTrace -L${KERNEL_ROOT_DIR}/lib/salome - LDFLAGSFORBIN+= -lSALOMELocalTrace -L${KERNEL_ROOT_DIR}/lib/salome + LDFLAGSFORBIN+= -lSALOMELocalTrace -lSALOMEBasics -L${KERNEL_ROOT_DIR}/lib/salome endif LIBSFORBIN= -- 2.39.2