merge from V3_2_0_maintenance 17mar08

[modules/eficas.git] / adm_local / unix / make_commence.in

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index fd01839bacb4ad80a1133de565035f23fff5132c..a7820679f2f932b12e1a6e597b6231457d6a9989 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -1,6 +1,8 @@
 # common directories to put headerfiles
 inc_builddir=$(top_builddir)/include/salome
 
+MODULE_NAME=@MODULE_NAME@
+
 @SET_MAKE@
 SHELL=/bin/sh
 
@@ -14,8 +16,6 @@ LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$
 # add libstdc++ to link c++ library with libtool !
 LDFLAGS+= -lstdc++
 
-CP=@CP@
-
 # CPP
 
 CPP=@CPP@
@@ -30,15 +30,9 @@ C_DEPEND_FLAG = @C_DEPEND_FLAG@
 
 # C++
 
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@ 
-CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@
-
-# JAVA
-
-JAVA_INCLUDES = @JAVA_INCLUDES@
-JAVA_LIBS = @JAVA_LIBS@
-JAVA_LDPATH = @JAVA_LDPATH@
+#CXX = @CXX@
+#CXXFLAGS = @CXXFLAGS@ 
+#CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@
 
 # PYTHON
 
@@ -64,11 +58,6 @@ UIC = @UIC@
 # msg2qm
 MSG2QM = @MSG2QM@
 
-#QWT
-
-QWT_INCLUDES=@QWT_INCLUDES@
-QWT_LIBS=@QWT_LIBS@
-
 # SIP
 SIP = @SIP@
 SIP_INCLUDES = @SIP_INCLUDES@
@@ -86,18 +75,6 @@ OGL_LIBS=@OGL_LIBS@
 VTK_INCLUDES=@VTK_INCLUDES@
 VTK_LIBS=@VTK_LIBS@
 
-# HDF5
-
-HDF5_INCLUDES=@HDF5_INCLUDES@
-HDF5_LIBS=@HDF5_LIBS@
-HDF5_MT_LIBS=@HDF5_MT_LIBS@
-
-# MED2
-
-MED2_INCLUDES=@MED2_INCLUDES@
-MED2_LIBS=@MED2_LIBS@
-MED2_MT_LIBS=@MED2_MT_LIBS@
-
 # OpenCasCade
 
 OCC_INCLUDES=@CAS_CPPFLAGS@
@@ -110,11 +87,6 @@ OCC_MODELER_LIBS=@CAS_MODELER@
 OCC_DATAEXCHANGE_LIBS=@CAS_DATAEXCHANGE@
 OCC_LIBS=@CAS_LDFLAGS@
 
-# MPICH
-
-MPICH_INCLUDES=@MPICH_INCLUDES@
-MPICH_LIBS=@MPICH_LIBS@
-
 # Swig C++ Python
 
 SWIG       = @SWIG@
@@ -236,15 +208,22 @@ $(top_srcdir)/configure: $(top_srcdir)/configure.in $(top_srcdir)/aclocal.m4
 $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base
        cd $(top_srcdir) && ./build_configure
 
-
 ACLOCAL_SRC = \
-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_mutable.m4                 check_mico.m4      libtool.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_cc_warnings.m4                 check_qt.m4        check_swig.m4 
+ac_cc_warnings.m4                 check_boost.m4     check_swig.m4             
+
+
+ACLOCAL_GUI = \
+check_vtk.m4                     check_opengl.m4    check_qt.m4        \
+check_GUI.m4                     check_corba_in_GUI.m4  
 
-$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%)
-       cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files
+$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@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