Porting on Mandriva 64 (to unify libdir usage)

This commit is contained in:
apo 2006-04-14 14:55:46 +00:00
parent d7c0e61e6c
commit 4b2b24f80d
42 changed files with 120 additions and 117 deletions

View File

@ -10,7 +10,7 @@ HAVE_SSTREAM=@HAVE_SSTREAM@
LIBS=@LIBS@ 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
# add libstdc++ to link c++ library with libtool ! # add libstdc++ to link c++ library with libtool !
LDFLAGS+= -lstdc++ LDFLAGS+= -lstdc++
@ -51,8 +51,8 @@ PYTHONHOME = @PYTHONHOME@
PYTHON_INCLUDES = @PYTHON_INCLUDES@ PYTHON_INCLUDES = @PYTHON_INCLUDES@
PYTHON_LIBS = @PYTHON_LIBS@ PYTHON_LIBS = @PYTHON_LIBS@
PYTHON_VERSION = @PYTHON_VERSION@ PYTHON_VERSION = @PYTHON_VERSION@
PYTHON_SITE = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages PYTHON_SITE = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages
PYTHON_SITE_INSTALL = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome PYTHON_SITE_INSTALL = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome
# QT # QT
QT_ROOT = @QT_ROOT@ QT_ROOT = @QT_ROOT@
@ -99,12 +99,6 @@ HDF5_MT_LIBS=@HDF5_MT_LIBS@
OCC_INCLUDES=@CAS_CPPFLAGS@ OCC_INCLUDES=@CAS_CPPFLAGS@
OCC_CXXFLAGS=@CAS_CXXFLAGS@ 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_KERNEL=@CAS_KERNEL@
CAS_MATH=@CAS_MATH@ CAS_MATH=@CAS_MATH@
CAS_OCAF=@CAS_OCAF@ CAS_OCAF=@CAS_OCAF@
@ -194,16 +188,25 @@ INSTALL_DATA=@INSTALL_DATA@
# create a symbolic link (or a copie ?) # create a symbolic link (or a copie ?)
LN_S=@LN_S@ 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 ## Installation points
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
bindir=@bindir@/salome bindir=@exec_prefix@/bin/salome
libdir=@libdir@/salome libdir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/salome
# warning : if user give this path in configure we could have salome/salome :-( # warning : if user give this path in configure we could have salome/salome :-(
includedir=@includedir@/salome includedir=@includedir@/salome
datadir=@datadir@/salome datadir=@datadir@/salome
idldir=${prefix}/idl/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 incmakedir=${prefix}/salome_adm/unix
docdir=${prefix}/doc/salome docdir=${prefix}/doc/salome

View File

@ -323,7 +323,7 @@ else
fi fi
# make other build directories # 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 do
# if test ! -d $rep ; then # if test ! -d $rep ; then
# eval mkdir $rep # eval mkdir $rep

View File

@ -29,7 +29,7 @@ $(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%)
lib: pyidl 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) pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py)

View File

@ -44,9 +44,9 @@ LIB_CLIENT_IDL =
EXPORT_HEADERS = Archimede_VolumeSection.hxx EXPORT_HEADERS = Archimede_VolumeSection.hxx
# additionnal information to compil and link file # additionnal information to compil and link file
CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) $(KERNEL_CXXFLAGS)
CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS += $(CAS_KERNEL) $(CAS_MODELER) -L${KERNEL_ROOT_DIR}/lib/salome LDFLAGS += $(CAS_KERNEL) $(CAS_MODELER) $(KERNEL_LDFLAGS)
# additional file to be cleaned # additional file to be cleaned
MOSTLYCLEAN = MOSTLYCLEAN =

View File

@ -39,9 +39,9 @@ LIB = libBREPExport.la
LIB_SRC = BREPExport.cxx LIB_SRC = BREPExport.cxx
# additionnal information to compil and link file # additionnal information to compil and link file
CPPFLAGS+= $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS)
CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS+= $(CAS_LDPATH) -lTKBRep -L${KERNEL_ROOT_DIR}/lib/salome LDFLAGS+= $(CAS_LDPATH) -lTKBRep $(KERNEL_LDFLAGS)
@CONCLUDE@ @CONCLUDE@

