Porting on Mandriva 64 (to unify libdir usage)

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index d87c15807d3061d93e6407337266e4d95710dc09..01f4afe964e2dfa210fb8bfa4cee71b01350161a 100644 (file)
--- 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
 # 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 33bb2f013b408e051595547dfd20d2cdff885edb..c50d947b02912f9b66b84f7167fab5908d8e960a 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -323,7 +323,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 72f11d7c68a4c868617f45ad5f1efaa28df45e30..ffdd3cd1953c004c74d3c0cffc6a545100a68638 100644 (file)
--- a/idl/Makefile.in
+++ b/idl/Makefile.in
@@ -29,7 +29,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 a024382a558943032993694da8a7e0b89913ddd5..ef74f1b3fe5f18c2ca253e3997ba90b8f41242ec 100644 (file)
--- 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 8983e67c6a5522e058873d343fbefce8c001607a..c7033410517bcc375f0a3691c6891f1c1bdfe5d9 100644 (file)
--- 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 cc76e0c584d19e1f160c5bd6cd07abe8b5b85c31..b63257e560a702d65a996637027aed14cd5331de 100644 (file)
--- 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 4bbaaa7f6a33eaa6573ee26a61dc4b2352211d86..05042a6fafb7e3c440da0821d736c94a3a1ced69 100644 (file)
--- 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 99cbd1e0934b10316d64362ed51534b2340a627d..f15982d57a5afbe900b1cec9708bd6509e23467d 100644 (file)
--- 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 f90b5d458f48cef3ef02241872a11d91de95f57b..ed3ab7d33c8d25d6c6d75953c3c238b0f25c0b64 100644 (file)
--- 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 36d4f80dedf7e215ef7ae032b3fb67b8573ca144..4f12a271e0e7b7092878061259d68d78f314b1af 100644 (file)
--- 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 59d22518b7747b2a04deb946508ffcebdd98994c..4323f195f04f695d20b327cb9b202dfd5958f31e 100644 (file)
--- 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 9cafbd1cddac1a22520ca5fcc0693891fd3da376..09c66a09df9ca8caf29b81de24dab629e3c82cdf 100644 (file)
--- 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 720b6f7e96e733465768a7b9a96b9703cfd6a598..4a9966473007b647f6ddb53df7f5771862396a06 100644 (file)
--- 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 ca263cd9777de1c2d863876d665f8388ed12b405..6e2d9c242ec61271af9a0da6e1b3507aec9fc6c0 100644 (file)
--- a/src/GEOM/Makefile.in
+++ b/src/GEOM/Makefile.in
@@ -45,9 +45,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 d250da21c0d02c43d9ba36ec75263a473d52a454..ae9a8ff4718a2d62580c5c922184ce022d1fb6ee 100644 (file)
--- 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 260845ed6a1514ee1c5066461d86a57763dd7ed8..68eda8a50a2eb7a22ea831e77ec41b97438c31f7 100644 (file)
--- 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 eb7281a67653a9c3ac3c965b047c046b00a3ed7a..413c7b1c1de53e34920d6205ade053d2a5f6297f 100644 (file)
--- 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 991d7480e692cc0b92f26c8149e74ed340e0d555..78ea8324f36ceed897a2f0c897f1020258f6ec7a 100644 (file)
--- 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 c56e5a1cab87554a45eeea1122ee5817e790cacf..2091b417b45c4554c77d92a4e37a9b138ff6a428 100644 (file)
--- 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 ecfc9c4337b25bc981d2c9b813f48fedf99f1008..4f7bd2b28af9ae70e7e59e26855a5926cd1b817a 100644 (file)
--- 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 1564d4ba67f341d15aa6e9d108dfc89789a1092d..bec151eb5a71eb18ae430af1574bd07718661c4e 100644 (file)
--- a/src/GEOMImpl/Makefile.in
+++ b/src/GEOMImpl/Makefile.in
@@ -91,9 +91,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 58752719f14faaa12c82efd612333ae89c35e430..56501d3acf8c3d101a0a7dc4854fd0cac4bd28a5 100644 (file)
--- 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 6cf1d5df11e2c2fab26f47424cfa41df38c54f96..e13a38bd4d5c6ac33958688db410e9ebac8405b0 100644 (file)
--- 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 71c8eaa9556d3eb837d802176beb8e13b3c3a978..582d3d03dcab9cca5fcd50f8e0a2bc2512f5f5bd 100644 (file)
--- 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 3ce50cd87ffdd3adfc34a365173acaf2b225000d..e37486d3470adcd322deef346a2acb21e657c0bd 100644 (file)
--- 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 26a351ad41826aabae702265f680ff04122135d4..1ee716ff3dbab727af834c4ccbb21bd79a2694e7 100755 (executable)
--- 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 d9abe4c342512bb5f0809fe72e4397daa02d552b..488b90734e80455a11d85a21517d3a9fbf64fac3 100644 (file)
--- 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 e9aaaa84081807c0d6e98478a2cc4c158924e513..3e7a7c366d47bea315bbf92aa63e32f52a24c622 100644 (file)
--- 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 7bb4af629814d945e0212ff7e0ef170fb4ab1225..cb7106ddfe5a92a33a52092cbd3ae2075472e4e5 100644 (file)
--- 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 a79769aacdc27f2fc812e2e8873aaa3c524dcc4c..1b6018a67b814c8dd638a700cb3620624da97b83 100644 (file)
--- 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 7bba782332a7bc41acbc4cf3dea86539421caa46..4e802973842adc380740af925033ec6c15d989da 100644 (file)
--- 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 77cdada9e1f8307f811461dc8e1d9d63b69279f5..dfad2d387899bce95255fd2288782e24ab510535 100644 (file)
--- 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 589469a87573bb8fd95356d9e02ae8f5b6fb863d..29e4d34bc2c3e6dfb19fcbb70eb56abe1f59742d 100644 (file)
--- 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 6b7f980d8054051f1e95baf399e73b60fa443cca..3616df37b32d1028ff074b4cea6b2f8f95f7c621 100644 (file)
--- 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 76de606eb4b0a07359a073c1820110ff2166bb94..342093840898e255030c06c5a6fe12d78230e29f 100644 (file)
--- 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 deac5e77e730179cc4deb6d17abbf7a4d8f834ad..e8bee22250e1d8883e7e56dfa8b92f0d602346f6 100644 (file)
--- 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 cc5c61a4c0f0e6e61af12a7952751a60a3e169f3..86ab2801e5fb5c289f6c7a4c9b3eee1ed7702eae 100644 (file)
--- 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 a330576858f301a827627ef122bc6a0a735604a5..ef3215662981bf4d4ff7f88f5a4cefaeaa7185ff 100644 (file)
--- 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 bd977ab07244b000b42ac22649d4b5eb728b48fa..bbffb45f0d881ed9665dcba973db475d96dee8f6 100644 (file)
--- 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 4881cc07bd70a55b4adcc2f5ffd6d166632b3e85..fc7f8daf9539a2f87daf18b2ff32401773401dd4 100644 (file)
--- 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 82f11b3a436df7990fdd8b4778b2296d64df5578..c3b5af6c4a3f48cf2bb8f6bed102cac5caa33cfc 100644 (file)
--- 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 22de12a821e0b287567d13a3d172bc686ca3a190..fecf31a99e6a1f03feedd229954443c68eb31d8e 100644 (file)
--- 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