From 0887e0eabb0b8609f91b3a00b4cc189b6ce89e5c Mon Sep 17 00:00:00 2001 From: jroy Date: Tue, 22 Apr 2003 15:59:10 +0000 Subject: [PATCH] *** empty log message *** --- src/MED/Makefile.in | 6 +++--- src/MEDGUI/Makefile.in | 6 +++--- src/MEDMEM/Makefile.in | 2 +- src/MEDMEM_SWIG/Makefile.in | 4 ++-- src/MedCorba_Swig/Makefile.in | 8 ++++---- src/MedMem/Makefile.in | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/MED/Makefile.in b/src/MED/Makefile.in index 026ed61b2..ad8b18ca1 100644 --- a/src/MED/Makefile.in +++ b/src/MED/Makefile.in @@ -33,10 +33,10 @@ BIN_SRC = # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) -CXXFLAGS += $(OCC_CXXFLAGS) +CPPFLAGS += $(OCC_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome +CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS+= $(OCC_LIBS) $(HDF5_LIBS) -lSalomeContainer -lSalomeHDFPersist -lSalomeDS -lSalomeNS -lRegistry -lOpUtil -lmedmem -lMEDImpl +LDFLAGS+= $(OCC_LIBS) $(HDF5_LIBS) -lSalomeContainer -lSalomeHDFPersist -lSalomeDS -lSalomeNS -lRegistry -lOpUtil -lmedmem -lMEDImpl -L${KERNEL_ROOT_DIR}/lib MED.hh MEDSK.cc: MED.idl diff --git a/src/MEDGUI/Makefile.in b/src/MEDGUI/Makefile.in index 430dfb85c..21f07d70a 100644 --- a/src/MEDGUI/Makefile.in +++ b/src/MEDGUI/Makefile.in @@ -40,10 +40,10 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) -CXXFLAGS += +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome +CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += -lSalomeGUI -lmedmem -lMEDImpl -lMedEngine -lSMESHFiltersSelection +LDFLAGS += -lSalomeGUI -lmedmem -lMEDImpl -lMedEngine -lSMESHFiltersSelection -L${KERNEL_ROOT_DIR}/lib MED.hh MEDSK.cc: MED.idl diff --git a/src/MEDMEM/Makefile.in b/src/MEDMEM/Makefile.in index 8c2a08dd4..62a65865e 100644 --- a/src/MEDMEM/Makefile.in +++ b/src/MEDMEM/Makefile.in @@ -77,7 +77,7 @@ TEST_PROGS = test_MEDMEM_ModulusArray test_MEDMEM_Array test_MEDMEM_SkyLineArray CPPFLAGS+=$(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS+=-ftemplate-depth-42 -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -lSalomeLoggerServer +LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -lSalomeLoggerServer -L${KERNEL_ROOT_DIR}/lib # build create_mesh : bin: create_mesh create_mesh_c2q4s2 create_mesh_c3h8q4 create_mesh_c3h8q4_wrong create_mesh_c2q4s2_wrong diff --git a/src/MEDMEM_SWIG/Makefile.in b/src/MEDMEM_SWIG/Makefile.in index 3fb8b16a0..4d4b0a409 100644 --- a/src/MEDMEM_SWIG/Makefile.in +++ b/src/MEDMEM_SWIG/Makefile.in @@ -31,9 +31,9 @@ EXPORT_PYSCRIPTS = libMEDMEM_Swig.py med_test1.py med_test2.py med_test3.py ############################################################################# -CPPFLAGS+= $(PYTHON_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) +CPPFLAGS+= $(PYTHON_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS=-g -D_DEBUG_ -D__x86__ -D__linux__ -CXXFLAGS+=-ftemplate-depth-42 +CXXFLAGS+=-ftemplate-depth-42 -I${KERNEL_ROOT_DIR}/include/salome LIBS= $(PYTHON_LIBS) LDFLAGS+= -lmedmem $(MED2_LIBS) $(HDF5_LIBS) diff --git a/src/MedCorba_Swig/Makefile.in b/src/MedCorba_Swig/Makefile.in index a33f0e2ed..8647b32d3 100644 --- a/src/MedCorba_Swig/Makefile.in +++ b/src/MedCorba_Swig/Makefile.in @@ -28,11 +28,11 @@ EXPORT_PYSCRIPTS = libMedCorba_Swig.py medcorba_test.py batchmode_medcorba_test. ############################################################################# -CPPFLAGS+= $(PYTHON_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) -CXXFLAGS=-g -D_DEBUG_ -D__x86__ -D__linux__ -CXXFLAGS+=-ftemplate-depth-42 +CPPFLAGS+= $(PYTHON_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome +CXXFLAGS=-g -D_DEBUG_ -D__x86__ -D__linux__ +CXXFLAGS+=-ftemplate-depth-42 -I${KERNEL_ROOT_DIR}/include/salome LIBS= $(PYTHON_LIBS) -LDFLAGS+= -lMEDImpl -lMEDMEM_Swigcmodule +LDFLAGS+= -lMEDImpl -lMEDMEM_Swigcmodule -L${KERNEL_ROOT_DIR}/lib ############################################################################# diff --git a/src/MedMem/Makefile.in b/src/MedMem/Makefile.in index ce962e89e..ec39fa223 100644 --- a/src/MedMem/Makefile.in +++ b/src/MedMem/Makefile.in @@ -44,9 +44,9 @@ BIN_SERVER_IDL = BIN_CLIENT_IDL = -CPPFLAGS+= $(MED2_INCLUDES) $(HDF5_INCLUDES) -CXXFLAGS=-g -D_DEBUG_ -D__x86__ -D__linux__ -LDFLAGS+=-lmedmem -lOpUtil +CPPFLAGS+= $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome +CXXFLAGS=-g -D_DEBUG_ -D__x86__ -D__linux__ -I${KERNEL_ROOT_DIR}/include/salome +LDFLAGS+=-lmedmem -lOpUtil -L${KERNEL_ROOT_DIR}/lib #LDFLAGS+=-lmedmem -L. -lSalomeContainer -lSalomeNS -lRegistry -lOpUtil -lSalomeNotification # does we put only -lSalomeContainer and compiler retrieves -lSalomeNS -lRegistry -lOpUtil ???? -- 2.39.2