ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-25 08:50:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
vsr 2009-08-13 05:50:13 +00:00
parent 3a85b1b855
commit 2e5ccf9f57
14 changed files with 34 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
adm_local/unix/make_common_starter.am
View File

@ -19,6 +19,14 @@
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # 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 # This file defines the common definitions used in several
# Makefile. This file must be included, if needed, by the file # Makefile. This file must be included, if needed, by the file

43
build_configure
View File

@ -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 # 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. # KERNEL salome_adm/unix/config_files, GEOM and MED adm_local/unix/config_files
# directories.
# output: # output:
# aclocal.m4 # aclocal.m4
# autom4te.cache (directory) # autom4te.cache (directory)
echo "====================================================== aclocal" echo "====================================================== aclocal"
aclocal -I adm_local/unix/config_files \ aclocal -I adm_local/unix/config_files \
-I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
-I ${MED_ROOT_DIR}/adm_local/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 # version. The files are created in the directory specified with the
# AC_CONFIG_AUX_DIR(<mydir>) tag (see configure.ac). # AC_CONFIG_AUX_DIR(<mydir>) tag (see configure.ac).
# output: # output:
# salome_adm/unix/config_files/config.guess # adm_local/unix/config_files/config.guess
# salome_adm/unix/config_files/config.sub # adm_local/unix/config_files/config.sub
# salome_adm/unix/config_files/ltmain.sh # adm_local/unix/config_files/ltmain.sh
#echo "====================================================== libtoolize" echo "==================================================== libtoolize"
libtoolize --force --copy --automake || exit 1 libtoolize --force --copy --automake || exit 1
@ -128,11 +111,11 @@ autoconf
# AC_CONFIG_AUX_DIR(<mydir>) tag (see configure.ac). This step also # AC_CONFIG_AUX_DIR(<mydir>) tag (see configure.ac). This step also
# creates the Makefile.in files from the Makefile.am files. # creates the Makefile.in files from the Makefile.am files.
# output: # output:
# salome_adm/unix/config_files/compile # adm_local/unix/config_files/compile
# salome_adm/unix/config_files/depcomp # adm_local/unix/config_files/depcomp
# salome_adm/unix/config_files/install-sh # adm_local/unix/config_files/install-sh
# salome_adm/unix/config_files/missing # adm_local/unix/config_files/missing
# salome_adm/unix/config_files/py-compile # adm_local/unix/config_files/py-compile
# Makefile.in (from Makefile.am) # Makefile.in (from Makefile.am)
echo "====================================================== automake" echo "====================================================== automake"

5
configure.ac
View File

