Issue 0020194: EDF 977 ALL: Get rid of warnings PACKAGE_VERSION already defined

diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index f21fc707621a86fe4079c2ac337665e211f1356d..1911a03391eae243a4c0290a27c9da50081d9bf7 100644 (file)
--- 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 1fc78886f7820f64681a92c05c8fcb039526b729..f41c53c84e47143cb07de1a598d5edc299a32867 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -41,34 +41,14 @@ fi
 cd ${CONF_DIR}
 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
-
-# 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
-#do
-#  rm  salome_adm/unix/config_files/${deprecated}
-#done
-
-# remove KERNEL CVS directories in subdirectory salome_adm
-#for deprecated in CVS unix/CVS unix/config_files/CVS
-#do
-#  rm -rf salome_adm/${deprecated}
-#done
-
-cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/SALOMEconfig.h.in salome_adm/unix
-
 # ____________________________________________________________________
 # 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
+# and KERNEL salome_adm/unix/config_files directory.
 # output:
 #   aclocal.m4
 #   autom4te.cache (directory)
-echo "====================================================== aclocal"
+echo "======================================================= aclocal"
 
 aclocal -I adm_local/unix/config_files \
         -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files || exit 1
@@ -79,17 +59,13 @@ 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
-#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
 
-# ____________________________________________________________________
-# make link to KERNEL configuration files to
-#ln -sf ${KERNEL_ROOT_DIR}/salome_adm .
-
 # ____________________________________________________________________
 # autoconf creates the configure script from the file configure.ac (or
 # configure.in if configure.ac doesn't exist)
@@ -106,11 +82,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/configure.ac b/configure.ac
index d0cd21d9966afea0a492c39bbccafa680c4b3254..78705b1f2b345d24a8fe2926cfa4d7ec817f26fc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@
 # Modified by : Mikhail PONIKAROV (OCN) - autotools usage
 #
 AC_INIT([Salome2 Project GUI module], [5.1.2], [webmaster.salome@opencascade.com], [SalomeGUI])
-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])
@@ -163,7 +163,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
 
@@ -588,7 +588,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 ada73f25bbacc8f3256b0e578f3059ed5d703633..c234fd06e3e227d2a18cf68343a4957fc4443e3a 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -41,7 +41,6 @@ nodist_libSalomeIDLGUI_la_SOURCES = SalomeApp_EngineSK.cc
 nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh)
 
 libSalomeIDLGUI_la_CPPFLAGS = \
-       -I$(top_builddir)/salome_adm/unix \
        -I$(top_builddir)/idl \
        @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @KERNEL_CXXFLAGS@
 libSalomeIDLGUI_la_LDFLAGS = -no-undefined -version-info=0:0:0
@@ -51,7 +50,7 @@ libSalomeIDLGUI_la_LIBADD  = @CORBA_LIBS@
 OMNIORB_IDL         = @OMNIORB_IDL@
 OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
 OMNIORB_IDLPYFLAGS  = @OMNIORB_IDLPYFLAGS@ -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome 
-IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome -I$(top_builddir)/salome_adm/unix
+IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome
 IDLPYFLAGS  = @IDLPYFLAGS@ -I$(KERNEL_ROOT_DIR)/idl/salome
 
 # potential problem on parallel make on the following - multiple outputs

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am
index 750b0bc67a8aaa0474afcdca04b8c2175dc69f6e..99dacc936758d3bb87469b0111e9af734e228c27 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am
@@ -53,7 +53,7 @@ libSalomePyQtGUI_la_CPPFLAGS = $(QT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES)
        -I$(srcdir)/../SALOME_PYQT_GUILight                                             \
        -I$(srcdir)/../../Plot2d -I$(srcdir)/../../OCCViewer                            \
        -I$(srcdir)/../../SalomeApp -I$(srcdir)/../../CAM -I$(srcdir)/../../STD         \