View File

@ -37,9 +37,9 @@ LIB= libBREPImport.la
LIB_SRC = BREPImport.cxx LIB_SRC = BREPImport.cxx
# additionnal information to compil and link file # additionnal information to compil and link file
CPPFLAGS+= $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS)
CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS+= $(CAS_LDPATH) -lTKBRep -L${KERNEL_ROOT_DIR}/lib/salome LDFLAGS+= $(CAS_LDPATH) -lTKBRep $(KERNEL_LDFLAGS)
@CONCLUDE@ @CONCLUDE@

View File

@ -70,8 +70,8 @@ LIB_SERVER_IDL =
# additionnal information to compil and link file # 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 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
LDFLAGS += -lGEOMFiltersSelection -lGEOMBase -lGEOM LDFLAGS += -lGEOMFiltersSelection -lGEOMBase -lGEOM

View File

@ -60,8 +60,8 @@ LIB_SERVER_IDL =
# additionnal information to compil and link file # 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 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
LDFLAGS += -lGEOMFiltersSelection -lGEOMBase LDFLAGS += -lGEOMFiltersSelection -lGEOMBase

View File

@ -52,8 +52,8 @@ LIB_SERVER_IDL =
# additionnal information to compil and link file # 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 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
LDFLAGS += -lGEOMBase LDFLAGS += -lGEOMBase

View File

@ -62,8 +62,8 @@ LIB_SERVER_IDL =
# additionnal information to compil and link file # 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 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
LDFLAGS += -lGEOMFiltersSelection -lGEOMBase LDFLAGS += -lGEOMFiltersSelection -lGEOMBase

View File

@ -50,8 +50,8 @@ LIB_SERVER_IDL =
# additionnal information to compil and link file # 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 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
LDFLAGS += -lGEOM LDFLAGS += -lGEOM

View File

@ -149,9 +149,9 @@ LIB_CLIENT_IDL =
LIB_SERVER_IDL = LIB_SERVER_IDL =
# additionnal information to compil and link file # additionnal information to compil and link file
CPPFLAGS += $(QT_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome CPPFLAGS += $(QT_INCLUDES) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
LDFLAGS += $(QT_MT_LIBS) -L${GUI_ROOT_DIR}/lib/salome -lqtx LDFLAGS += $(QT_MT_LIBS) $(GUI_LDFLAGS) -lqtx
@CONCLUDE@ @CONCLUDE@

View File

@ -80,8 +80,8 @@ LIB_SERVER_IDL =
# additionnal information to compil and link file # 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 CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
LDFLAGS += -lGEOMFiltersSelection -lGEOMSketcher -lGEOMBase -lGEOM LDFLAGS += -lGEOMFiltersSelection -lGEOMSketcher -lGEOMBase -lGEOM

View File

@ -45,9 +45,9 @@ EXPORT_HEADERS= GEOM_Application.hxx \
Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
# additionnal information to compil and link file # additionnal information to compil and link file
CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS)
CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS += -L${KERNEL_ROOT_DIR}/lib/salome $(CAS_OCAF) $(CAS_OCAFVIS) LDFLAGS += $(KERNEL_LDFLAGS) $(CAS_OCAF) $(CAS_OCAFVIS)
# additional file to be cleaned # additional file to be cleaned

View File

@ -101,9 +101,9 @@ EXPORT_HEADERS = \
EXPORT_IDLS= EXPORT_IDLS=
CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS)
CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS += $(CAS_LDPATH) -lTKBO -L${KERNEL_ROOT_DIR}/lib/salome LDFLAGS += $(CAS_LDPATH) -lTKBO $(KERNEL_LDFLAGS)
%_moc.cxx: %.h %_moc.cxx: %.h
$(MOC) $< -o $@ $(MOC) $< -o $@

View File

@ -63,9 +63,9 @@ LIB_SERVER_IDL =
# additionnal information to compil and link file # 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 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
CXXFLAGS += $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome 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@ @CONCLUDE@

View File

