From aa391aa375b35b3aca71ab347258cbb31e217bb2 Mon Sep 17 00:00:00 2001 From: enk Date: Thu, 25 May 2006 13:33:52 +0000 Subject: [PATCH] Porting to 64bit platform --- adm_local/unix/config_files/check_GEOM.m4 | 9 ++++++++ adm_local/unix/make_commence.in | 27 +++++++++++++---------- configure.in.base | 2 +- idl/Makefile.in | 4 +++- src/ARCHIMEDE/Makefile.in | 6 ++--- src/BREPExport/Makefile.in | 6 ++--- src/BREPImport/Makefile.in | 6 ++--- src/BasicGUI/Makefile.in | 4 ++-- src/BlocksGUI/Makefile.in | 4 ++-- src/BooleanGUI/Makefile.in | 4 ++-- src/BuildGUI/Makefile.in | 4 ++-- src/DisplayGUI/Makefile.in | 4 ++-- src/DlgRef/Makefile.in | 6 ++--- src/EntityGUI/Makefile.in | 4 ++-- src/GEOM/Makefile.in | 6 ++--- src/GEOMAlgo/Makefile.in | 6 ++--- src/GEOMBase/Makefile.in | 6 ++--- src/GEOMClient/Makefile.in | 6 ++--- src/GEOMContext/Makefile.in | 6 ++--- src/GEOMFiltersSelection/Makefile.in | 6 ++--- src/GEOMGUI/Makefile.in | 6 ++--- src/GEOMImpl/Makefile.in | 25 +++------------------ src/GEOMToolsGUI/Makefile.in | 6 ++--- src/GEOM_I/Makefile.in | 6 ++--- src/GEOM_I_Superv/Makefile.in | 6 ++--- src/GenerationGUI/Makefile.in | 4 ++-- src/GroupGUI/Makefile.in | 4 ++-- src/IGESExport/Makefile.in | 6 ++--- src/IGESImport/Makefile.in | 6 ++--- src/MeasureGUI/Makefile.in | 4 ++-- src/NMTAlgo/Makefile.in | 6 ++--- src/NMTDS/Makefile.in | 6 ++--- src/NMTTools/Makefile.in | 6 ++--- src/OBJECT/Makefile.in | 6 ++--- src/OperationGUI/Makefile.in | 4 ++-- src/PARTITION/Makefile.in | 6 ++--- src/PrimitiveGUI/Makefile.in | 4 ++-- src/RepairGUI/Makefile.in | 4 ++-- src/SKETCHER/Makefile.in | 6 ++--- src/STEPExport/Makefile.in | 6 ++--- src/STEPImport/Makefile.in | 6 ++--- src/ShHealOper/Makefile.in | 4 ++-- src/TransformationGUI/Makefile.in | 4 ++-- 43 files changed, 131 insertions(+), 136 deletions(-) diff --git a/adm_local/unix/config_files/check_GEOM.m4 b/adm_local/unix/config_files/check_GEOM.m4 index 803ca754b..c4ce644f7 100644 --- a/adm_local/unix/config_files/check_GEOM.m4 +++ b/adm_local/unix/config_files/check_GEOM.m4 @@ -9,6 +9,9 @@ AC_CHECKING(for Geom) Geom_ok=no +GEOM_LDFLAGS="" +GEOM_CXXFLAGS="" + AC_ARG_WITH(geom, [ --with-geom=DIR root directory path of GEOM installation ], GEOM_DIR="$withval",GEOM_DIR="") @@ -44,6 +47,12 @@ if test -f ${GEOM_DIR}/bin/salome/libGEOM_Swig.py ; then fi AC_SUBST(GEOM_ROOT_DIR) + GEOM_LDFLAGS=-L${GEOM_DIR}/lib${LIB_LOCATION_SUFFIX}/salome + GEOM_CXXFLAGS=-I${GEOM_DIR}/include/salome + + AC_SUBST(GEOM_LDFLAGS) + AC_SUBST(GEOM_CXXFLAGS) + else AC_MSG_WARN("Cannot find compiled Geom module distribution") fi diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 3fca6a6d8..8805b6d6d 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -10,7 +10,7 @@ HAVE_SSTREAM=@HAVE_SSTREAM@ LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(top_builddir)/lib/salome +LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker # add libstdc++ to link c++ library with libtool ! LDFLAGS+= -lstdc++ @@ -51,8 +51,8 @@ PYTHONHOME = @PYTHONHOME@ PYTHON_INCLUDES = @PYTHON_INCLUDES@ PYTHON_LIBS = @PYTHON_LIBS@ PYTHON_VERSION = @PYTHON_VERSION@ -PYTHON_SITE = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages -PYTHON_SITE_INSTALL = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome +PYTHON_SITE = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages +PYTHON_SITE_INSTALL = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome # QT QT_ROOT = @QT_ROOT@ @@ -99,12 +99,6 @@ HDF5_MT_LIBS=@HDF5_MT_LIBS@ OCC_INCLUDES=@CAS_CPPFLAGS@ OCC_CXXFLAGS=@CAS_CXXFLAGS@ -#OCC_KERNEL_LIBS=@CAS_KERNEL@ -#OCC_OCAF_LIBS=@CAS_OCAF@ -#OCC_VIEWER_LIBS=@CAS_VIEWER@ -#OCC_MODELER_LIBS=@CAS_MODELER@ -#OCC_DATAEXCHANGE_LIBS=@CAS_DATAEXCHANGE@ -#OCC_LIBS=@CAS_LDFLAGS@ CAS_KERNEL=@CAS_KERNEL@ CAS_MATH=@CAS_MATH@ CAS_OCAF=@CAS_OCAF@ @@ -194,16 +188,25 @@ INSTALL_DATA=@INSTALL_DATA@ # create a symbolic link (or a copie ?) LN_S=@LN_S@ +KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@ +KERNEL_SITE_DIR=@KERNEL_SITE_DIR@ +KERNEL_LDFLAGS=@KERNEL_LDFLAGS@ +KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@ + +GUI_ROOT_DIR=@GUI_ROOT_DIR@ +GUI_LDFLAGS=@GUI_LDFLAGS@ +GUI_CXXFLAGS=@GUI_CXXFLAGS@ + ## Installation points prefix=@prefix@ exec_prefix=@exec_prefix@ -bindir=@bindir@/salome -libdir=@libdir@/salome +bindir=@exec_prefix@/bin/salome +libdir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/salome # warning : if user give this path in configure we could have salome/salome :-( includedir=@includedir@/salome datadir=@datadir@/salome idldir=${prefix}/idl/salome -sharedpydir=@libdir@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules +sharedpydir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules incmakedir=${prefix}/salome_adm/unix docdir=${prefix}/doc/salome diff --git a/configure.in.base b/configure.in.base index 7315b9d21..1a444a104 100644 --- a/configure.in.base +++ b/configure.in.base @@ -325,7 +325,7 @@ else fi # make other build directories -for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources idl +for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources idl do # if test ! -d $rep ; then # eval mkdir $rep diff --git a/idl/Makefile.in b/idl/Makefile.in index 4fe38075e..d0d961645 100644 --- a/idl/Makefile.in +++ b/idl/Makefile.in @@ -35,6 +35,8 @@ IDL_FILES = \ PY_CLIENT_IDL = $(IDL_FILES) +LIB_LOCATION_SUFFIX=@LIB_LOCATION_SUFFIX@ + # we copy all idl file in $(top_builddir)/idl inc: $(top_builddir)/idl/salome $(IDL_FILES:%=$(top_builddir)/idl/salome/%) @@ -48,7 +50,7 @@ $(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%) lib: pyidl -PYTHON_BUILD_SITE=$(top_builddir)/lib/python$(PYTHON_VERSION)/site-packages/@PACKAGE@ +PYTHON_BUILD_SITE=$(top_builddir)/lib$(LIB_LOCATION_SUFFIX)/python$(PYTHON_VERSION)/site-packages/@PACKAGE@ pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py) diff --git a/src/ARCHIMEDE/Makefile.in b/src/ARCHIMEDE/Makefile.in index a024382a5..ef74f1b3f 100644 --- a/src/ARCHIMEDE/Makefile.in +++ b/src/ARCHIMEDE/Makefile.in @@ -44,9 +44,9 @@ LIB_CLIENT_IDL = EXPORT_HEADERS = Archimede_VolumeSection.hxx # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(CAS_KERNEL) $(CAS_MODELER) -L${KERNEL_ROOT_DIR}/lib/salome +CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +LDFLAGS += $(CAS_KERNEL) $(CAS_MODELER) $(KERNEL_LDFLAGS) # additional file to be cleaned MOSTLYCLEAN = diff --git a/src/BREPExport/Makefile.in b/src/BREPExport/Makefile.in index 8983e67c6..c70334105 100644 --- a/src/BREPExport/Makefile.in +++ b/src/BREPExport/Makefile.in @@ -39,9 +39,9 @@ LIB = libBREPExport.la LIB_SRC = BREPExport.cxx # additionnal information to compil and link file -CPPFLAGS+= $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(CAS_LDPATH) -lTKBRep -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS+= $(CAS_LDPATH) -lTKBRep $(KERNEL_LDFLAGS) @CONCLUDE@ diff --git a/src/BREPImport/Makefile.in b/src/BREPImport/Makefile.in index cc76e0c58..b63257e56 100644 --- a/src/BREPImport/Makefile.in +++ b/src/BREPImport/Makefile.in @@ -37,9 +37,9 @@ LIB= libBREPImport.la LIB_SRC = BREPImport.cxx # additionnal information to compil and link file -CPPFLAGS+= $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(CAS_LDPATH) -lTKBRep -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS+= $(CAS_LDPATH) -lTKBRep $(KERNEL_LDFLAGS) @CONCLUDE@ diff --git a/src/BasicGUI/Makefile.in b/src/BasicGUI/Makefile.in index 4bbaaa7f6..05042a6fa 100644 --- a/src/BasicGUI/Makefile.in +++ b/src/BasicGUI/Makefile.in @@ -70,8 +70,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOMFiltersSelection -lGEOMBase -lGEOM diff --git a/src/BlocksGUI/Makefile.in b/src/BlocksGUI/Makefile.in index 99cbd1e09..f15982d57 100644 --- a/src/BlocksGUI/Makefile.in +++ b/src/BlocksGUI/Makefile.in @@ -60,8 +60,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOMFiltersSelection -lGEOMBase diff --git a/src/BooleanGUI/Makefile.in b/src/BooleanGUI/Makefile.in index f90b5d458..ed3ab7d33 100644 --- a/src/BooleanGUI/Makefile.in +++ b/src/BooleanGUI/Makefile.in @@ -52,8 +52,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOMBase diff --git a/src/BuildGUI/Makefile.in b/src/BuildGUI/Makefile.in index 36d4f80de..4f12a271e 100644 --- a/src/BuildGUI/Makefile.in +++ b/src/BuildGUI/Makefile.in @@ -62,8 +62,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOMFiltersSelection -lGEOMBase diff --git a/src/DisplayGUI/Makefile.in b/src/DisplayGUI/Makefile.in index 59d22518b..4323f195f 100644 --- a/src/DisplayGUI/Makefile.in +++ b/src/DisplayGUI/Makefile.in @@ -50,8 +50,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOM diff --git a/src/DlgRef/Makefile.in b/src/DlgRef/Makefile.in index 9cafbd1cd..09c66a09d 100644 --- a/src/DlgRef/Makefile.in +++ b/src/DlgRef/Makefile.in @@ -149,9 +149,9 @@ LIB_CLIENT_IDL = LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -LDFLAGS += $(QT_MT_LIBS) -L${GUI_ROOT_DIR}/lib/salome -lqtx +LDFLAGS += $(QT_MT_LIBS) $(GUI_LDFLAGS) -lqtx @CONCLUDE@ diff --git a/src/EntityGUI/Makefile.in b/src/EntityGUI/Makefile.in index 720b6f7e9..4a9966473 100644 --- a/src/EntityGUI/Makefile.in +++ b/src/EntityGUI/Makefile.in @@ -80,8 +80,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOMFiltersSelection -lGEOMSketcher -lGEOMBase -lGEOM diff --git a/src/GEOM/Makefile.in b/src/GEOM/Makefile.in index 43ac25d5f..1a73d9ca3 100644 --- a/src/GEOM/Makefile.in +++ b/src/GEOM/Makefile.in @@ -64,9 +64,9 @@ EXPORT_HEADERS= GEOM_Application.hxx \ Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += -L${KERNEL_ROOT_DIR}/lib/salome $(CAS_OCAF) $(CAS_OCAFVIS) +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +LDFLAGS += $(KERNEL_LDFLAGS) $(CAS_OCAF) $(CAS_OCAFVIS) # additional file to be cleaned diff --git a/src/GEOMAlgo/Makefile.in b/src/GEOMAlgo/Makefile.in index d250da21c..ae9a8ff47 100644 --- a/src/GEOMAlgo/Makefile.in +++ b/src/GEOMAlgo/Makefile.in @@ -101,9 +101,9 @@ EXPORT_HEADERS = \ EXPORT_IDLS= -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(CAS_LDPATH) -lTKBO -L${KERNEL_ROOT_DIR}/lib/salome +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +LDFLAGS += $(CAS_LDPATH) -lTKBO $(KERNEL_LDFLAGS) %_moc.cxx: %.h $(MOC) $< -o $@ diff --git a/src/GEOMBase/Makefile.in b/src/GEOMBase/Makefile.in index 260845ed6..68eda8a50 100644 --- a/src/GEOMBase/Makefile.in +++ b/src/GEOMBase/Makefile.in @@ -63,9 +63,9 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -LDFLAGS += -L$(KERNEL_ROOT_DIR)/lib/salome -L$(GUI_ROOT_DIR)/lib/salome -lDlgRef -lGEOM -lsuit -lOCCViewer -lVTKViewer $(CAS_LDPATH) -lTKPrim +LDFLAGS += $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) -lDlgRef -lGEOM -lsuit -lOCCViewer -lVTKViewer $(CAS_LDPATH) -lTKPrim @CONCLUDE@ diff --git a/src/GEOMClient/Makefile.in b/src/GEOMClient/Makefile.in index eb7281a67..413c7b1c1 100644 --- a/src/GEOMClient/Makefile.in +++ b/src/GEOMClient/Makefile.in @@ -53,9 +53,9 @@ BIN_CLIENT_IDL = BIN_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(CAS_TKTopAlgo) -L${KERNEL_ROOT_DIR}/lib/salome +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +LDFLAGS += $(CAS_TKTopAlgo) $(KERNEL_LDFLAGS) @CONCLUDE@ diff --git a/src/GEOMContext/Makefile.in b/src/GEOMContext/Makefile.in index 991d7480e..78ea8324f 100644 --- a/src/GEOMContext/Makefile.in +++ b/src/GEOMContext/Makefile.in @@ -57,9 +57,9 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) -LDFLAGS += -lOCCViewer -lVTKViewer -lSalomeObject -lSalomeGUI -lGEOMClient -lGEOMObject -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS += -lOCCViewer -lVTKViewer -lSalomeObject -lSalomeGUI -lGEOMClient -lGEOMObject $(KERNEL_LDFLAGS) @CONCLUDE@ diff --git a/src/GEOMFiltersSelection/Makefile.in b/src/GEOMFiltersSelection/Makefile.in index c56e5a1ca..2091b417b 100644 --- a/src/GEOMFiltersSelection/Makefile.in +++ b/src/GEOMFiltersSelection/Makefile.in @@ -58,9 +58,9 @@ LIB_CLIENT_IDL= GEOM_Gen.idl SALOMEDS.idl SALOME_Exception.idl SALOME_GenericObj # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -I$(GUI_ROOT_DIR)/include/salome -I$(KERNEL_ROOT_DIR)/include/salome -CXXFLAGS += $(QT_INCLUDES) $(BOOST_CPPFLAGS) -I$(GUI_ROOT_DIR)/include/salome -I$(KERNEL_ROOT_DIR)/include/salome -LDFLAGS += -L$(GUI_ROOT_DIR)/lib/salome -L$(KERNEL_ROOT_DIR)/lib/salome -lsuit -lSalomeApp +CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(GUI_CXXFLAGS) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(QT_INCLUDES) $(BOOST_CPPFLAGS) $(GUI_CXXFLAGS) $(KERNEL_CXXFLAGS) +LDFLAGS += $(GUI_LDFLAGS) $(KERNEL_LDFLAGS) -lsuit -lSalomeApp # additional file to be cleaned MOSTLYCLEAN = diff --git a/src/GEOMGUI/Makefile.in b/src/GEOMGUI/Makefile.in index ecfc9c433..4f7bd2b28 100644 --- a/src/GEOMGUI/Makefile.in +++ b/src/GEOMGUI/Makefile.in @@ -71,9 +71,9 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I$(KERNEL_ROOT_DIR)/include/salome -I$(GUI_ROOT_DIR)/include/salome -CXXFLAGS += $(BOOST_CPPFLAGS) -I$(KERNEL_ROOT_DIR)/include/salome -I$(GUI_ROOT_DIR)/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -LDFLAGS += -lGEOMFiltersSelection -L$(KERNEL_ROOT_DIR)/lib/salome -L$(GUI_ROOT_DIR)/lib/salome -lOCCViewer -lVTKViewer -lSalomeApp -lCAM -lGEOMClient -lSOCC -lSVTK -lGEOMObject -lToolsGUI -lEvent +LDFLAGS += -lGEOMFiltersSelection $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) -lOCCViewer -lVTKViewer -lSalomeApp -lCAM -lGEOMClient -lSOCC -lSVTK -lGEOMObject -lToolsGUI -lEvent @CONCLUDE@ diff --git a/src/GEOMImpl/Makefile.in b/src/GEOMImpl/Makefile.in index 9209e4e5a..5df74212f 100644 --- a/src/GEOMImpl/Makefile.in +++ b/src/GEOMImpl/Makefile.in @@ -1,22 +1,3 @@ -# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ -# top_srcdir=@top_srcdir@ top_builddir=../.. @@ -111,9 +92,9 @@ EXPORT_HEADERS= GEOMImpl_Gen.hxx \ GEOMImpl_Types.hxx # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += -L${KERNEL_ROOT_DIR}/lib/salome $(CAS_LDPATH) -lTKCAF -lTKFillet -lTKOffset -lGEOMbasic -lNMTAlgo -lGEOMAlgo -lShHealOper +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +LDFLAGS += $(KERNEL_LDFLAGS) $(CAS_LDPATH) -lTKCAF -lTKFillet -lTKOffset -lGEOMbasic -lNMTAlgo -lGEOMAlgo -lShHealOper # additional file to be cleaned diff --git a/src/GEOMToolsGUI/Makefile.in b/src/GEOMToolsGUI/Makefile.in index 58752719f..56501d3ac 100644 --- a/src/GEOMToolsGUI/Makefile.in +++ b/src/GEOMToolsGUI/Makefile.in @@ -57,9 +57,9 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I$(KERNEL_ROOT_DIR)/include/salome -I$(GUI_ROOT_DIR)/include/salome -CXXFLAGS += $(BOOST_CPPFLAGS) -I$(KERNEL_ROOT_DIR)/include/salome -I$(GUI_ROOT_DIR)/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -LDFLAGS += -L$(KERNEL_ROOT_DIR)/lib/salome -L$(GUI_ROOT_DIR)/lib/salome -lGEOMBase -lVTKViewer -lOCCViewer -lsuit -lSalomeApp +LDFLAGS += $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) -lGEOMBase -lVTKViewer -lOCCViewer -lsuit -lSalomeApp @CONCLUDE@ diff --git a/src/GEOM_I/Makefile.in b/src/GEOM_I/Makefile.in index 6cf1d5df1..e13a38bd4 100644 --- a/src/GEOM_I/Makefile.in +++ b/src/GEOM_I/Makefile.in @@ -84,11 +84,11 @@ EXPORT_HEADERS = GEOM_Object_i.hh \ GEOM_Gen_i.hh # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS += $(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) LDFLAGS += -lGEOMArchimede -lGEOMbasic -lGEOMimpl -lGEOMSketcher \ $(CAS_DATAEXCHANGE) $(CAS_LDPATH) -lTKFillet -lTKOffset \ - -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS + $(KERNEL_LDFLAGS) -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS # additional file to be cleaned MOSTLYCLEAN = diff --git a/src/GEOM_I_Superv/Makefile.in b/src/GEOM_I_Superv/Makefile.in index 71c8eaa95..582d3d03d 100644 --- a/src/GEOM_I_Superv/Makefile.in +++ b/src/GEOM_I_Superv/Makefile.in @@ -51,9 +51,9 @@ BIN_SERVER_IDL = EXPORT_HEADERS = # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += -lGEOMEngine -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeContainer -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeGenericObj +CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +LDFLAGS += -lGEOMEngine -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeContainer $(KERNEL_LDFLAGS) -lSalomeGenericObj # additional file to be cleaned MOSTLYCLEAN = diff --git a/src/GenerationGUI/Makefile.in b/src/GenerationGUI/Makefile.in index 3ce50cd87..e37486d34 100644 --- a/src/GenerationGUI/Makefile.in +++ b/src/GenerationGUI/Makefile.in @@ -58,8 +58,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOMFiltersSelection -lGEOMBase $(CAS_LDPATH) -lTKOffset diff --git a/src/GroupGUI/Makefile.in b/src/GroupGUI/Makefile.in index 26a351ad4..1ee716ff3 100755 --- a/src/GroupGUI/Makefile.in +++ b/src/GroupGUI/Makefile.in @@ -52,8 +52,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOMFiltersSelection -lGEOMBase diff --git a/src/IGESExport/Makefile.in b/src/IGESExport/Makefile.in index d9abe4c34..488b90734 100644 --- a/src/IGESExport/Makefile.in +++ b/src/IGESExport/Makefile.in @@ -37,9 +37,9 @@ LIB= libIGESExport.la LIB_SRC = IGESExport.cxx # additionnal information to compil and link file -CPPFLAGS+= $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(CAS_LDPATH) -lTKIGES -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS+= $(CAS_LDPATH) -lTKIGES $(KERNEL_LDFLAGS) @CONCLUDE@ diff --git a/src/IGESImport/Makefile.in b/src/IGESImport/Makefile.in index e9aaaa840..3e7a7c366 100644 --- a/src/IGESImport/Makefile.in +++ b/src/IGESImport/Makefile.in @@ -37,9 +37,9 @@ LIB= libIGESImport.la LIB_SRC = IGESImport.cxx # additionnal information to compil and link file -CPPFLAGS+= $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(CAS_LDPATH) -lTKIGES -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS+= $(CAS_LDPATH) -lTKIGES $(KERNEL_LDFLAGS) @CONCLUDE@ diff --git a/src/MeasureGUI/Makefile.in b/src/MeasureGUI/Makefile.in index 7bb4af629..cb7106ddf 100644 --- a/src/MeasureGUI/Makefile.in +++ b/src/MeasureGUI/Makefile.in @@ -84,8 +84,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOMBase diff --git a/src/NMTAlgo/Makefile.in b/src/NMTAlgo/Makefile.in index a79769aac..1b6018a67 100644 --- a/src/NMTAlgo/Makefile.in +++ b/src/NMTAlgo/Makefile.in @@ -60,9 +60,9 @@ EXPORT_HEADERS = \ EXPORT_IDLS= -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -lNMTTools -L${KERNEL_ROOT_DIR}/lib/salome +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -lNMTTools $(KERNEL_LDFLAGS) %_moc.cxx: %.h $(MOC) $< -o $@ diff --git a/src/NMTDS/Makefile.in b/src/NMTDS/Makefile.in index 7bba78233..4e8029738 100644 --- a/src/NMTDS/Makefile.in +++ b/src/NMTDS/Makefile.in @@ -62,9 +62,9 @@ EXPORT_HEADERS = \ EXPORT_IDLS= -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -L${KERNEL_ROOT_DIR}/lib/salome +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO $(KERNEL_LDFLAGS) %_moc.cxx: %.h $(MOC) $< -o $@ diff --git a/src/NMTTools/Makefile.in b/src/NMTTools/Makefile.in index 77cdada9e..dfad2d387 100644 --- a/src/NMTTools/Makefile.in +++ b/src/NMTTools/Makefile.in @@ -93,9 +93,9 @@ EXPORT_HEADERS = \ EXPORT_IDLS= -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -lNMTDS -L${KERNEL_ROOT_DIR}/lib/salome +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -lNMTDS $(KERNEL_LDFLAGS) %_moc.cxx: %.h $(MOC) $< -o $@ diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in index 589469a87..aaa20a002 100644 --- a/src/OBJECT/Makefile.in +++ b/src/OBJECT/Makefile.in @@ -58,9 +58,9 @@ LIB_CLIENT_IDL = BIN = BIN_SRC = -CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -LDFLAGS+=$(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) -lSalomeObject -L${KERNEL_ROOT_DIR}/lib/salome -L${GUI_ROOT_DIR}/lib/salome +CPPFLAGS += $(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +LDFLAGS += $(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) -lSalomeObject $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) %_moc.cxx: %.h $(MOC) $< -o $@ diff --git a/src/OperationGUI/Makefile.in b/src/OperationGUI/Makefile.in index 6b7f980d8..3616df37b 100644 --- a/src/OperationGUI/Makefile.in +++ b/src/OperationGUI/Makefile.in @@ -62,8 +62,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += $(CAS_LDPATH) -lTKFillet -lGEOMBase diff --git a/src/PARTITION/Makefile.in b/src/PARTITION/Makefile.in index 76de606eb..342093840 100644 --- a/src/PARTITION/Makefile.in +++ b/src/PARTITION/Makefile.in @@ -53,9 +53,9 @@ EXPORT_HEADERS = Partition_Spliter.hxx \ EXPORT_IDLS= -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(CAS_LDPATH) -lTKBool -L${KERNEL_ROOT_DIR}/lib/salome +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +LDFLAGS += $(CAS_LDPATH) -lTKBool $(KERNEL_LDFLAGS) %_moc.cxx: %.h $(MOC) $< -o $@ diff --git a/src/PrimitiveGUI/Makefile.in b/src/PrimitiveGUI/Makefile.in index deac5e77e..e8bee2225 100644 --- a/src/PrimitiveGUI/Makefile.in +++ b/src/PrimitiveGUI/Makefile.in @@ -60,8 +60,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOMFiltersSelection -lGEOMBase diff --git a/src/RepairGUI/Makefile.in b/src/RepairGUI/Makefile.in index cc5c61a4c..86ab2801e 100644 --- a/src/RepairGUI/Makefile.in +++ b/src/RepairGUI/Makefile.in @@ -70,8 +70,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOMBase diff --git a/src/SKETCHER/Makefile.in b/src/SKETCHER/Makefile.in index a33057685..ef3215662 100644 --- a/src/SKETCHER/Makefile.in +++ b/src/SKETCHER/Makefile.in @@ -43,9 +43,9 @@ LIB_CLIENT_IDL = SALOME_Component.idl SALOMEDS.idl SALOME_Exception.idl SALOME_G EXPORT_HEADERS= Sketcher_Profile.hxx # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(CAS_KERNEL) $(CAS_MODELER) -L${KERNEL_ROOT_DIR}/lib/salome +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) +LDFLAGS += $(CAS_KERNEL) $(CAS_MODELER) $(KERNEL_LDFLAGS) @CONCLUDE@ diff --git a/src/STEPExport/Makefile.in b/src/STEPExport/Makefile.in index bd977ab07..bbffb45f0 100644 --- a/src/STEPExport/Makefile.in +++ b/src/STEPExport/Makefile.in @@ -37,9 +37,9 @@ LIB= libSTEPExport.la LIB_SRC = STEPExport.cxx # additionnal information to compil and link file -CPPFLAGS+= $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(CAS_LDPATH) -lTKSTEP -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS+= $(CAS_LDPATH) -lTKSTEP $(KERNEL_LDFLAGS) @CONCLUDE@ diff --git a/src/STEPImport/Makefile.in b/src/STEPImport/Makefile.in index 4881cc07b..fc7f8daf9 100644 --- a/src/STEPImport/Makefile.in +++ b/src/STEPImport/Makefile.in @@ -37,9 +37,9 @@ LIB= libSTEPImport.la LIB_SRC = STEPImport.cxx # additionnal information to compil and link file -CPPFLAGS+= $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(CAS_LDPATH) -lTKSTEP -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS+= $(CAS_LDPATH) -lTKSTEP $(KERNEL_LDFLAGS) @CONCLUDE@ diff --git a/src/ShHealOper/Makefile.in b/src/ShHealOper/Makefile.in index 82f11b3a4..c3b5af6c4 100644 --- a/src/ShHealOper/Makefile.in +++ b/src/ShHealOper/Makefile.in @@ -69,8 +69,8 @@ EXPORT_HEADERS = \ # idl files EXPORT_IDLS= -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) LDFLAGS += $(CAS_KERNEL) $(CAS_MATH) $(CAS_TKTopAlgo) $(CAS_LDPATH) -lTKBool -lTKShHealing diff --git a/src/TransformationGUI/Makefile.in b/src/TransformationGUI/Makefile.in index 22de12a82..fecf31a99 100644 --- a/src/TransformationGUI/Makefile.in +++ b/src/TransformationGUI/Makefile.in @@ -66,8 +66,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOMFiltersSelection -lGEOMBase -- 2.39.2