ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-04-24 07:52:03 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merging from BR_DEBUG_3_2_0b1

Browse Source
This commit is contained in:
abd 2006-06-14 07:29:12 +00:00
parent 36221e3cf4
commit 6d7de74a0a
2 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
adm_local/unix/make_commence.in
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 -Xlinker -rpath-link -Xlinker
# 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@
@ -171,6 +165,8 @@ CXXFLAGS+= $(CORBA_CXXFLAGS)
LIBS+=$(CORBA_LIBS) LIBS+=$(CORBA_LIBS)
DOXYGEN = @DOXYGEN@ DOXYGEN = @DOXYGEN@
DOXYGEN_WITH_PYTHON = @DOXYGEN_WITH_PYTHON@
DOXYGEN_WITH_STL = @DOXYGEN_WITH_STL@
## Shared libraries ## Shared libraries
LT_STATIC_EXEC=@LT_STATIC_EXEC@ LT_STATIC_EXEC=@LT_STATIC_EXEC@
@ -192,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
@ -229,7 +234,13 @@ all:
Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in
cd $(top_builddir) ; ./config.status cd $(top_builddir) ; ./config.status
$(top_builddir)/config.status: $(top_srcdir)/configure LOCAL_MAKE = make_commence make_omniorb
KERNEL_MAKE = make_module make_conclude depend SALOMEconfig.h F77config.h sstream envScript
$(top_builddir)/config.status: $(top_srcdir)/configure \
$(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \
$(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in)
cd $(top_builddir) ; ./config.status --recheck cd $(top_builddir) ; ./config.status --recheck
# VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-) # VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-)
@ -244,14 +255,20 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base
cd $(top_srcdir) && ./build_configure cd $(top_srcdir) && ./build_configure
ACLOCAL_SRC = \ ACLOCAL_KERNEL = \
ac_cxx_bool.m4 check_corba.m4 check_vtk.m4 \ ac_cxx_bool.m4 check_corba.m4 \
ac_cxx_depend_flag.m4 check_hdf5.m4 enable_pthreads.m4 \ ac_cxx_depend_flag.m4 check_hdf5.m4 enable_pthreads.m4 \
ac_cxx_mutable.m4 check_mico.m4 libtool.m4 \ ac_cxx_mutable.m4 check_mico.m4 libtool.m4 \
ac_cxx_namespaces.m4 check_omniorb.m4 pyembed.m4 \ ac_cxx_namespaces.m4 check_omniorb.m4 pyembed.m4 \
ac_cxx_partial_specialization.m4 check_opengl.m4 python.m4 \ ac_cxx_partial_specialization.m4 python.m4 \
ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \ ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \
ac_cc_warnings.m4 check_qt.m4 check_swig.m4 ac_cc_warnings.m4 check_swig.m4
$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) ACLOCAL_GUI = \
cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files check_vtk.m4 check_opengl.m4 check_qt.m4 \
check_GUI.m4 check_corba_in_GUI.m4
$(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
$(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%)
cd $(top_srcdir) ; aclocal -I adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \
-I @GUI_ROOT_DIR@/adm_local/unix/config_files

3
adm_local/unix/make_omniorb.in
View File

@ -19,6 +19,9 @@
%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${KERNEL_ROOT_DIR}/idl/salome/%.idl %$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${KERNEL_ROOT_DIR}/idl/salome/%.idl
$(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${GUI_ROOT_DIR}/idl/salome/%.idl
$(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${top_srcdir}/idl/%.idl %$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${top_srcdir}/idl/%.idl
$(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<