Improve compilation procedure:

- add dependencies from make_commence.in, make_conclude.in, ... files
- fix bug: configure script takes make_commence.in, make_conclude.in, ... files from build directory instead of sources

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 3d71607c5404483c3fe079488a6274f3b2d60ecc..6e6bd288eda5098947db02120f14eaf4dc236136 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -251,7 +251,13 @@ all:
 Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in
        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
 
 # VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-)
@@ -266,7 +272,7 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base
        cd $(top_srcdir) && ./build_configure
 
 
-ACLOCAL_SRC = \
+ACLOCAL_KERNEL = \
 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                \
@@ -284,12 +290,14 @@ ACLOCAL_RAND =                    check_RANDOMIZER.m4
 ACLOCAL_VISU =                    check_VISU.m4
 ACLOCAL_CUR =                     check_gd.m4
 
-$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
+$(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
                                        $(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%) \
-                                       $(ACLOCAL_MED:%=@MED_ROOT_DIR@/adm_local/unix/config_files/%)
-                                       $(ACLOCAL_VISU:%=@VISU_ROOT_DIR@/adm_local/unix/config_files/%)
+                                       $(ACLOCAL_MED:%=@MED_ROOT_DIR@/adm_local/unix/config_files/%) \
+                                       $(ACLOCAL_VISU:%=@VISU_ROOT_DIR@/adm_local/unix/config_files/%) \
+                                       $(ACLOCAL_RAND:%=@RANDOMIZER_ROOT_DIR@/adm_local/unix/config_files/%) \
+                                       $(ACLOCAL_CUR:%=$(top_srcdir)/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 \
                                                                        -I @MED_ROOT_DIR@/adm_local/unix/config_files \
-                                                                       -I @RANDOMIZER_ROOT_DIR@/adm_local/unix/config_files \
-                                                                       -I @VISU_ROOT_DIR@/adm_local/unix/config_files
+                                                                       -I @VISU_ROOT_DIR@/adm_local/unix/config_files \
+                                                                       -I @RANDOMIZER_ROOT_DIR@/adm_local/unix/config_files

diff --git a/build_configure b/build_configure
index 66adba870fbe297a8557a35f2553a10f70e3df3f..80ce3deb342eb730e88d06b4e8abac0d9b67b515 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -160,7 +160,7 @@ echo "      ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1
 
 echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1
-echo " ./adm_local/unix/make_omniorb \\" >> configure.in_tmp1
+echo " ./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1
 
@@ -170,7 +170,7 @@ echo "      ./salome_adm/unix/make_module \\" >> configure.in_tmp1
 # salome_adm, par le make_conclude (resp. make_commence) du module,
 # c'est à dire le make_conclude (resp. make_commence) du répertoire
 # adm_local
-echo " ./adm_local/unix/make_commence \\" >> configure.in_tmp1
+echo " ./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/make_conclude \\" >> configure.in_tmp1
 
 \rm -f configure.in_tmp2 configure.in_tmp3