From af0ef8d379642dfc01d81c3a5f63096092663ef2 Mon Sep 17 00:00:00 2001 From: apo Date: Mon, 17 Apr 2006 06:06:08 +0000 Subject: [PATCH] Porting on Mandriva 64 (to unify libdir usage) --- adm_local/unix/make_commence.in | 32 ++++++++++++++++++++------------ configure.in.base | 2 +- idl/Makefile.in | 2 +- src/CONVERTOR/Makefile.in | 10 +++++----- src/ENGINE/Makefile.in | 4 ++-- src/GUITOOLS/Makefile.in | 6 +++--- src/OBJECT/Makefile.in | 10 +++++----- src/PIPELINE/Makefile.in | 12 ++++++------ src/VISUGUI/Makefile.in | 12 ++++++------ src/VISU_I/Makefile.in | 14 +++++++------- src/VISU_SWIG/Makefile.in | 6 +++--- src/VVTK/Makefile.in | 10 +++++----- 12 files changed, 64 insertions(+), 56 deletions(-) diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index cab6f0e5..a5162a4c 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 $(top_builddir)/lib/salome +LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome # add libstdc++ to link c++ library with libtool ! LDFLAGS+= -lstdc++ @@ -53,8 +53,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@ @@ -103,12 +103,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_OCAF=@CAS_OCAF@ CAS_VIEWER=@CAS_VIEWER@ @@ -197,16 +191,30 @@ 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@ + +MED_ROOT_DIR=@MED_ROOT_DIR@ +MED_LDFLAGS=@MED_LDFLAGS@ +MED_CXXFLAGS=@MED_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 e4b35d6e..37aa5994 100644 --- a/configure.in.base +++ b/configure.in.base @@ -339,7 +339,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 b032d41d..7d3dce54 100644 --- a/idl/Makefile.in +++ b/idl/Makefile.in @@ -28,7 +28,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/CONVERTOR/Makefile.in b/src/CONVERTOR/Makefile.in index b3bf4147..56481d84 100644 --- a/src/CONVERTOR/Makefile.in +++ b/src/CONVERTOR/Makefile.in @@ -63,9 +63,9 @@ CPPFLAGS+= -ftemplate-depth-32 \ $(QT_INCLUDES) \ $(OCC_INCLUDES) \ $(OCC_CXXFLAGS) \ - -I${KERNEL_ROOT_DIR}/include/salome \ - -I${MED_ROOT_DIR}/include/salome \ - -I${GUI_ROOT_DIR}/include/salome \ + $(KERNEL_CXXFLAGS) \ + $(MED_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ $(BOOST_CPPFLAGS) LDFLAGS+= $(VTK_LIBS) \ @@ -73,8 +73,8 @@ LDFLAGS+= $(VTK_LIBS) \ $(CAS_KERNEL) \ $(CAS_MATH) \ $(BOOST_LIBS) -lboost_thread${BOOST_LIBSUFFIX} \ - -L${MED_ROOT_DIR}/lib/salome -lMEDWrapper \ - -L${GUI_ROOT_DIR}/lib/salome -lVTKViewer + $(MED_LDFLAGS) -lMEDWrapper \ + $(GUI_LDFLAGS) -lVTKViewer LDFLAGSFORBIN=$(LDFLAGS) -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase -lmed_V2_1 -lVTKViewer -lsuit -lqtx diff --git a/src/ENGINE/Makefile.in b/src/ENGINE/Makefile.in index d26a08ba..8aff0aad 100644 --- a/src/ENGINE/Makefile.in +++ b/src/ENGINE/Makefile.in @@ -36,9 +36,9 @@ BIN_SERVER_IDL = EXPORT_HEADERS = # additionnal information to compil and link file -CPPFLAGS += -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS += $(KERNEL_CXXFLAGS) -LDFLAGS += -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer +LDFLAGS += $(KERNEL_LDFLAGS) -lSalomeContainer LIBS+= diff --git a/src/GUITOOLS/Makefile.in b/src/GUITOOLS/Makefile.in index eb8eeac4..da363fe5 100644 --- a/src/GUITOOLS/Makefile.in +++ b/src/GUITOOLS/Makefile.in @@ -56,11 +56,11 @@ LIB_SERVER_IDL = CPPFLAGS += -ftemplate-depth-32 $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) \ $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(QWT_INCLUDES) \ - -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) + $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS) CXXFLAGS += -ftemplate-depth-32 $(OCC_CXXFLAGS) \ - -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome + $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -LDFLAGS += $(QWT_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome -L${GUI_ROOT_DIR}/lib/salome +LDFLAGS += $(QWT_LIBS) $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) @CONCLUDE@ diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in index 0a5cbee8..2ff5af64 100644 --- a/src/OBJECT/Makefile.in +++ b/src/OBJECT/Makefile.in @@ -66,15 +66,15 @@ CPPFLAGS+= \ $(OCC_INCLUDES) \ $(VTK_INCLUDES) \ $(BOOST_CPPFLAGS) \ - -I${MED_ROOT_DIR}/include/salome \ - -I${GUI_ROOT_DIR}/include/salome \ - -I${KERNEL_ROOT_DIR}/include/salome + $(MED_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(KERNEL_CXXFLAGS) LDFLAGS+= \ $(VTK_LIBS) \ $(BOOST_LIBS) \ - -L${GUI_ROOT_DIR}/lib/salome \ - -L${KERNEL_ROOT_DIR}/lib/salome + $(GUI_LDFLAGS) \ + $(KERNEL_LDFLAGS) LIBS+= \ -lboost_signals${BOOST_LIBSUFFIX} \ diff --git a/src/PIPELINE/Makefile.in b/src/PIPELINE/Makefile.in index 8f775a80..935c8525 100644 --- a/src/PIPELINE/Makefile.in +++ b/src/PIPELINE/Makefile.in @@ -96,16 +96,16 @@ BIN_SRC = CPPFLAGS+= \ $(VTK_INCLUDES) \ - -I${KERNEL_ROOT_DIR}/include/salome \ - -I${GUI_ROOT_DIR}/include/salome \ - -I${MED_ROOT_DIR}/include/salome \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(MED_CXXFLAGS) \ $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) LDFLAGS+= \ $(VTK_LIBS) -lVTKViewer -lVisuConvertor \ - -L${KERNEL_ROOT_DIR}/lib/salome -lSALOMELocalTrace \ - -L${GUI_ROOT_DIR}/lib/salome \ - -L${MED_ROOT_DIR}/lib/salome + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(GUI_LDFLAGS) \ + $(MED_LDFLAGS) LDFLAGSFORBIN=$(LDFLAGS) -lOpUtil -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase -lmed_V2_1 -lsuit -lqtx -lSALOMEBasics diff --git a/src/VISUGUI/Makefile.in b/src/VISUGUI/Makefile.in index 3ecc0aef..f5772732 100644 --- a/src/VISUGUI/Makefile.in +++ b/src/VISUGUI/Makefile.in @@ -119,17 +119,17 @@ LIB_SERVER_IDL = CPPFLAGS += -ftemplate-depth-32 $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) \ $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(QWT_INCLUDES) \ - -I${KERNEL_ROOT_DIR}/include/salome \ - -I${MED_ROOT_DIR}/include/salome \ + $(KERNEL_CXXFLAGS) \ + $(MED_CXXFLAGS) \ $(BOOST_CPPFLAGS) CXXFLAGS += -ftemplate-depth-32 $(OCC_CXXFLAGS) \ - -I${KERNEL_ROOT_DIR}/include/salome \ - -I${GUI_ROOT_DIR}/include/salome + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) LDFLAGS += $(QWT_LIBS) -lSalomeNS \ -lSVTK -lVVTK -lSPlot2d -lVisuObject -lVISUEngineImpl -lVISUGUITOOLS \ - -L${KERNEL_ROOT_DIR}/lib/salome \ - -L${GUI_ROOT_DIR}/lib/salome + $(KERNEL_LDFLAGS) \ + $(GUI_LDFLAGS) @CONCLUDE@ diff --git a/src/VISU_I/Makefile.in b/src/VISU_I/Makefile.in index caa66147..7924835c 100644 --- a/src/VISU_I/Makefile.in +++ b/src/VISU_I/Makefile.in @@ -98,9 +98,9 @@ CPPFLAGS += \ $(HDF5_INCLUDES) \ $(QWT_INCLUDES) \ $(BOOST_CPPFLAGS)\ - -I${KERNEL_ROOT_DIR}/include/salome \ - -I${MED_ROOT_DIR}/include/salome \ - -I${GUI_ROOT_DIR}/include/salome + $(KERNEL_CXXFLAGS) \ + $(MED_CXXFLAGS) \ + $(GUI_CXXFLAGS) LDFLAGS += \ $(PYTHON_LIBS) \ @@ -108,9 +108,9 @@ LDFLAGS += \ $(VTK_LIBS) \ $(QWT_LIBS) \ $(BOOST_LIBS) \ - -L${KERNEL_ROOT_DIR}/lib/salome \ - -L${GUI_ROOT_DIR}/lib/salome \ - -L${MED_ROOT_DIR}/lib/salome + $(KERNEL_LDFLAGS) \ + $(GUI_LDFLAGS) \ + $(MED_LDFLAGS) LIBS+= -lboost_signals${BOOST_LIBSUFFIX} \ -lSalomeHDFPersist \ @@ -132,7 +132,7 @@ LIBS+= -lboost_signals${BOOST_LIBSUFFIX} \ -lVISUGUITOOLS LDFLAGSFORBIN=$(LDFLAGS) $(LIBS) \ - -L${KERNEL_ROOT_DIR}/lib/salome \ + $(KERNEL_LDFLAGS) \ -lSALOMEBasics \ -lSalomeCatalog \ -lwith_loggerTraceCollector \ diff --git a/src/VISU_SWIG/Makefile.in b/src/VISU_SWIG/Makefile.in index 35420a58..31dc3141 100644 --- a/src/VISU_SWIG/Makefile.in +++ b/src/VISU_SWIG/Makefile.in @@ -55,9 +55,9 @@ CPPFLAGS += -ftemplate-depth-32 \ $(HDF5_INCLUDES) \ $(QT_INCLUDES) \ $(VTK_INCLUDES) \ - -I${KERNEL_ROOT_DIR}/include/salome \ - -I${GUI_ROOT_DIR}/include/salome \ - -I${MED_ROOT_DIR}/include/salome \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(MED_CXXFLAGS) \ $(BOOST_CPPFLAGS) LDFLAGS += $(PYTHON_LIBS) -lVisuConvertor -lVisuPipeLine diff --git a/src/VVTK/Makefile.in b/src/VVTK/Makefile.in index 66b48653..ed645011 100755 --- a/src/VVTK/Makefile.in +++ b/src/VVTK/Makefile.in @@ -63,16 +63,16 @@ CPPFLAGS += \ $(OCC_INCLUDES) \ $(VTK_INCLUDES) \ $(BOOST_CPPFLAGS) \ - -I$(KERNEL_ROOT_DIR)/include/salome \ - -I$(GUI_ROOT_DIR)/include/salome \ - -I${MED_ROOT_DIR}/include/salome + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(MED_CXXFLAGS) LDFLAGS += \ $(QT_MT_LIBS) \ $(OCC_LIBS) \ $(VTK_LIBS) \ - -L$(KERNEL_ROOT_DIR)/lib/salome \ - -L$(GUI_ROOT_DIR)/lib/salome + $(KERNEL_LDFLAGS) \ + $(GUI_LDFLAGS) LIBS+= -lsuit -lCAM -lSalomeObject -lSVTK -lOpUtil -- 2.39.2