@ -53,9 +53,9 @@ BIN_CLIENT_IDL =
BIN_SERVER_IDL = BIN_SERVER_IDL =
# additionnal information to compil and link file # additionnal information to compil and link file
CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS)
CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS += $(CAS_TKTopAlgo) -L${KERNEL_ROOT_DIR}/lib/salome LDFLAGS += $(CAS_TKTopAlgo) $(KERNEL_LDFLAGS)
@CONCLUDE@ @CONCLUDE@

View File

@ -57,9 +57,9 @@ LIB_SERVER_IDL =
# additionnal information to compil and link file # additionnal information to compil and link file
CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS)
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome 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@ @CONCLUDE@

View File

@ -58,9 +58,9 @@ LIB_CLIENT_IDL= GEOM_Gen.idl SALOMEDS.idl SALOME_Exception.idl SALOME_GenericObj
# additionnal information to compil and link file # 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 CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(GUI_CXXFLAGS) $(KERNEL_CXXFLAGS)
CXXFLAGS += $(QT_INCLUDES) $(BOOST_CPPFLAGS) -I$(GUI_ROOT_DIR)/include/salome -I$(KERNEL_ROOT_DIR)/include/salome CXXFLAGS += $(QT_INCLUDES) $(BOOST_CPPFLAGS) $(GUI_CXXFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS += -L$(GUI_ROOT_DIR)/lib/salome -L$(KERNEL_ROOT_DIR)/lib/salome -lsuit -lSalomeApp LDFLAGS += $(GUI_LDFLAGS) $(KERNEL_LDFLAGS) -lsuit -lSalomeApp
# additional file to be cleaned # additional file to be cleaned
MOSTLYCLEAN = MOSTLYCLEAN =

View File

@ -71,9 +71,9 @@ LIB_SERVER_IDL =
# additionnal information to compil and link file # 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 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
CXXFLAGS += $(BOOST_CPPFLAGS) -I$(KERNEL_ROOT_DIR)/include/salome -I$(GUI_ROOT_DIR)/include/salome 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@ @CONCLUDE@

View File

@ -91,9 +91,9 @@ EXPORT_HEADERS= GEOMImpl_Gen.hxx \
GEOMImpl_Types.hxx GEOMImpl_Types.hxx
# additionnal information to compil and link file # additionnal information to compil and link file
CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS)
CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS += -L${KERNEL_ROOT_DIR}/lib/salome $(CAS_LDPATH) -lTKCAF -lTKFillet -lTKOffset -lGEOMbasic -lNMTAlgo -lGEOMAlgo -lShHealOper LDFLAGS += $(KERNEL_LDFLAGS) $(CAS_LDPATH) -lTKCAF -lTKFillet -lTKOffset -lGEOMbasic -lNMTAlgo -lGEOMAlgo -lShHealOper
# additional file to be cleaned # additional file to be cleaned

View File

@ -57,9 +57,9 @@ LIB_SERVER_IDL =
# additionnal information to compil and link file # 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 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
CXXFLAGS += $(BOOST_CPPFLAGS) -I$(KERNEL_ROOT_DIR)/include/salome -I$(GUI_ROOT_DIR)/include/salome 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@ @CONCLUDE@

View File

@ -84,11 +84,11 @@ EXPORT_HEADERS = GEOM_Object_i.hh \
GEOM_Gen_i.hh GEOM_Gen_i.hh
# additionnal information to compil and link file # additionnal information to compil and link file
CPPFLAGS += $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome CPPFLAGS += $(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS)
CXXFLAGS += $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS += -lGEOMArchimede -lGEOMbasic -lGEOMimpl -lGEOMSketcher \ LDFLAGS += -lGEOMArchimede -lGEOMbasic -lGEOMimpl -lGEOMSketcher \
$(CAS_DATAEXCHANGE) $(CAS_LDPATH) -lTKFillet -lTKOffset \ $(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 # additional file to be cleaned
MOSTLYCLEAN = MOSTLYCLEAN =

View File

@ -51,9 +51,9 @@ BIN_SERVER_IDL =
EXPORT_HEADERS = EXPORT_HEADERS =
# additionnal information to compil and link file # additionnal information to compil and link file
CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS)
CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS += -lGEOMEngine -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeContainer -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeGenericObj LDFLAGS += -lGEOMEngine -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeContainer $(KERNEL_LDFLAGS) -lSalomeGenericObj
# additional file to be cleaned # additional file to be cleaned
MOSTLYCLEAN = MOSTLYCLEAN =

