diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index 36ad8c3a7..cd851519b 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -19,6 +19,14 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # + +# ============================================================ +# The following is to avoid PACKAGE_... env variable +# redefinition compilation warnings +# ============================================================ +AM_CXXFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h +AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h + # ============================================================ # This file defines the common definitions used in several # Makefile. This file must be included, if needed, by the file diff --git a/build_configure b/build_configure index 07d07d604..6c5331b6a 100755 --- a/build_configure +++ b/build_configure @@ -67,33 +67,16 @@ ABS_CONF_DIR=`pwd` ####################################################################### -mkdir -p salome_adm/unix/config_files -#cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/* salome_adm/unix/config_files -#cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/pythonbe.py salome_adm/unix - -cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/SALOMEconfig.h.in salome_adm/unix - -#cp -f ${GUI_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files -#cp -f ${MED_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files -#cp -f ${GEOM_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files - -# remove KERNEL deprecated configure files -#for deprecated in ac_cc_warnings.m4 ac_cxx_partial_specialization.m4 \ -# check_mico.m4 config.guess ltmain.sh ac_cxx_bool.m4 ltconfig ac_cxx_typename.m4 \ -# check_pthreads.m4 config.sub libtool.m4 ac_cxx_mutable.m4 missing -# do -# rm -f salome_adm/unix/config_files/${deprecated} -# done - - # ____________________________________________________________________ # aclocal creates the aclocal.m4 file from the standard macro and the -# custom macro embedded in the directory salome_adm/unix/config_files -# and KERNEL config_files directory. +# custom macro embedded in the directory adm_local/unix/config_files, +# KERNEL salome_adm/unix/config_files, GEOM and MED adm_local/unix/config_files +# directories. # output: # aclocal.m4 # autom4te.cache (directory) echo "====================================================== aclocal" + aclocal -I adm_local/unix/config_files \ -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ -I ${MED_ROOT_DIR}/adm_local/unix/config_files \ @@ -105,10 +88,10 @@ aclocal -I adm_local/unix/config_files \ # version. The files are created in the directory specified with the # AC_CONFIG_AUX_DIR() 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 -#echo "====================================================== libtoolize" +# 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 @@ -128,11 +111,11 @@ autoconf # AC_CONFIG_AUX_DIR() 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/configure.ac b/configure.ac index 912e8c20a..0321f49f0 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ # Created from configure.in.base # AC_INIT([Salome2 Project SMESH module], [5.1.2], [webmaster.salome@opencascade.com], [SalomeSMESH]) -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]) @@ -107,7 +107,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 @@ -433,7 +433,6 @@ echo # autoscan, the Makefile list is generated in the output file configure.scan. # This could be helpfull to update de configuration. AC_OUTPUT([ \ - salome_adm/unix/SALOMEconfig.h \ adm_local/Makefile \ adm_local/cmake_files/Makefile \ adm_local/unix/Makefile \ diff --git a/idl/Makefile.am b/idl/Makefile.am index a1d468cb5..03486bd07 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -57,7 +57,6 @@ nodist_libSalomeIDLSMESH_la_SOURCES = \ nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh) libSalomeIDLSMESH_la_CPPFLAGS = \ - -I$(top_builddir)/salome_adm/unix \ -I$(top_builddir)/idl \ $(CORBA_CXXFLAGS) $(CORBA_INCLUDES) \ $(KERNEL_CXXFLAGS) $(MED_CXXFLAGS) \ @@ -85,8 +84,7 @@ IDLCXXFLAGS = \ -I$(top_builddir)/idl/salome \ -I$(KERNEL_ROOT_DIR)/idl/salome \ -I$(MED_ROOT_DIR)/idl/salome \ - -I$(GEOM_ROOT_DIR)/idl/salome \ - -I$(top_builddir)/salome_adm/unix + -I$(GEOM_ROOT_DIR)/idl/salome IDLPYFLAGS = \ @IDLPYFLAGS@ \ diff --git a/src/DriverMED/Makefile.am b/src/DriverMED/Makefile.am index 5b795f8ae..79da654fb 100644 --- a/src/DriverMED/Makefile.am +++ b/src/DriverMED/Makefile.am @@ -66,8 +66,7 @@ libMeshDriverMED_la_CPPFLAGS = \ $(BOOST_CPPFLAGS) \ -I$(srcdir)/../Driver \ -I$(srcdir)/../SMDS \ - -I$(srcdir)/../SMESHDS \ - -I$(top_builddir)/salome_adm/unix + -I$(srcdir)/../SMESHDS libMeshDriverMED_la_LDFLAGS = \ $(BOOST_LIBS) \ diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am index 8ef36754f..30a2e591a 100644 --- a/src/OBJECT/Makefile.am +++ b/src/OBJECT/Makefile.am @@ -70,8 +70,7 @@ libSMESHObject_la_CPPFLAGS = \ -I$(srcdir)/../DriverMED \ -I$(srcdir)/../SMESH \ -I$(srcdir)/../SMESHClient \ - -I$(top_builddir)/idl \ - -I$(top_builddir)/salome_adm/unix + -I$(top_builddir)/idl libSMESHObject_la_LDFLAGS = \ ../SMESHClient/libSMESHClient.la \ diff --git a/src/SMESH/Makefile.am b/src/SMESH/Makefile.am index ce65291a3..b286778f9 100644 --- a/src/SMESH/Makefile.am +++ b/src/SMESH/Makefile.am @@ -94,9 +94,7 @@ libSMESHimpl_la_CPPFLAGS = \ -I$(srcdir)/../DriverUNV \ -I$(srcdir)/../DriverSTL \ -I$(srcdir)/../SMDS \ - -I$(srcdir)/../SMESHDS \ - -I$(top_builddir)/salome_adm/unix - + -I$(srcdir)/../SMESHDS libSMESHimpl_la_LDFLAGS = \ ../SMESHDS/libSMESHDS.la \ diff --git a/src/SMESHClient/Makefile.am b/src/SMESHClient/Makefile.am index e44db75f2..dfde2987e 100644 --- a/src/SMESHClient/Makefile.am +++ b/src/SMESHClient/Makefile.am @@ -59,8 +59,7 @@ libSMESHClient_la_CPPFLAGS = \ -I$(srcdir)/../SMDS \ -I$(srcdir)/../SMESHDS \ -I$(srcdir)/../SMESH \ - -I$(top_builddir)/idl \ - -I$(top_builddir)/salome_adm/unix + -I$(top_builddir)/idl libSMESHClient_la_LDFLAGS = \ ../../idl/libSalomeIDLSMESH.la \ diff --git a/src/SMESHFiltersSelection/Makefile.am b/src/SMESHFiltersSelection/Makefile.am index a0d49e885..527992db3 100644 --- a/src/SMESHFiltersSelection/Makefile.am +++ b/src/SMESHFiltersSelection/Makefile.am @@ -57,8 +57,7 @@ libSMESHFiltersSelection_la_CPPFLAGS = \ $(BOOST_CPPFLAGS) \ $(CORBA_CXXFLAGS) \ $(CORBA_INCLUDES) \ - -I$(top_builddir)/idl \ - -I$(top_builddir)/salome_adm/unix + -I$(top_builddir)/idl libSMESHFiltersSelection_la_LDFLAGS = \ ../../idl/libSalomeIDLSMESH.la \ diff --git a/src/SMESHGUI/Makefile.am b/src/SMESHGUI/Makefile.am index bd8db3b6b..0c8b88869 100644 --- a/src/SMESHGUI/Makefile.am +++ b/src/SMESHGUI/Makefile.am @@ -237,9 +237,7 @@ libSMESH_la_CPPFLAGS = \ -I$(srcdir)/../SMESH_I \ -I$(srcdir)/../Controls \ -I$(srcdir)/../SMESHClient \ - -I$(top_builddir)/idl \ - -I$(top_builddir)/salome_adm/unix - + -I$(top_builddir)/idl libSMESH_la_LDFLAGS = \ ../SMESHFiltersSelection/libSMESHFiltersSelection.la \ diff --git a/src/SMESH_I/Makefile.am b/src/SMESH_I/Makefile.am index 2a15a44df..b9282322d 100644 --- a/src/SMESH_I/Makefile.am +++ b/src/SMESH_I/Makefile.am @@ -103,9 +103,7 @@ libSMESHEngine_la_CPPFLAGS = \ -I$(srcdir)/../Driver \ -I$(srcdir)/../DriverMED \ -I$(srcdir)/../SMESH \ - -I$(top_builddir)/idl \ - -I$(top_builddir)/salome_adm/unix - + -I$(top_builddir)/idl libSMESHEngine_la_LDFLAGS = \ ../../idl/libSalomeIDLSMESH.la \ diff --git a/src/SMESH_SWIG_WITHIHM/Makefile.am b/src/SMESH_SWIG_WITHIHM/Makefile.am index e540dd1ab..5370d7f3e 100644 --- a/src/SMESH_SWIG_WITHIHM/Makefile.am +++ b/src/SMESH_SWIG_WITHIHM/Makefile.am @@ -73,8 +73,7 @@ _libSMESH_Swig_la_CPPFLAGS = \ $(BOOST_CPPFLAGS) \ -I$(srcdir) \ -I$(srcdir)/../SMESHGUI \ - -I$(top_builddir)/idl \ - -I$(top_builddir)/salome_adm/unix + -I$(top_builddir)/idl _libSMESH_Swig_la_LDFLAGS = -module _libSMESH_Swig_la_LIBADD = ../SMESHGUI/libSMESH.la \ diff --git a/src/StdMeshersGUI/Makefile.am b/src/StdMeshersGUI/Makefile.am index 8e31360dc..7415bc74b 100644 --- a/src/StdMeshersGUI/Makefile.am +++ b/src/StdMeshersGUI/Makefile.am @@ -88,9 +88,7 @@ libStdMeshersGUI_la_CPPFLAGS = \ -I$(srcdir)/../StdMeshers \ -I$(srcdir)/../OBJECT \ -I$(srcdir)/../SMESHFiltersSelection \ - -I$(top_builddir)/idl \ - -I$(top_builddir)/salome_adm/unix - + -I$(top_builddir)/idl libStdMeshersGUI_la_LDFLAGS = \ ../../idl/libSalomeIDLSMESH.la \ diff --git a/src/StdMeshers_I/Makefile.am b/src/StdMeshers_I/Makefile.am index 0238db867..94ed920c8 100644 --- a/src/StdMeshers_I/Makefile.am +++ b/src/StdMeshers_I/Makefile.am @@ -119,9 +119,7 @@ libStdMeshersEngine_la_CPPFLAGS = \ -I$(srcdir)/../SMDS \ -I$(srcdir)/../Controls \ -I$(srcdir)/../StdMeshers \ - -I$(top_builddir)/idl \ - -I$(top_builddir)/salome_adm/unix - + -I$(top_builddir)/idl libStdMeshersEngine_la_LDFLAGS = \ ../../idl/libSalomeIDLSMESH.la \