-       -I$(top_builddir)/salome_adm/unix @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
+       @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
 
 # linkage flags
 libSalomePyQtGUI_la_LIBADD = $(PYTHON_LIBS) $(SIP_LIBS) $(PYQT_LIBS) $(VTK_LIBS)       \

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/Makefile.am b/src/SALOME_PYQT/SALOME_PYQT_GUILight/Makefile.am
index 36358c6cce518c403fd3f151d2804bfff58d5e93..47defba2aa14a5f2e01e31b561d08473f0b6c94d 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/Makefile.am
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/Makefile.am
@@ -79,7 +79,6 @@ libSalomePyQtGUILight_la_CPPFLAGS =  $(QT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INC
 
 if GUI_ENABLE_CORBA
 libSalomePyQtGUILight_la_CPPFLAGS += -I$(srcdir)/../../SalomeApp \
-                                     -I$(top_builddir)/salome_adm/unix \
                                     @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
 endif
                        

diff --git a/src/SALOME_SWIG/Makefile.am b/src/SALOME_SWIG/Makefile.am
index d29f673dd2089cc0ec7265623f83189e1c0a0ae9..039ba353723d412f6bc093b478b48d683321d7a2 100755 (executable)
--- a/src/SALOME_SWIG/Makefile.am
+++ b/src/SALOME_SWIG/Makefile.am
@@ -62,7 +62,7 @@ salomeinclude_HEADERS = $(SWIG_SOURCES) SALOMEGUI_Swig.hxx SALOMEGUI_Swig.i
 _libSALOME_Swig_la_CPPFLAGS = \
        $(QT_INCLUDES) $(QWT_INCLUDES) $(PYTHON_INCLUDES) $(CAS_CPPFLAGS) $(VTK_INCLUDES)       \
        $(OGL_INCLUDES) $(BOOST_CPPFLAGS) -DHAVE_CONFIG_H @KERNEL_CXXFLAGS@                     \
-       -I$(top_builddir)/salome_adm/unix -I$(top_builddir)/idl -I$(srcdir)                     \
+       -I$(top_builddir)/idl -I$(srcdir)                                                       \
        -I$(srcdir)/../LightApp -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT                          \
        -I$(srcdir)/../ObjBrowser -I$(srcdir)/../LightApp -I$(srcdir)/../SOCC                   \
        -I$(srcdir)/../SVTK -I$(srcdir)/../Event -I$(srcdir)/../OBJECT                          \

diff --git a/src/SUITApp/Makefile.am b/src/SUITApp/Makefile.am
index 08eaa3fda446213bf1b56722dceaa1c405e767d1..5c1f44e3635396636cd803b53693ab36124c66a9 100644 (file)
--- a/src/SUITApp/Makefile.am
+++ b/src/SUITApp/Makefile.am
@@ -62,7 +62,7 @@ libSUITApp_la_LIBADD   = ../Qtx/libqtx.la ../SUIT/libsuit.la ../Style/libSalomeS
 
 if ENABLE_PYCONSOLE
 libSUITApp_la_LDFLAGS += -Xlinker -export-dynamic $(PYTHON_LIBS)
-AM_CPPFLAGS=-DSUIT_ENABLE_PYTHON
+AM_CPPFLAGS+=-DSUIT_ENABLE_PYTHON
 endif
 
 # Executable

diff --git a/src/SalomeApp/Makefile.am b/src/SalomeApp/Makefile.am
index cd4a634ea84ec2a4e88ffa9a12c0484416822107..614de706bcee1e6c48a0a80f881391f67e662a58 100755 (executable)
--- a/src/SalomeApp/Makefile.am
+++ b/src/SalomeApp/Makefile.am
@@ -110,7 +110,7 @@ libSalomeApp_la_CPPFLAGS = $(PYTHON_INCLUDES) $(QT_INCLUDES) $(QWT_INCLUDES)        \
        -I$(srcdir)/../PyConsole -I$(srcdir)/../TOOLSGUI                        \
        -I$(srcdir)/../PyInterp -I$(srcdir)/../Session -I$(top_builddir)/idl    \
        -I$(srcdir)/../Event -I$(srcdir)/../CASCatch                            \
-       -I$(top_builddir)/salome_adm/unix @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @LIBXML_INCLUDES@
+       @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @LIBXML_INCLUDES@
 libSalomeApp_la_LDFLAGS = $(PYTHON_LIBS) $(QT_MT_LIBS) 
 libSalomeApp_la_LIBADD  = $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSalomeDSClient               \
        ../SUIT/libsuit.la ../STD/libstd.la ../CAM/libCAM.la ../ObjBrowser/libObjBrowser.la     \

diff --git a/src/Session/Makefile.am b/src/Session/Makefile.am
index ae858a3f40ecd0bbdb5c9043fc5e4287d910a766..1871c3edaffe1ddd958ce20d2202773b5f64314f 100755 (executable)
--- a/src/Session/Makefile.am
+++ b/src/Session/Makefile.am
@@ -49,7 +49,7 @@ dist_libSalomeSession_la_SOURCES =    \
 libSalomeSession_la_CPPFLAGS = $(QT_MT_INCLUDES) $(PYTHON_INCLUDES)            \
        $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) @KERNEL_CXXFLAGS@ $(CAS_CPPFLAGS)    \
        @CORBA_CXXFLAGS@ @CORBA_INCLUDES@                                       \
-       -I$(top_builddir)/salome_adm/unix -I$(top_builddir)/idl                 \
+       -I$(top_builddir)/idl                                                   \
        -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -I$(srcdir)/../Event             \
        -I$(srcdir)/../Style @LIBXML_INCLUDES@
 

diff --git a/src/TOOLSGUI/Makefile.am b/src/TOOLSGUI/Makefile.am
index f82e8734da914587ee31f5425c7cd38b1530d322..a901bf1efbe289e3f885308dbbda9e1504e422ac 100755 (executable)
--- a/src/TOOLSGUI/Makefile.am
+++ b/src/TOOLSGUI/Makefile.am
@@ -51,7 +51,6 @@ nodist_salomeres_DATA =               \
 
 libToolsGUI_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) $(BOOST_CPPFLAGS)     \
        @KERNEL_CXXFLAGS@ @CORBA_CXXFLAGS@ @CORBA_INCLUDES@                     \
-       -I$(top_builddir)/salome_adm/unix -I$(top_builddir)/idl                 \
-       -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT
+       -I$(top_builddir)/idl -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT
 libToolsGUI_la_LDFLAGS  = $(QT_MT_LIBS) ../SUIT/libsuit.la $(CAS_KERNEL) $(KERNEL_LDFLAGS) \
        -lSalomeIDLKernel -lSALOMELocalTrace -lSalomeNS -lOpUtil $(top_builddir)/idl/libSalomeIDLGUI.la