View File

@ -58,8 +58,8 @@ LIB_SERVER_IDL =
# additionnal information to compil and link file # 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 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
LDFLAGS += -lGEOMFiltersSelection -lGEOMBase $(CAS_LDPATH) -lTKOffset LDFLAGS += -lGEOMFiltersSelection -lGEOMBase $(CAS_LDPATH) -lTKOffset

View File

@ -52,8 +52,8 @@ LIB_SERVER_IDL =
# additionnal information to compil and link file # 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 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
LDFLAGS += -lGEOMFiltersSelection -lGEOMBase LDFLAGS += -lGEOMFiltersSelection -lGEOMBase

View File

@ -37,9 +37,9 @@ LIB= libIGESExport.la
LIB_SRC = IGESExport.cxx LIB_SRC = IGESExport.cxx
# additionnal information to compil and link file # additionnal information to compil and link file
CPPFLAGS+= $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS)
CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS+= $(CAS_LDPATH) -lTKIGES -L${KERNEL_ROOT_DIR}/lib/salome LDFLAGS+= $(CAS_LDPATH) -lTKIGES $(KERNEL_LDFLAGS)
@CONCLUDE@ @CONCLUDE@

View File

@ -37,9 +37,9 @@ LIB= libIGESImport.la
LIB_SRC = IGESImport.cxx LIB_SRC = IGESImport.cxx
# additionnal information to compil and link file # additionnal information to compil and link file
CPPFLAGS+= $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS)
CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS+= $(CAS_LDPATH) -lTKIGES -L${KERNEL_ROOT_DIR}/lib/salome LDFLAGS+= $(CAS_LDPATH) -lTKIGES $(KERNEL_LDFLAGS)
@CONCLUDE@ @CONCLUDE@

View File

@ -84,8 +84,8 @@ LIB_SERVER_IDL =
# additionnal information to compil and link file # 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 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
LDFLAGS += -lGEOMBase LDFLAGS += -lGEOMBase

View File

@ -60,9 +60,9 @@ EXPORT_HEADERS = \
EXPORT_IDLS= EXPORT_IDLS=
CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS)
CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -lNMTTools -L${KERNEL_ROOT_DIR}/lib/salome LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -lNMTTools $(KERNEL_LDFLAGS)
%_moc.cxx: %.h %_moc.cxx: %.h
$(MOC) $< -o $@ $(MOC) $< -o $@

View File

@ -62,9 +62,9 @@ EXPORT_HEADERS = \
EXPORT_IDLS= EXPORT_IDLS=
CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS)
CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -L${KERNEL_ROOT_DIR}/lib/salome LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO $(KERNEL_LDFLAGS)
%_moc.cxx: %.h %_moc.cxx: %.h
$(MOC) $< -o $@ $(MOC) $< -o $@

View File

@ -93,9 +93,9 @@ EXPORT_HEADERS = \
EXPORT_IDLS= EXPORT_IDLS=
CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS)
CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -lNMTDS -L${KERNEL_ROOT_DIR}/lib/salome LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -lNMTDS $(KERNEL_LDFLAGS)
%_moc.cxx: %.h %_moc.cxx: %.h
$(MOC) $< -o $@ $(MOC) $< -o $@

View File

@ -58,9 +58,9 @@ LIB_CLIENT_IDL =
BIN = BIN =
BIN_SRC = 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 CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
LDFLAGS+=$(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) -lSalomeObject -L${KERNEL_ROOT_DIR}/lib/salome -L${GUI_ROOT_DIR}/lib/salome LDFLAGS+=$(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) -lSalomeObject $(KERNEL_LDFLAGS) $(GUI_LDFLAGS)
%_moc.cxx: %.h %_moc.cxx: %.h
$(MOC) $< -o $@ $(MOC) $< -o $@

