Fixing problems of build procedure caused py previous integration: references to...

diff --git a/build_configure b/build_configure
index 1a234bdfb8f5ce825df992051372b48db33e73cc..bfc4f2af1bb213a30febf068278565eeac6f4157 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -70,7 +70,7 @@ ABS_CONF_DIR=`pwd`
 
 # ____________________________________________________________________
 # aclocal creates the aclocal.m4 file from the standard macro and the
-# custom macro embedded in the directory salome_adm/unix/config_files
+# custom macro embedded in the directory adm_local/unix/config_files
 # and KERNEL config_files directory.
 # output:
 #   aclocal.m4
@@ -89,9 +89,9 @@ aclocal -I adm_local/unix/config_files \
 # version. The files are created in the directory specified with the
 # AC_CONFIG_AUX_DIR(<mydir>) tag (see configure.ac).
 # output:
-#   salome_adm/unix/config_files/config.guess
-#   salome_adm/unix/config_files/config.sub
-#   salome_adm/unix/config_files/ltmain.sh
+#   adm_local/unix/config_files/config.guess
+#   adm_local/unix/config_files/config.sub
+#   adm_local/unix/config_files/ltmain.sh
 #echo "====================================================== libtoolize"
 
 libtoolize --force --copy --automake || exit 1
@@ -112,11 +112,11 @@ autoconf
 # AC_CONFIG_AUX_DIR(<mydir>) tag (see configure.ac). This step also
 # creates the Makefile.in files from the Makefile.am files.
 # output:
-#   salome_adm/unix/config_files/compile
-#   salome_adm/unix/config_files/depcomp
-#   salome_adm/unix/config_files/install-sh
-#   salome_adm/unix/config_files/missing
-#   salome_adm/unix/config_files/py-compile
+#   adm_local/unix/config_files/compile
+#   adm_local/unix/config_files/depcomp
+#   adm_local/unix/config_files/install-sh
+#   adm_local/unix/config_files/missing
+#   adm_local/unix/config_files/py-compile
 #   Makefile.in (from Makefile.am)
 echo "====================================================== automake"
 

diff --git a/clean_configure b/clean_configure
index be690394d6539cc16ec4f7f2e5c10e80c5d4e0de..9d129daf1d9f61c9503babd7ac15e4d38001ec25 100755 (executable)
--- a/clean_configure
+++ b/clean_configure
@@ -23,6 +23,8 @@ find . -name "*.pyc" -print -exec rm {} \;
 #exit
 # ==================== ON SORT AVANT
 
+# Files created by libtoolize and automake
+( cd adm_local/unix/config_files && rm -f config.* depcomp install-sh l*.m4 ltmain.sh missing py-compile install-sh missing depcomp py-compile )
 find bin -name Makefile.in | xargs rm -f
 find doc -name Makefile.in | xargs rm -f
 find idl -name Makefile.in | xargs rm -f
@@ -31,4 +33,3 @@ find tests -name Makefile.in | xargs rm -f
 find src -name Makefile.in | xargs rm -f
 rm -f Makefile.in
 rm -f COPYING INSTALL
-rm -rf salome_adm

diff --git a/configure.ac b/configure.ac
index 42245b221884948ec554087dcdc9938659fba5a0..82494163ac089043c854f2b2450eb4f5c7aa1026 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@
 # Created from configure.in.base
 #
 AC_INIT([Salome2 Project HOMARD module], [6.3.1], [webmaster.salome@opencascade.com], [SalomeHOMARD])
-AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
+AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([-Wno-portability])
@@ -106,7 +106,7 @@ dnl Fix up the INSTALL macro if it s a relative path. We want the
 dnl full-path to the binary instead.
 case "$INSTALL" in
    *install-sh*)
-      INSTALL='\${ROOT_BUILDDIR}'/salome_adm/unix/config_files/install-sh
+      INSTALL='\${ROOT_BUILDDIR}'/adm_local/unix/config_files/install-sh
       ;;
 esac
 

diff --git a/idl/Makefile.am b/idl/Makefile.am
index e3b82c311c37ff6df328bc519ff699d07eea8eaa..21efb61679a7b96daa579b2183c8011c077497dc 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -48,7 +48,7 @@ nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh)
 
 libSalomeIDLHOMARD_la_CPPFLAGS =               \
        $(KERNEL_CXXFLAGS)                      \
-       -I$(top_builddir)/salome_adm/unix       \
+       -I$(top_builddir)/adm_local/unix        \
        -I$(top_builddir)/idl                   \
        $(MED_CXXFLAGS)                         \
        @CORBA_CXXFLAGS@                        \
@@ -75,7 +75,7 @@ IDLCXXFLAGS = \
        -I$(top_builddir)/idl/salome \
        -I$(KERNEL_ROOT_DIR)/idl/salome \
        -I$(MED_ROOT_DIR)/idl/salome \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/adm_local/unix
 IDLPYFLAGS  = \
        @IDLPYFLAGS@ \
        -I$(KERNEL_ROOT_DIR)/idl/salome \

diff --git a/src/HOMARDGUI/Makefile.am b/src/HOMARDGUI/Makefile.am
index dd55ef85ff0d9b2ae9f76b66a9e7ba10ad700f82..ff9425ef17635156dea52f65b7eb0bd701c8c7bc 100644 (file)
--- a/src/HOMARDGUI/Makefile.am
+++ b/src/HOMARDGUI/Makefile.am
@@ -116,7 +116,7 @@ libHOMARD_la_CPPFLAGS =          \
        -I$(top_builddir)        \
        -I$(VISU_ROOT_DIR)/include/salome  \
        -I$(MED_ROOT_DIR)/include/salome   \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/adm_local/unix
 
 libHOMARD_la_LDFLAGS  =                 \
        ../../idl/libSalomeIDLHOMARD.la \

diff --git a/src/HOMARD_I/Makefile.am b/src/HOMARD_I/Makefile.am
index 70af732b7cfbea67fd466d8b76fec8b8c323fdad..dc8a80d10f78e812aa699df03b5439f4c314583e 100644 (file)
--- a/src/HOMARD_I/Makefile.am
+++ b/src/HOMARD_I/Makefile.am
@@ -63,7 +63,7 @@ libHOMARDEngine_la_CPPFLAGS =                       \
         -I$(GEOM_ROOT_DIR)/include/salome     \
         -I$(SMESH_ROOT_DIR)/include/salome     \
         -I$(MED_ROOT_DIR)/include/salome      \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/adm_local/unix
 
 
 libHOMARDEngine_la_LDFLAGS  =            \