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 ae95b7df34cca1fac81d0ef9d641910f757f8172..958becf8564566d11855aa565cddef256ebfbc82 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 0ece669e5442b3f2d92ffbdc0b6253462b3e1ced..a9d38bdccdc31ecf8d1caadf5784ec239b2980bd 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -51,28 +51,15 @@ 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
-
-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
+# KERNEL salome_adm/unix/config_files, GUI and MED adm_local/unix/config_files
+# directories.
 # 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 \
@@ -85,17 +72,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)
@@ -112,11 +95,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 33a10d1300c151951298d48cb7a221d4fc3a9bff..6fa5682c0b7202696dd5b19a33b4b602af90fc1f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@
 # Modified by : Mikhail Ponikarov (OCN)
 #
 AC_INIT([Salome2 Project VISU module], [5.1.2], [webmaster.salome@opencascade.com], [SalomeVISU])
-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])
@@ -95,7 +95,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='\${KERNEL_ROOT_DIR}'/salome_adm/unix/config_files/install-sh
+      INSTALL='\${KERNEL_ROOT_DIR}'/adm_local/unix/config_files/install-sh
       ;;
 esac
 
@@ -362,7 +362,6 @@ AC_OUTPUT_COMMANDS([ \
 # 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 \
        Makefile \
        VISU_version.h \
        adm_local/Makefile \

diff --git a/idl/Makefile.am b/idl/Makefile.am
index 6c0d0b89214cde1fd196c12b4f7cfff809c843ad..28f4db672cdd9924b55e7da4da12a0a7aefd379b 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -41,7 +41,6 @@ nodist_libSalomeIDLVISU_la_SOURCES = VISU_GenSK.cc
 nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh)
 
 libSalomeIDLVISU_la_CPPFLAGS =                 \
-       -I$(top_builddir)/salome_adm/unix       \
        -I$(top_builddir)/idl                   \
        @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @KERNEL_CXXFLAGS@ @MED_CXXFLAGS@
 libSalomeIDLVISU_la_LDFLAGS = -no-undefined -version-info=0:0:0
@@ -51,7 +50,7 @@ libSalomeIDLVISU_la_LIBADD  = @CORBA_LIBS@ $(MED_LDFLAGS) -lSalomeIDLMED
 OMNIORB_IDL         = @OMNIORB_IDL@
 OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
 OMNIORB_IDLPYFLAGS  = @OMNIORB_IDLPYFLAGS@ -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome  -I$(MED_ROOT_DIR)/idl/salome 
-IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome -I$(top_builddir)/salome_adm/unix
+IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome
 IDLPYFLAGS  = @IDLPYFLAGS@ -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome
 
 # potential problem on parallel make on the following - multiple outputs

diff --git a/src/CONVERTOR/Makefile.am b/src/CONVERTOR/Makefile.am
index 8a29b7f4d1a47c602b9bb1825c21ae368b218bfe..dd1cdc7e593a499a0c427f2b638972e481d3a3d8 100644 (file)
--- a/src/CONVERTOR/Makefile.am
+++ b/src/CONVERTOR/Makefile.am
@@ -88,7 +88,6 @@ libVisuConvertor_la_CPPFLAGS= \
        @MED_CXXFLAGS@ \
        @GUI_CXXFLAGS@ \
        $(BOOST_CPPFLAGS) \
-       -I$(top_builddir)/salome_adm/unix \
        $(MED_CPPFLAGS)
 
 

diff --git a/src/ENGINE/Makefile.am b/src/ENGINE/Makefile.am
index 372fd6806b5f8cc81db5c2b4e78443621271a7d6..0acbfc138c303f6a063fb1f718580931dca3397c 100644 (file)
--- a/src/ENGINE/Makefile.am
+++ b/src/ENGINE/Makefile.am
@@ -33,7 +33,7 @@ salomeinclude_HEADERS= VISU_Engine_i.hh
 dist_libVISUEngine_la_SOURCES= VISU_Engine_i.cc
 
 libVISUEngine_la_CPPFLAGS= $(KERNEL_CXXFLAGS) $(MED_CXXFLAGS) $(CORBA_CXXFLAGS) $(CORBA_INCLUDES) \
-       -I$(top_builddir)/salome_adm/unix -I$(top_builddir)/idl 
+       -I$(top_builddir)/idl 
 
 libVISUEngine_la_LDFLAGS= $(KERNEL_LDFLAGS) -lSalomeIDLKernel -lSalomeNS -lSalomeContainer $(CORBA_LIBS) \
        $(top_builddir)/idl/libSalomeIDLVISU.la

diff --git a/src/PIPELINE/Makefile.am b/src/PIPELINE/Makefile.am
index 133fa81a32c4138c1cd4d0e0da9616846ff5bbd1..c6bcf937f8d6c933aac2a4447c0164229ffcdfd2 100644 (file)
--- a/src/PIPELINE/Makefile.am
+++ b/src/PIPELINE/Makefile.am
@@ -143,6 +143,6 @@ bin_PROGRAMS= VISUPipeLine VISU_img2vti
 dist_VISUPipeLine_SOURCES= VISUPipeLine.cxx
 dist_VISU_img2vti_SOURCES= VISU_img2vti.cxx
 
-AM_CPPFLAGS=$(libVisuPipeLine_la_CPPFLAGS)
+AM_CPPFLAGS+=$(libVisuPipeLine_la_CPPFLAGS)
 LDADD=$(libVisuPipeLine_la_LDFLAGS) libVisuPipeLine.la \
        -lOpUtil -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase -lmed_V2_1 -lsuit -lqtx -lSALOMEBasics -lvtkWidgets

diff --git a/src/VISUGUI/Makefile.am b/src/VISUGUI/Makefile.am
index ab4caa6757c9c6160612dffebca4d1bfaadde5b8..5a39eccf64b5b243356629821ced39d087f550f2 100644 (file)
--- a/src/VISUGUI/Makefile.am
+++ b/src/VISUGUI/Makefile.am
@@ -182,8 +182,7 @@ libVISU_la_CPPFLAGS= \
        $(GUI_CXXFLAGS) \
        $(CORBA_CXXFLAGS) $(CORBA_INCLUDES) \
        -I$(srcdir)/../VVTK -I$(srcdir)/../OBJECT -I$(srcdir)/../VISU_I -I$(srcdir)/../GUITOOLS \
-       -I$(top_builddir)/idl -I$(srcdir)/../CONVERTOR -I$(srcdir)/../PIPELINE \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl -I$(srcdir)/../CONVERTOR -I$(srcdir)/../PIPELINE
 
 libVISU_la_LDFLAGS= \
        $(QWT_LIBS) \

diff --git a/src/VISU_I/Makefile.am b/src/VISU_I/Makefile.am
index 960e39b7a523e46b65d2bb4c42fc3b0529a76213..9400a089693c9af07be5e8f6a98b8a28095b6ebb 100644 (file)
--- a/src/VISU_I/Makefile.am
+++ b/src/VISU_I/Makefile.am
@@ -128,8 +128,7 @@ libVISUEngineImpl_la_CPPFLAGS= \
        -I$(srcdir)/../PIPELINE \
        -I$(srcdir)/../OBJECT \
        -I$(srcdir)/../GUITOOLS \
-       -I$(top_builddir)/idl \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libVISUEngineImpl_la_LDFLAGS= \
        $(PYTHON_LIBS) \