View File

@ -62,8 +62,8 @@ LIB_SERVER_IDL =
# additionnal information to compil and link file # 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 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
LDFLAGS += $(CAS_LDPATH) -lTKFillet -lGEOMBase LDFLAGS += $(CAS_LDPATH) -lTKFillet -lGEOMBase

View File

@ -53,9 +53,9 @@ EXPORT_HEADERS = Partition_Spliter.hxx \
EXPORT_IDLS= EXPORT_IDLS=
CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS)
CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS += $(CAS_LDPATH) -lTKBool -L${KERNEL_ROOT_DIR}/lib/salome LDFLAGS += $(CAS_LDPATH) -lTKBool $(KERNEL_LDFLAGS)
%_moc.cxx: %.h %_moc.cxx: %.h
$(MOC) $< -o $@ $(MOC) $< -o $@

View File

@ -60,8 +60,8 @@ LIB_SERVER_IDL =
# additionnal information to compil and link file # 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 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
LDFLAGS += -lGEOMFiltersSelection -lGEOMBase LDFLAGS += -lGEOMFiltersSelection -lGEOMBase

View File

@ -70,8 +70,8 @@ LIB_SERVER_IDL =
# additionnal information to compil and link file # 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 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
LDFLAGS += -lGEOMBase LDFLAGS += -lGEOMBase

View File

@ -43,9 +43,9 @@ LIB_CLIENT_IDL = SALOME_Component.idl SALOMEDS.idl SALOME_Exception.idl SALOME_G
EXPORT_HEADERS= Sketcher_Profile.hxx EXPORT_HEADERS= Sketcher_Profile.hxx
# additionnal information to compil and link file # additionnal information to compil and link file
CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS)
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(KERNEL_CXXFLAGS)
LDFLAGS += $(CAS_KERNEL) $(CAS_MODELER) -L${KERNEL_ROOT_DIR}/lib/salome LDFLAGS += $(CAS_KERNEL) $(CAS_MODELER) $(KERNEL_LDFLAGS)
@CONCLUDE@ @CONCLUDE@

View File

@ -37,9 +37,9 @@ LIB= libSTEPExport.la
LIB_SRC = STEPExport.cxx LIB_SRC = STEPExport.cxx
# additionnal information to compil and link file # additionnal information to compil and link file
CPPFLAGS+= $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS)
CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS+= $(CAS_LDPATH) -lTKSTEP -L${KERNEL_ROOT_DIR}/lib/salome LDFLAGS+= $(CAS_LDPATH) -lTKSTEP $(KERNEL_LDFLAGS)
@CONCLUDE@ @CONCLUDE@

View File

@ -37,9 +37,9 @@ LIB= libSTEPImport.la
LIB_SRC = STEPImport.cxx LIB_SRC = STEPImport.cxx
# additionnal information to compil and link file # additionnal information to compil and link file
CPPFLAGS+= $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS)
CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS+= $(CAS_LDPATH) -lTKSTEP -L${KERNEL_ROOT_DIR}/lib/salome LDFLAGS+= $(CAS_LDPATH) -lTKSTEP $(KERNEL_LDFLAGS)
@CONCLUDE@ @CONCLUDE@

View File

@ -69,8 +69,8 @@ EXPORT_HEADERS = \
# idl files # idl files
EXPORT_IDLS= EXPORT_IDLS=
CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS)
CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
LDFLAGS += $(CAS_KERNEL) $(CAS_MATH) $(CAS_TKTopAlgo) $(CAS_LDPATH) -lTKBool -lTKShHealing LDFLAGS += $(CAS_KERNEL) $(CAS_MATH) $(CAS_TKTopAlgo) $(CAS_LDPATH) -lTKBool -lTKShHealing

View File

@ -66,8 +66,8 @@ LIB_SERVER_IDL =
# additionnal information to compil and link file # 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 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
LDFLAGS += -lGEOMFiltersSelection -lGEOMBase LDFLAGS += -lGEOMFiltersSelection -lGEOMBase