@ -27,7 +27,7 @@
# Created from configure.in.base # Created from configure.in.base
# #
AC_INIT([Salome2 Project SMESH module], [5.1.2], [webmaster.salome@opencascade.com], [SalomeSMESH]) 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_HOST
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([-Wno-portability]) 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. dnl full-path to the binary instead.
case "$INSTALL" in case "$INSTALL" in
*install-sh*) *install-sh*)
INSTALL='\${ROOT_BUILDDIR}'/salome_adm/unix/config_files/install-sh INSTALL='\${ROOT_BUILDDIR}'/adm_local/unix/config_files/install-sh
;; ;;
esac esac
@ -433,7 +433,6 @@ echo
# autoscan, the Makefile list is generated in the output file configure.scan. # autoscan, the Makefile list is generated in the output file configure.scan.
# This could be helpfull to update de configuration. # This could be helpfull to update de configuration.
AC_OUTPUT([ \ AC_OUTPUT([ \
salome_adm/unix/SALOMEconfig.h \
adm_local/Makefile \ adm_local/Makefile \
adm_local/cmake_files/Makefile \ adm_local/cmake_files/Makefile \
adm_local/unix/Makefile \ adm_local/unix/Makefile \

4
idl/Makefile.am
View File

@ -57,7 +57,6 @@ nodist_libSalomeIDLSMESH_la_SOURCES = \
nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh) nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh)
libSalomeIDLSMESH_la_CPPFLAGS = \ libSalomeIDLSMESH_la_CPPFLAGS = \
-I$(top_builddir)/salome_adm/unix \
-I$(top_builddir)/idl \ -I$(top_builddir)/idl \
$(CORBA_CXXFLAGS) $(CORBA_INCLUDES) \ $(CORBA_CXXFLAGS) $(CORBA_INCLUDES) \
$(KERNEL_CXXFLAGS) $(MED_CXXFLAGS) \ $(KERNEL_CXXFLAGS) $(MED_CXXFLAGS) \
@ -85,8 +84,7 @@ IDLCXXFLAGS = \
-I$(top_builddir)/idl/salome \ -I$(top_builddir)/idl/salome \
-I$(KERNEL_ROOT_DIR)/idl/salome \ -I$(KERNEL_ROOT_DIR)/idl/salome \
-I$(MED_ROOT_DIR)/idl/salome \ -I$(MED_ROOT_DIR)/idl/salome \
-I$(GEOM_ROOT_DIR)/idl/salome \ -I$(GEOM_ROOT_DIR)/idl/salome
-I$(top_builddir)/salome_adm/unix
IDLPYFLAGS = \ IDLPYFLAGS = \
@IDLPYFLAGS@ \ @IDLPYFLAGS@ \

3
src/DriverMED/Makefile.am
View File

@ -66,8 +66,7 @@ libMeshDriverMED_la_CPPFLAGS = \
$(BOOST_CPPFLAGS) \ $(BOOST_CPPFLAGS) \
-I$(srcdir)/../Driver \ -I$(srcdir)/../Driver \
-I$(srcdir)/../SMDS \ -I$(srcdir)/../SMDS \
-I$(srcdir)/../SMESHDS \ -I$(srcdir)/../SMESHDS
-I$(top_builddir)/salome_adm/unix
libMeshDriverMED_la_LDFLAGS = \ libMeshDriverMED_la_LDFLAGS = \
$(BOOST_LIBS) \ $(BOOST_LIBS) \

3
src/OBJECT/Makefile.am
View File

@ -70,8 +70,7 @@ libSMESHObject_la_CPPFLAGS = \
-I$(srcdir)/../DriverMED \ -I$(srcdir)/../DriverMED \
-I$(srcdir)/../SMESH \ -I$(srcdir)/../SMESH \
-I$(srcdir)/../SMESHClient \ -I$(srcdir)/../SMESHClient \
-I$(top_builddir)/idl \ -I$(top_builddir)/idl
-I$(top_builddir)/salome_adm/unix
libSMESHObject_la_LDFLAGS = \ libSMESHObject_la_LDFLAGS = \
../SMESHClient/libSMESHClient.la \ ../SMESHClient/libSMESHClient.la \

4
src/SMESH/Makefile.am
View File

@ -94,9 +94,7 @@ libSMESHimpl_la_CPPFLAGS = \
-I$(srcdir)/../DriverUNV \ -I$(srcdir)/../DriverUNV \
-I$(srcdir)/../DriverSTL \ -I$(srcdir)/../DriverSTL \
-I$(srcdir)/../SMDS \ -I$(srcdir)/../SMDS \
-I$(srcdir)/../SMESHDS \ -I$(srcdir)/../SMESHDS
-I$(top_builddir)/salome_adm/unix
libSMESHimpl_la_LDFLAGS = \ libSMESHimpl_la_LDFLAGS = \
../SMESHDS/libSMESHDS.la \ ../SMESHDS/libSMESHDS.la \

3
src/SMESHClient/Makefile.am
View File

@ -59,8 +59,7 @@ libSMESHClient_la_CPPFLAGS = \
-I$(srcdir)/../SMDS \ -I$(srcdir)/../SMDS \
-I$(srcdir)/../SMESHDS \ -I$(srcdir)/../SMESHDS \
-I$(srcdir)/../SMESH \ -I$(srcdir)/../SMESH \
-I$(top_builddir)/idl \ -I$(top_builddir)/idl
-I$(top_builddir)/salome_adm/unix
libSMESHClient_la_LDFLAGS = \ libSMESHClient_la_LDFLAGS = \
../../idl/libSalomeIDLSMESH.la \ ../../idl/libSalomeIDLSMESH.la \

3
src/SMESHFiltersSelection/Makefile.am
View File

@ -57,8 +57,7 @@ libSMESHFiltersSelection_la_CPPFLAGS = \
$(BOOST_CPPFLAGS) \ $(BOOST_CPPFLAGS) \
$(CORBA_CXXFLAGS) \ $(CORBA_CXXFLAGS) \
$(CORBA_INCLUDES) \ $(CORBA_INCLUDES) \
-I$(top_builddir)/idl \ -I$(top_builddir)/idl
-I$(top_builddir)/salome_adm/unix
libSMESHFiltersSelection_la_LDFLAGS = \ libSMESHFiltersSelection_la_LDFLAGS = \
../../idl/libSalomeIDLSMESH.la \ ../../idl/libSalomeIDLSMESH.la \

4
src/SMESHGUI/Makefile.am
View File

@ -237,9 +237,7 @@ libSMESH_la_CPPFLAGS = \
-I$(srcdir)/../SMESH_I \ -I$(srcdir)/../SMESH_I \
-I$(srcdir)/../Controls \ -I$(srcdir)/../Controls \
-I$(srcdir)/../SMESHClient \ -I$(srcdir)/../SMESHClient \
-I$(top_builddir)/idl \ -I$(top_builddir)/idl
-I$(top_builddir)/salome_adm/unix
libSMESH_la_LDFLAGS = \ libSMESH_la_LDFLAGS = \
../SMESHFiltersSelection/libSMESHFiltersSelection.la \ ../SMESHFiltersSelection/libSMESHFiltersSelection.la \

4
src/SMESH_I/Makefile.am
View File

@ -103,9 +103,7 @@ libSMESHEngine_la_CPPFLAGS = \
-I$(srcdir)/../Driver \ -I$(srcdir)/../Driver \
-I$(srcdir)/../DriverMED \ -I$(srcdir)/../DriverMED \
-I$(srcdir)/../SMESH \ -I$(srcdir)/../SMESH \
-I$(top_builddir)/idl \ -I$(top_builddir)/idl
-I$(top_builddir)/salome_adm/unix
libSMESHEngine_la_LDFLAGS = \ libSMESHEngine_la_LDFLAGS = \
../../idl/libSalomeIDLSMESH.la \ ../../idl/libSalomeIDLSMESH.la \

3
src/SMESH_SWIG_WITHIHM/Makefile.am
View File

@ -73,8 +73,7 @@ _libSMESH_Swig_la_CPPFLAGS = \
$(BOOST_CPPFLAGS) \ $(BOOST_CPPFLAGS) \
-I$(srcdir) \ -I$(srcdir) \
-I$(srcdir)/../SMESHGUI \ -I$(srcdir)/../SMESHGUI \
-I$(top_builddir)/idl \ -I$(top_builddir)/idl
-I$(top_builddir)/salome_adm/unix
_libSMESH_Swig_la_LDFLAGS = -module _libSMESH_Swig_la_LDFLAGS = -module
_libSMESH_Swig_la_LIBADD = ../SMESHGUI/libSMESH.la \ _libSMESH_Swig_la_LIBADD = ../SMESHGUI/libSMESH.la \

4
src/StdMeshersGUI/Makefile.am
View File

@ -88,9 +88,7 @@ libStdMeshersGUI_la_CPPFLAGS = \
-I$(srcdir)/../StdMeshers \ -I$(srcdir)/../StdMeshers \
-I$(srcdir)/../OBJECT \ -I$(srcdir)/../OBJECT \
-I$(srcdir)/../SMESHFiltersSelection \ -I$(srcdir)/../SMESHFiltersSelection \
-I$(top_builddir)/idl \ -I$(top_builddir)/idl
-I$(top_builddir)/salome_adm/unix
libStdMeshersGUI_la_LDFLAGS = \ libStdMeshersGUI_la_LDFLAGS = \
../../idl/libSalomeIDLSMESH.la \ ../../idl/libSalomeIDLSMESH.la \

4
src/StdMeshers_I/Makefile.am
View File

@ -119,9 +119,7 @@ libStdMeshersEngine_la_CPPFLAGS = \
-I$(srcdir)/../SMDS \ -I$(srcdir)/../SMDS \
-I$(srcdir)/../Controls \ -I$(srcdir)/../Controls \
-I$(srcdir)/../StdMeshers \ -I$(srcdir)/../StdMeshers \
-I$(top_builddir)/idl \ -I$(top_builddir)/idl
-I$(top_builddir)/salome_adm/unix
libStdMeshersEngine_la_LDFLAGS = \ libStdMeshersEngine_la_LDFLAGS = \
../../idl/libSalomeIDLSMESH.la \ ../../idl/libSalomeIDLSMESH.la \